MDL-73728 admin: Move adminpresets to admin/presets

This commit moves the presets subsystem to a location within the admin folder, which is more appropriate given its purpose and reduces developer frustration with tab completion of the admin directory.
moodle · Feb 3, 2022 · fc082d3 · fc082d3
1 parent c352b70
commit fc082d3
Show file tree

Hide file tree

Showing 48 changed files with 13 additions and 13 deletions.
diff --git a/adminpresets/classes/helper.php → admin/presets/classes/helper.php b/adminpresets/classes/helper.php → admin/presets/classes/helper.php
diff --git a/.../adminpresets_admin_setting_bloglevel.php → .../adminpresets_admin_setting_bloglevel.php b/.../adminpresets_admin_setting_bloglevel.php → .../adminpresets_admin_setting_bloglevel.php
diff --git a/...npresets_admin_setting_configcheckbox.php → ...npresets_admin_setting_configcheckbox.php b/...npresets_admin_setting_configcheckbox.php → ...npresets_admin_setting_configcheckbox.php
diff --git a/..._setting_configcheckbox_with_advanced.php → ..._setting_configcheckbox_with_advanced.php b/..._setting_configcheckbox_with_advanced.php → ..._setting_configcheckbox_with_advanced.php
diff --git a/...dmin_setting_configcheckbox_with_lock.php → ...dmin_setting_configcheckbox_with_lock.php b/...dmin_setting_configcheckbox_with_lock.php → ...dmin_setting_configcheckbox_with_lock.php
diff --git a/...minpresets_admin_setting_configiplist.php → ...minpresets_admin_setting_configiplist.php b/...minpresets_admin_setting_configiplist.php → ...minpresets_admin_setting_configiplist.php
diff --git a/...ets_admin_setting_configmulticheckbox.php → ...ets_admin_setting_configmulticheckbox.php b/...ets_admin_setting_configmulticheckbox.php → ...ets_admin_setting_configmulticheckbox.php
diff --git a/...esets_admin_setting_configmultiselect.php → ...esets_admin_setting_configmultiselect.php b/...esets_admin_setting_configmultiselect.php → ...esets_admin_setting_configmultiselect.php
diff --git a/...setting_configmultiselect_with_loader.php → ...setting_configmultiselect_with_loader.php b/...setting_configmultiselect_with_loader.php → ...setting_configmultiselect_with_loader.php
diff --git a/...minpresets_admin_setting_configselect.php → ...minpresets_admin_setting_configselect.php b/...minpresets_admin_setting_configselect.php → ...minpresets_admin_setting_configselect.php
diff --git a/...in_setting_configselect_with_advanced.php → ...in_setting_configselect_with_advanced.php b/...in_setting_configselect_with_advanced.php → ...in_setting_configselect_with_advanced.php
diff --git a/...adminpresets_admin_setting_configtext.php → ...adminpresets_admin_setting_configtext.php b/...adminpresets_admin_setting_configtext.php → ...adminpresets_admin_setting_configtext.php
diff --git a/...dmin_setting_configtext_with_advanced.php → ...dmin_setting_configtext_with_advanced.php b/...dmin_setting_configtext_with_advanced.php → ...dmin_setting_configtext_with_advanced.php
diff --git a/...adminpresets_admin_setting_configtime.php → ...adminpresets_admin_setting_configtime.php b/...adminpresets_admin_setting_configtime.php → ...adminpresets_admin_setting_configtime.php
diff --git a/...esets_admin_setting_devicedetectregex.php → ...esets_admin_setting_devicedetectregex.php b/...esets_admin_setting_devicedetectregex.php → ...esets_admin_setting_devicedetectregex.php
diff --git a/...npresets_admin_setting_gradecat_combo.php → ...npresets_admin_setting_gradecat_combo.php b/...npresets_admin_setting_gradecat_combo.php → ...npresets_admin_setting_gradecat_combo.php
diff --git a/...dminpresets_admin_setting_sitesettext.php → ...dminpresets_admin_setting_sitesettext.php b/...dminpresets_admin_setting_sitesettext.php → ...dminpresets_admin_setting_sitesettext.php
diff --git a/...sets_admin_setting_special_backupdays.php → ...sets_admin_setting_special_backupdays.php b/...sets_admin_setting_special_backupdays.php → ...sets_admin_setting_special_backupdays.php
diff --git a/...dmin_setting_special_calendar_weekend.php → ...dmin_setting_special_calendar_weekend.php b/...dmin_setting_special_calendar_weekend.php → ...dmin_setting_special_calendar_weekend.php
diff --git a/...s_admin_setting_users_with_capability.php → ...s_admin_setting_users_with_capability.php b/...s_admin_setting_users_with_capability.php → ...s_admin_setting_users_with_capability.php
diff --git a/...es/local/setting/adminpresets_setting.php → ...es/local/setting/adminpresets_setting.php b/...es/local/setting/adminpresets_setting.php → ...es/local/setting/adminpresets_setting.php
diff --git a/...sets/classes/local/setting/delegation.php → ...sets/classes/local/setting/delegation.php b/...sets/classes/local/setting/delegation.php → ...sets/classes/local/setting/delegation.php
diff --git a/adminpresets/classes/manager.php → admin/presets/classes/manager.php b/adminpresets/classes/manager.php → admin/presets/classes/manager.php
diff --git a/adminpresets/classes/privacy/provider.php → admin/presets/classes/privacy/provider.php b/adminpresets/classes/privacy/provider.php → admin/presets/classes/privacy/provider.php
diff --git a/...resets/tests/fixtures/import_settings.xml → ...resets/tests/fixtures/import_settings.xml b/...resets/tests/fixtures/import_settings.xml → ...resets/tests/fixtures/import_settings.xml
diff --git a/...ests/fixtures/import_settings_plugins.xml → ...ests/fixtures/import_settings_plugins.xml b/...ests/fixtures/import_settings_plugins.xml → ...ests/fixtures/import_settings_plugins.xml
diff --git a/...port_settings_with_unexisting_setting.xml → ...port_settings_with_unexisting_setting.xml b/...port_settings_with_unexisting_setting.xml → ...port_settings_with_unexisting_setting.xml
diff --git a/...ts/tests/fixtures/import_starter_name.xml → ...ts/tests/fixtures/import_starter_name.xml b/...ts/tests/fixtures/import_starter_name.xml → ...ts/tests/fixtures/import_starter_name.xml
diff --git a/...esets/tests/fixtures/invalid_xml_file.xml → ...esets/tests/fixtures/invalid_xml_file.xml b/...esets/tests/fixtures/invalid_xml_file.xml → ...esets/tests/fixtures/invalid_xml_file.xml
diff --git a/...ts/tests/fixtures/unexisting_category.xml → ...ts/tests/fixtures/unexisting_category.xml b/...ts/tests/fixtures/unexisting_category.xml → ...ts/tests/fixtures/unexisting_category.xml
diff --git a/...ets/tests/fixtures/unexisting_setting.xml → ...ets/tests/fixtures/unexisting_setting.xml b/...ets/tests/fixtures/unexisting_setting.xml → ...ets/tests/fixtures/unexisting_setting.xml
diff --git a/adminpresets/tests/generator/lib.php → admin/presets/tests/generator/lib.php b/adminpresets/tests/generator/lib.php → admin/presets/tests/generator/lib.php
diff --git a/adminpresets/tests/generator_test.php → admin/presets/tests/generator_test.php b/adminpresets/tests/generator_test.php → admin/presets/tests/generator_test.php
diff --git a/adminpresets/tests/helper_test.php → admin/presets/tests/helper_test.php b/adminpresets/tests/helper_test.php → admin/presets/tests/helper_test.php
diff --git a/...npresets_admin_setting_bloglevel_test.php → ...npresets_admin_setting_bloglevel_test.php b/...npresets_admin_setting_bloglevel_test.php → ...npresets_admin_setting_bloglevel_test.php
diff --git a/...resets_admin_setting_sitesettext_test.php → ...resets_admin_setting_sitesettext_test.php b/...resets_admin_setting_sitesettext_test.php → ...resets_admin_setting_sitesettext_test.php
diff --git a/...cal/setting/adminpresets_setting_test.php → ...cal/setting/adminpresets_setting_test.php b/...cal/setting/adminpresets_setting_test.php → ...cal/setting/adminpresets_setting_test.php
diff --git a/adminpresets/tests/manager_test.php → admin/presets/tests/manager_test.php b/adminpresets/tests/manager_test.php → admin/presets/tests/manager_test.php
diff --git a/...s/tests/privacy/privacy_provider_test.php → ...s/tests/privacy/privacy_provider_test.php b/...s/tests/privacy/privacy_provider_test.php → ...s/tests/privacy/privacy_provider_test.php
diff --git a/admin/tool/admin_presets/tests/behat/import_file.feature b/admin/tool/admin_presets/tests/behat/import_file.feature
@@ -10,7 +10,7 @@ Feature: I can upload a preset file
     Given I should see "Import site admin preset"
     And I click on "Import" "button"
     And I should see "You must supply a value here"
