diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-04-06 11:01:17 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-04-06 11:34:29 +0200 |
| commit | c952adabb553ef1ee0a3c8ff6125e0048f750428 (patch) | |
| tree | 0b0b9e40393a53150d817d33805defbd3eb2f877 | |
| parent | a4b19a5b1e4079752e33d6eb75c72a47ce048bde (diff) | |
| download | nextcloud-server-c952adabb553ef1ee0a3c8ff6125e0048f750428.tar.gz nextcloud-server-c952adabb553ef1ee0a3c8ff6125e0048f750428.zip | |
Remove OC/Core autoloading 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..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() { |