mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove OC/Core autoloading from old autoloader

This commit is contained in:
Lukas Reschke 2016-04-06 11:01:17 +02:00
parent a4b19a5b1e
commit c952adabb5
No known key found for this signature in database
GPG Key ID: 9AB0ADB949B6898C
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/autoloader.php
View File

@ -110,7 +110,7 @@ class Autoloader {
$split[1] = strtolower($split[1]); $split[1] = strtolower($split[1]);
if ($split[1] === 'core') { if ($split[1] === 'core') {
$paths[] = \OC::$SERVERROOT . '/core/' . strtolower(str_replace('\\', '/', $split[2])) . '.php'; // Covered by PSR-4 autoloader
} else if ($split[1] === 'settings') { } else if ($split[1] === 'settings') {
$paths[] = \OC::$SERVERROOT . '/settings/' . strtolower(str_replace('\\', '/', $split[2])) . '.php'; $paths[] = \OC::$SERVERROOT . '/settings/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
} else { } else {

4
tests/lib/autoloader.php
View File

@ -77,9 +77,7 @@ class AutoLoader extends TestCase {
} }
public function testLoadCoreNamespaceCore() { public function testLoadCoreNamespaceCore() {
$this->assertEquals([ $this->assertEquals([], $this->loader->findClass('OC\Core\Foo\Bar'));
\OC::$SERVERROOT . '/core/foo/bar.php',
], $this->loader->findClass('OC\Core\Foo\Bar'));
} }
public function testLoadCoreNamespaceSettings() { public function testLoadCoreNamespaceSettings() {