-    And I upload "adminpresets/tests/fixtures/import_settings_plugins.xml" file to "Select file" filemanager
+    And I upload "admin/presets/tests/fixtures/import_settings_plugins.xml" file to "Select file" filemanager
     And I click on "Import" "button"
     And I should see "Setting changes"
     And I should see "Imported preset"
@@ -31,7 +31,7 @@ Feature: I can upload a preset file
   Scenario: Rename imported settings
     Given I should see "Import site admin preset"
     And I set the field "Name" to "Renamed preset"
-    And I upload "adminpresets/tests/fixtures/import_settings_plugins.xml" file to "Select file" filemanager
+    And I upload "admin/presets/tests/fixtures/import_settings_plugins.xml" file to "Select file" filemanager
     And I click on "Import" "button"
     And I should not see "Imported preset"
     And I should see "Renamed preset"
@@ -42,7 +42,7 @@ Feature: I can upload a preset file
 
   Scenario: Import settings from an invalid XML file
     Given I set the field "Name" to "Renamed preset"
-    And I upload "adminpresets/tests/fixtures/invalid_xml_file.xml" file to "Select file" filemanager
+    And I upload "admin/presets/tests/fixtures/invalid_xml_file.xml" file to "Select file" filemanager
     When I click on "Import" "button"
     Then I should see "Wrong file"
     And I should not see "Setting changes"
