diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-04-06 11:13:15 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-04-06 11:34:53 +0200 |
| commit | 5a0c936f99668fe5db0ffef8c76384ae0fe7fe52 (patch) | |
| tree | c3a9e715e8f299c0ce5c4ccec05d723fd2d6a803 | |
| parent | c12bb839e197990db86f0062fa6b7ec54aff5121 (diff) | |
| download | nextcloud-server-5a0c936f99668fe5db0ffef8c76384ae0fe7fe52.tar.gz nextcloud-server-5a0c936f99668fe5db0ffef8c76384ae0fe7fe52.zip | |
Remove OC/Settings from old autoloader
| -rw-r--r-- | lib/autoloader.php | 2 | ||||
| -rw-r--r-- | tests/lib/autoloader.php | 4 |
2 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/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() { |