Support the new 'public' directory in MDL-83424.

Author: andrewnicols

list_valid_components/list_valid_components.php

@@ -127,19 +127,13 @@
     exit(0);
 }
 
-// Up to Moodle 2.5, we use the old global API, that requires the site to be installed
-// (the shell script calling this handles those reqs automatically)
-// TODO: Once 2.5 is out we can change this by the new core_component::get_xxx() calls.
-// until then will be using the deprecated ones.
-require(dirname(dirname(dirname(dirname(__FILE__)))).'/config.php');
-
 // Get all the plugin and subplugin types
-$types = get_plugin_types(true);
+$types = \core_component::get_plugin_types();
 // Sort types in reverse order, so we get subplugins earlier than plugins
 $types = array_reverse($types);
 // For each type, get their available implementations
 foreach ($types as $type => $fullpath) {
-    $plugins = get_plugin_list($type);
+    $plugins = $types = \core_component::get_plugin_list($type);
     // For each plugin, let's calculate the proper component name and generate
     // the corresponding build.xml file
     foreach ($plugins as $plugin => $pluginpath) {
@@ -157,7 +151,7 @@
 
 // Get all the subsystems and
 // generate the corresponding build.xml file
-$subsystems = get_core_subsystems(true);
+$subsystems = $types = \core_component::get_core_subsystems();
 $subsystems['core'] = $options['basedir']; // To get the main one too
 foreach ($subsystems as $subsystem => $subsystempath) {
     if ($subsystem == 'backup') { // Because I want, yes :-P

phplib/clilib.php

@@ -222,20 +222,31 @@ function s($var) {
  * @return bool false if core_component wasn't able to be loaded.
  */
 function load_core_component_from_moodle($moodledirroot) {
-    if (!file_exists($moodledirroot . '/lib/classes/component.php')) {
+    if (file_exists($moodledirroot . '/public/lib/classes/component.php')) {
+        // Suppor the Moodle 5.1 'public' directory structure.
+        $newcfg = (object) [
+            'dirroot' => "{$moodledirroot}/public",
+            'root' => $moodledirroot,
+            'libdir' => "{$moodledirroot}/public/lib",
+            'filepermissions' => '0666',
+        ];
+    } else if (!file_exists($moodledirroot . '/lib/classes/component.php')) {
+        $newcfg = (object) [
+            'dirroot' => $moodledirroot,
+            'libdir' => $moodledirroot . '/lib',
+            'filepermissions' => '0666',
+        ];
+    } else {
         return false;
     }
 
     define('IGNORE_COMPONENT_CACHE', 1);
     define('MOODLE_INTERNAL', 1);
     unset($CFG);
     global $CFG;
-    $CFG = new stdClass();
-    $CFG->dirroot = $moodledirroot;
-    $CFG->libdir = $CFG->dirroot . '/lib';
-    $CFG->admin = 'admin';
-    $CFG->filepermissions = '0666';
-    require_once($CFG->dirroot . '/lib/classes/component.php');
+    $CFG = $newcfg;
+
+    require_once($CFG->libdir . '/classes/component.php');
 
     return true;
 }