@@ -51,7 +51,7 @@ Feature: I can upload a preset file
 
   Scenario: Import unexisting settings category
     Given I set the field "Name" to "Renamed preset"
-    And I upload "adminpresets/tests/fixtures/unexisting_category.xml" file to "Select file" filemanager
+    And I upload "admin/presets/tests/fixtures/unexisting_category.xml" file to "Select file" filemanager
     When I click on "Import" "button"
     Then I should see "No valid settings"
     And I should not see "Setting changes"
@@ -63,7 +63,7 @@ Feature: I can upload a preset file
       | debug | 0 |
       | debugdisplay | 0 |
     And I set the field "Name" to "Renamed preset"
-    And I upload "adminpresets/tests/fixtures/import_settings_with_unexisting_setting.xml" file to "Select file" filemanager
+    And I upload "admin/presets/tests/fixtures/import_settings_with_unexisting_setting.xml" file to "Select file" filemanager
     When I click on "Import" "button"
     And I should see "Setting changes"
     And I should see "Enable portfolios" in the "core" "table_row"

diff --git a/admin/tool/admin_presets/tests/generator/lib.php b/admin/tool/admin_presets/tests/generator/lib.php
@@ -17,7 +17,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
-require_once($CFG->dirroot . '/adminpresets/tests/generator/lib.php');
+require_once($CFG->dirroot . '/admin/presets/tests/generator/lib.php');
 
 /**
  * Data generator the admin_presets tool.

diff --git a/admin/tool/admin_presets/tests/local/action/import_test.php b/admin/tool/admin_presets/tests/local/action/import_test.php
@@ -189,7 +189,7 @@ public function test_import_execute(string $filecontents, bool $expectedpreset,
      * @return array
      */
     public function import_execute_provider(): array {
-        $fixturesfolder = __DIR__ . '/../../../../../../adminpresets/tests/fixtures/';
+        $fixturesfolder = __DIR__ . '/../../../../../presets/tests/fixtures/';
 
         return [
             'Import settings from an empty file' => [

diff --git a/config-dist.php b/config-dist.php
@@ -1163,7 +1163,7 @@
 // This setting accepts the following values:
 // - One of the core preset names (i.e "starter" or "full").
 // - The path of a valid XML preset file, that will be imported and applied. Absolute paths are recommended, to
-//   guarantee the file is found: i.e."MOODLEPATH/adminpresets/tests/fixtures/import_settings_plugins.xml".
+//   guarantee the file is found: i.e."MOODLEPATH/admin/presets/tests/fixtures/import_settings_plugins.xml".
 //
 // This setting is only used during the installation process. So once the Moodle site is installed, it is ignored.
 //

diff --git a/lib/components.json b/lib/components.json
@@ -45,7 +45,7 @@
     "subsystems": {
         "access": null,
         "admin": "admin",
-        "adminpresets": "adminpresets",
+        "adminpresets": "admin/presets",
         "analytics": "analytics",
         "antivirus": "lib\/antivirus",
         "auth": "auth",

diff --git a/lib/db/install.php b/lib/db/install.php
@@ -333,6 +333,6 @@ function xmldb_main_install() {
     badges_install_default_backpacks();
 
     // Create default core site admin presets.
-    require_once($CFG->dirroot . '/adminpresets/classes/helper.php');
+    require_once($CFG->dirroot . '/admin/presets/classes/helper.php');
     \core_adminpresets\helper::create_default_presets();
 }
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
@@ -3508,7 +3508,7 @@ function xmldb_main_upgrade($oldversion) {
 
         if ($DB->count_records('adminpresets', ['iscore' => 1]) == 0) {
             // Create default core site admin presets.
-            require_once($CFG->dirroot . '/adminpresets/classes/helper.php');
+            require_once($CFG->dirroot . '/admin/presets/classes/helper.php');
             \core_adminpresets\helper::create_default_presets();
         }
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -209,7 +209,7 @@
       <directory suffix="_test.php">reportbuilder/tests</directory>
     </testsuite>
     <testsuite name="core_adminpresets_testsuite">
-      <directory suffix="_test.php">adminpresets/tests</directory>
+      <directory suffix="_test.php">admin/presets/tests</directory>
     </testsuite>
 
     <!--Plugin suites: use admin/tool/phpunit/cli/util.php to build phpunit.xml from

diff --git a/version.php b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2022020200.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2022020201.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 $release  = '4.0dev+ (Build: 20220202)'; // Human-friendly version name