diff options
| author | Roeland Douma <rullzer@users.noreply.github.com> | 2016-04-06 13:31:05 +0200 |
|---|---|---|
| committer | Roeland Douma <rullzer@users.noreply.github.com> | 2016-04-06 13:31:05 +0200 |
| commit | 7ed271b16870cf31c9fa26e3d045181cd805d9b0 (patch) | |
| tree | 1ebb63af2eed1732408f413587750f4ce554de42 | |
| parent | e2ea289943b3ec26da9fa7d8332307a54a2c6790 (diff) | |
| parent | 5a0c936f99668fe5db0ffef8c76384ae0fe7fe52 (diff) | |
| download | nextcloud-server-7ed271b16870cf31c9fa26e3d045181cd805d9b0.tar.gz nextcloud-server-7ed271b16870cf31c9fa26e3d045181cd805d9b0.zip | |
Merge pull request #23820 from owncloud/move-settings-completely-to-psr4
Move OC/Settings completely to PSR-4
| -rw-r--r-- | lib/autoloader.php | 2 | ||||
| -rw-r--r-- | settings/ChangePassword/Controller.php (renamed from settings/changepassword/controller.php) | 0 | ||||
| -rw-r--r-- | settings/Controller/AppSettingsController.php (renamed from settings/controller/appsettingscontroller.php) | 0 | ||||
| -rw-r--r-- | settings/Controller/CertificateController.php (renamed from settings/controller/certificatecontroller.php) | 0 | ||||
| -rw-r--r-- | settings/Controller/CheckSetupController.php (renamed from settings/controller/checksetupcontroller.php) | 0 | ||||
| -rw-r--r-- | settings/Controller/EncryptionController.php (renamed from settings/controller/encryptioncontroller.php) | 0 | ||||
| -rw-r--r-- | settings/Controller/GroupsController.php (renamed from settings/controller/groupscontroller.php) | 0 | ||||
| -rw-r--r-- | settings/Controller/LogSettingsController.php (renamed from settings/controller/logsettingscontroller.php) | 0 | ||||
| -rw-r--r-- | settings/Controller/MailSettingsController.php (renamed from settings/controller/mailsettingscontroller.php) | 0 | ||||
| -rw-r--r-- | settings/Controller/SecuritySettingsController.php (renamed from settings/controller/securitysettingscontroller.php) | 0 | ||||
| -rw-r--r-- | settings/Controller/UsersController.php (renamed from settings/controller/userscontroller.php) | 0 | ||||
| -rw-r--r-- | settings/Middleware/SubadminMiddleware.php (renamed from settings/middleware/subadminmiddleware.php) | 0 | ||||
| -rw-r--r-- | tests/lib/autoloader.php | 4 |
13 files changed, 2 insertions, 4 deletions
diff --git a/lib/autoloader.php b/lib/autoloader.php index 87a07f6da12..9e198a0351e 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/settings/changepassword/controller.php b/settings/ChangePassword/Controller.php index 8469ec1423a..8469ec1423a 100644 --- a/settings/changepassword/controller.php +++ b/settings/ChangePassword/Controller.php diff --git a/settings/controller/appsettingscontroller.php b/settings/Controller/AppSettingsController.php index cc69d3130d9..cc69d3130d9 100644 --- a/settings/controller/appsettingscontroller.php +++ b/settings/Controller/AppSettingsController.php diff --git a/settings/controller/certificatecontroller.php b/settings/Controller/CertificateController.php index 90d0c664d84..90d0c664d84 100644 --- a/settings/controller/certificatecontroller.php +++ b/settings/Controller/CertificateController.php diff --git a/settings/controller/checksetupcontroller.php b/settings/Controller/CheckSetupController.php index cfdfa5021bc..cfdfa5021bc 100644 --- a/settings/controller/checksetupcontroller.php +++ b/settings/Controller/CheckSetupController.php diff --git a/settings/controller/encryptioncontroller.php b/settings/Controller/EncryptionController.php index 504448a5a2c..504448a5a2c 100644 --- a/settings/controller/encryptioncontroller.php +++ b/settings/Controller/EncryptionController.php diff --git a/settings/controller/groupscontroller.php b/settings/Controller/GroupsController.php index bb8e6755d41..bb8e6755d41 100644 --- a/settings/controller/groupscontroller.php +++ b/settings/Controller/GroupsController.php diff --git a/settings/controller/logsettingscontroller.php b/settings/Controller/LogSettingsController.php index c0c9ee04ca3..c0c9ee04ca3 100644 --- a/settings/controller/logsettingscontroller.php +++ b/settings/Controller/LogSettingsController.php diff --git a/settings/controller/mailsettingscontroller.php b/settings/Controller/MailSettingsController.php index dbba4bd9bc0..dbba4bd9bc0 100644 --- a/settings/controller/mailsettingscontroller.php +++ b/settings/Controller/MailSettingsController.php diff --git a/settings/controller/securitysettingscontroller.php b/settings/Controller/SecuritySettingsController.php index d7274d6bcb2..d7274d6bcb2 100644 --- a/settings/controller/securitysettingscontroller.php +++ b/settings/Controller/SecuritySettingsController.php diff --git a/settings/controller/userscontroller.php b/settings/Controller/UsersController.php index f5b7f2d2e5d..f5b7f2d2e5d 100644 --- a/settings/controller/userscontroller.php +++ b/settings/Controller/UsersController.php diff --git a/settings/middleware/subadminmiddleware.php b/settings/Middleware/SubadminMiddleware.php index 8e138bdc1a8..8e138bdc1a8 100644 --- a/settings/middleware/subadminmiddleware.php +++ b/settings/Middleware/SubadminMiddleware.php diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php index 6443d87a2e5..fafdefd01be 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() { |