commit
7a6966cdfe
|
@ -102,8 +102,6 @@ class Autoloader {
|
|||
}
|
||||
} elseif (strpos($class, 'OC_') === 0) {
|
||||
$paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
|
||||
} elseif (strpos($class, 'OCP\\') === 0) {
|
||||
$paths[] = \OC::$SERVERROOT . '/lib/public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php');
|
||||
} elseif (strpos($class, 'OCA\\') === 0) {
|
||||
list(, $app, $rest) = explode('\\', $class, 3);
|
||||
$app = strtolower($app);
|
||||
|
|
|
@ -481,11 +481,7 @@ class OC {
|
|||
$loaderStart = microtime(true);
|
||||
require_once __DIR__ . '/autoloader.php';
|
||||
self::$loader = new \OC\Autoloader([
|
||||
OC::$SERVERROOT . '/lib',
|
||||
OC::$SERVERROOT . '/core',
|
||||
OC::$SERVERROOT . '/settings',
|
||||
OC::$SERVERROOT . '/ocs',
|
||||
OC::$SERVERROOT . '/ocs-provider',
|
||||
OC::$SERVERROOT . '/lib/private/legacy',
|
||||
]);
|
||||
if (defined('PHPUNIT_RUN')) {
|
||||
self::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
|
||||
|
|
|
@ -19,18 +19,6 @@ class AutoLoaderTest extends TestCase {
|
|||
$this->loader = new \OC\AutoLoader([]);
|
||||
}
|
||||
|
||||
public function testLeadingSlashOnClassName() {
|
||||
$this->assertEquals([
|
||||
\OC::$SERVERROOT . '/lib/public/files/storage/local.php',
|
||||
], $this->loader->findClass('\OCP\Files\Storage\Local'));
|
||||
}
|
||||
|
||||
public function testNoLeadingSlashOnClassName() {
|
||||
$this->assertEquals([
|
||||
\OC::$SERVERROOT . '/lib/public/files/storage/local.php',
|
||||
], $this->loader->findClass('OCP\Files\Storage\Local'));
|
||||
}
|
||||
|
||||
public function testLegacyPath() {
|
||||
$this->assertEquals([
|
||||
\OC::$SERVERROOT . '/lib/private/legacy/files.php',
|
||||
|
@ -50,9 +38,7 @@ class AutoLoaderTest extends TestCase {
|
|||
}
|
||||
|
||||
public function testLoadPublicNamespace() {
|
||||
$this->assertEquals([
|
||||
\OC::$SERVERROOT . '/lib/public/foo/bar.php',
|
||||
], $this->loader->findClass('OCP\Foo\Bar'));
|
||||
$this->assertEquals([], $this->loader->findClass('OCP\Foo\Bar'));
|
||||
}
|
||||
|
||||
public function testLoadAppNamespace() {
|
||||
|
|
Loading…
Reference in New Issue