From 1c0abade3ef1eed44e780ea14ecac9046ae402e2 Mon Sep 17 00:00:00 2001
From: Ferran Recio <ferran@moodle.com>
Date: Tue, 29 Jun 2021 11:52:48 +0200
Subject: [PATCH] MDL-71863 core_courseformat: mode site renderer to autoload

---
 .../format/classes/output/site_renderer.php   | 30 +++++++++++++++++++
 course/format/lib.php                         |  7 ++---
 course/format/renderer.php                    | 23 ++++----------
 lib/db/renamedclasses.php                     |  1 +
 4 files changed, 39 insertions(+), 22 deletions(-)
 create mode 100644 course/format/classes/output/site_renderer.php

diff --git a/course/format/classes/output/site_renderer.php b/course/format/classes/output/site_renderer.php
new file mode 100644
index 00000000000..88dc202e6cc
--- /dev/null
+++ b/course/format/classes/output/site_renderer.php
@@ -0,0 +1,30 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Site topics renderer.
+ *
+ * Site course is not a real course format, but it requires a format renderer to use the output
+ * components.
+ *
+ * @copyright 2021 Ferran Recio <ferran@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace core_courseformat\output;
+
+class site_renderer extends section_renderer {
+}
diff --git a/course/format/lib.php b/course/format/lib.php
index 6ac484294de..4dbf1c42386 100644
--- a/course/format/lib.php
+++ b/course/format/lib.php
@@ -25,6 +25,7 @@
 defined('MOODLE_INTERNAL') || die;
 
 use core_courseformat\base as course_format;
+use core_courseformat\output\site_renderer;
 
 /**
  * Returns an instance of format class (extending course_format) for given course
@@ -122,11 +123,7 @@ class format_site extends course_format {
      * @return renderer_base
      */
     public function get_renderer(moodle_page $page) {
-        global $CFG;
-        if (!class_exists('format_site_renderer')) {
-            require_once($CFG->dirroot.'/course/format/renderer.php');
-        }
-        return new format_site_renderer($page, null);
+        return new site_renderer($page, null);
     }
 
     /**
diff --git a/course/format/renderer.php b/course/format/renderer.php
index bf7de760921..8b625041533 100644
--- a/course/format/renderer.php
+++ b/course/format/renderer.php
@@ -15,25 +15,14 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Base renderer for outputting course formats.
+ * Legacy course format renderer file.
  *
- * @package core
+ * This file exists only for legacy reasons. Most third party format
+ * plugins include this file to extend the course format renderer. Now all
+ * format renderers are located in core_courseformat\output and uses autoload.
+ *
+ * @package core_courseformat
  * @copyright 2012 Dan Poltawski
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since Moodle 2.3
  */
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Site topics renderer.
- *
- * Site course is not a real course format, but it requires a format renderer to use the output
- * components.
- *
- * @copyright 2020 Ferran Recio <ferran@moodle.com>
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class format_site_renderer extends core_courseformat\output\section_renderer {
-
-}
diff --git a/lib/db/renamedclasses.php b/lib/db/renamedclasses.php
index baa15170854..8e58d6d9812 100644
--- a/lib/db/renamedclasses.php
+++ b/lib/db/renamedclasses.php
@@ -46,5 +46,6 @@ $renamedclasses = array(
     'format_topics_renderer' => 'format_topics\\output\\renderer',
     'format_section_renderer_base' => 'core_courseformat\\output\\section_renderer',
     'format_singleactivity_renderer' => 'format_singleactivity\\output\\renderer',
+    'format_site_renderer' => 'core_courseformat\\output\\site_renderer',
     'format_weeks_renderer' => 'format_weeks\\output\\renderer',
 );