Merge pull request #23819 from owncloud/move-core-completely-to-psr4

Move OC/Core completely to PSR-4
This commit is contained in:
Roeland Douma 2016-04-06 13:31:44 +02:00
commit 93b1768eb7
60 changed files with 2 additions and 4 deletions

View File

@ -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') {
// Covered by PSR-4 autoloader
} else {

View File

@ -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() {