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

Remove OC/Settings from old autoloader

This commit is contained in:
Lukas Reschke 2016-04-06 11:13:15 +02:00
parent c12bb839e1
commit 5a0c936f99
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

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

4
tests/lib/autoloader.php
View File

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