diff options
| -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..117672aa3c0 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -110,7 +110,7 @@ class Autoloader { $split[1] = strtolower($split[1]); if ($split[1] === 'core') { - $paths[] = \OC::$SERVERROOT . '/core/' . strtolower(str_replace('\\', '/', $split[2])) . '.php'; + // Covered by PSR-4 autoloader } else if ($split[1] === 'settings') { $paths[] = \OC::$SERVERROOT . '/settings/' . strtolower(str_replace('\\', '/', $split[2])) . '.php'; } else { diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php index 6443d87a2e5..c31c6871634 100644 --- a/tests/lib/autoloader.php +++ b/tests/lib/autoloader.php @@ -77,9 +77,7 @@ class AutoLoader extends TestCase { } public function testLoadCoreNamespaceCore() { - $this->assertEquals([ - \OC::$SERVERROOT . '/core/foo/bar.php', - ], $this->loader->findClass('OC\Core\Foo\Bar')); + $this->assertEquals([], $this->loader->findClass('OC\Core\Foo\Bar')); } public function testLoadCoreNamespaceSettings() { |