From c12bb839e197990db86f0062fa6b7ec54aff5121 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 6 Apr 2016 11:09:55 +0200 Subject: [PATCH 1/2] Rename files to be PSR-4 compliant --- .../controller.php => ChangePassword/Controller.php} | 0 .../AppSettingsController.php} | 0 .../CertificateController.php} | 0 .../CheckSetupController.php} | 0 .../EncryptionController.php} | 0 .../groupscontroller.php => Controller/GroupsController.php} | 0 .../LogSettingsController.php} | 0 .../MailSettingsController.php} | 0 .../SecuritySettingsController.php} | 0 .../userscontroller.php => Controller/UsersController.php} | 0 .../subadminmiddleware.php => Middleware/SubadminMiddleware.php} | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename settings/{changepassword/controller.php => ChangePassword/Controller.php} (100%) rename settings/{controller/appsettingscontroller.php => Controller/AppSettingsController.php} (100%) rename settings/{controller/certificatecontroller.php => Controller/CertificateController.php} (100%) rename settings/{controller/checksetupcontroller.php => Controller/CheckSetupController.php} (100%) rename settings/{controller/encryptioncontroller.php => Controller/EncryptionController.php} (100%) rename settings/{controller/groupscontroller.php => Controller/GroupsController.php} (100%) rename settings/{controller/logsettingscontroller.php => Controller/LogSettingsController.php} (100%) rename settings/{controller/mailsettingscontroller.php => Controller/MailSettingsController.php} (100%) rename settings/{controller/securitysettingscontroller.php => Controller/SecuritySettingsController.php} (100%) rename settings/{controller/userscontroller.php => Controller/UsersController.php} (100%) rename settings/{middleware/subadminmiddleware.php => Middleware/SubadminMiddleware.php} (100%) diff --git a/settings/changepassword/controller.php b/settings/ChangePassword/Controller.php similarity index 100% rename from settings/changepassword/controller.php rename to settings/ChangePassword/Controller.php diff --git a/settings/controller/appsettingscontroller.php b/settings/Controller/AppSettingsController.php similarity index 100% rename from settings/controller/appsettingscontroller.php rename to settings/Controller/AppSettingsController.php diff --git a/settings/controller/certificatecontroller.php b/settings/Controller/CertificateController.php similarity index 100% rename from settings/controller/certificatecontroller.php rename to settings/Controller/CertificateController.php diff --git a/settings/controller/checksetupcontroller.php b/settings/Controller/CheckSetupController.php similarity index 100% rename from settings/controller/checksetupcontroller.php rename to settings/Controller/CheckSetupController.php diff --git a/settings/controller/encryptioncontroller.php b/settings/Controller/EncryptionController.php similarity index 100% rename from settings/controller/encryptioncontroller.php rename to settings/Controller/EncryptionController.php diff --git a/settings/controller/groupscontroller.php b/settings/Controller/GroupsController.php similarity index 100% rename from settings/controller/groupscontroller.php rename to settings/Controller/GroupsController.php diff --git a/settings/controller/logsettingscontroller.php b/settings/Controller/LogSettingsController.php similarity index 100% rename from settings/controller/logsettingscontroller.php rename to settings/Controller/LogSettingsController.php diff --git a/settings/controller/mailsettingscontroller.php b/settings/Controller/MailSettingsController.php similarity index 100% rename from settings/controller/mailsettingscontroller.php rename to settings/Controller/MailSettingsController.php diff --git a/settings/controller/securitysettingscontroller.php b/settings/Controller/SecuritySettingsController.php similarity index 100% rename from settings/controller/securitysettingscontroller.php rename to settings/Controller/SecuritySettingsController.php diff --git a/settings/controller/userscontroller.php b/settings/Controller/UsersController.php similarity index 100% rename from settings/controller/userscontroller.php rename to settings/Controller/UsersController.php diff --git a/settings/middleware/subadminmiddleware.php b/settings/Middleware/SubadminMiddleware.php similarity index 100% rename from settings/middleware/subadminmiddleware.php rename to settings/Middleware/SubadminMiddleware.php From 5a0c936f99668fe5db0ffef8c76384ae0fe7fe52 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 6 Apr 2016 11:13:15 +0200 Subject: [PATCH 2/2] Remove OC/Settings from old autoloader --- lib/autoloader.php | 2 +- tests/lib/autoloader.php | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/autoloader.php b/lib/autoloader.php index 87a07f6da1..9e198a0351 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -112,7 +112,7 @@ class Autoloader { if ($split[1] === 'core') { $paths[] = \OC::$SERVERROOT . '/core/' . strtolower(str_replace('\\', '/', $split[2])) . '.php'; } else if ($split[1] === 'settings') { - $paths[] = \OC::$SERVERROOT . '/settings/' . strtolower(str_replace('\\', '/', $split[2])) . '.php'; + // Covered by PSR-4 autoloader } else { $paths[] = \OC::$SERVERROOT . '/lib/private/' . $split[1] . '/' . strtolower(str_replace('\\', '/', $split[2])) . '.php'; } diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php index 6443d87a2e..fafdefd01b 100644 --- a/tests/lib/autoloader.php +++ b/tests/lib/autoloader.php @@ -83,9 +83,7 @@ class AutoLoader extends TestCase { } public function testLoadCoreNamespaceSettings() { - $this->assertEquals([ - \OC::$SERVERROOT . '/settings/foo/bar.php', - ], $this->loader->findClass('OC\Settings\Foo\Bar')); + $this->assertEquals([], $this->loader->findClass('OC\Settings\Foo\Bar')); } public function testLoadCoreNamespaceRepair() {