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

Merge pull request #11805 from owncloud/AdamWill-issue9643 

use Composer autoloader not OC for non-Composer 3rdparty (#9643)
This commit is contained in:
Lukas Reschke 2014-10-28 13:09:07 +01:00
parent 437a660680 0e3f2055d2
commit c864f5e20c
3 changed files with 18 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/autoloader.php
View File

@ -21,26 +21,6 @@ class Autoloader {
*/
protected $memoryCache;
/**
* Add a custom prefix to the autoloader
*
* @param string $prefix
* @param string $path
*/
public function registerPrefix($prefix, $path) {
$this->prefixPaths[$prefix] = $path;
}
/**
* Add a custom classpath to the autoloader
*
* @param string $class
* @param string $path
*/
public function registerClass($class, $path) {
$this->classPaths[$class] = $path;
}
/**
* disable the usage of the global classpath \OC::$CLASSPATH
*/
@ -99,14 +79,6 @@ class Autoloader {
$paths[] = 'tests/lib/' . strtolower(str_replace('_', '/', substr($class, 5)) . '.php');
} elseif (strpos($class, 'Test\\') === 0) {
$paths[] = 'tests/lib/' . strtolower(str_replace('\\', '/', substr($class, 5)) . '.php');
} else {
foreach ($this->prefixPaths as $prefix => $dir) {
if (0 === strpos($class, $prefix)) {
$path = str_replace('\\', '/', $class) . '.php';
$path = str_replace('_', '/', $path);
$paths[] = $dir . '/' . $path;
}
}
}
return $paths;
}

34
lib/base.php
View File

@ -447,17 +447,27 @@ class OC {
$loaderStart = microtime(true);
require_once __DIR__ . '/autoloader.php';
self::$loader = new \OC\Autoloader();
self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib');
self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib');
self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing');
self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console');
self::$loader->registerPrefix('Patchwork', '3rdparty');
self::$loader->registerPrefix('Pimple', '3rdparty/Pimple');
spl_autoload_register(array(self::$loader, 'load'));
$loaderEnd = microtime(true);
// setup the basic server
self::initPaths();
// setup 3rdparty autoloader
$vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
if (file_exists($vendorAutoLoad)) {
$loader = require_once $vendorAutoLoad;
$loader->add('Pimple',OC::$THIRDPARTYROOT . '/3rdparty/Pimple');
$loader->add('Doctrine\\Common',OC::$THIRDPARTYROOT . '/3rdparty/doctrine/common/lib');
$loader->add('Doctrine\\DBAL',OC::$THIRDPARTYROOT . '/3rdparty/doctrine/dbal/lib');
$loader->add('Symfony\\Component\\Routing',OC::$THIRDPARTYROOT . '/3rdparty/symfony/routing');
$loader->add('Symfony\\Component\\Console',OC::$THIRDPARTYROOT . '/3rdparty/symfony/console');
$loader->add('Patchwork',OC::$THIRDPARTYROOT . '/3rdparty');
} else {
OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
}
// setup the basic server
self::$server = new \OC\Server();
\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
\OC::$server->getEventLogger()->start('boot', 'Initialize');
@ -494,17 +504,9 @@ class OC {
self::handleAuthHeaders();
self::registerAutoloaderCache();
OC_Util::isSetLocaleWorking();
// setup 3rdparty autoloader
$vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
if (file_exists($vendorAutoLoad)) {
require_once $vendorAutoLoad;
}
// initialize intl fallback is necessary
\Patchwork\Utf8\Bootup::initIntl();
OC_Util::isSetLocaleWorking();
if (!defined('PHPUNIT_RUN')) {
OC\Log\ErrorHandler::setLogger(OC_Log::$object);

15
tests/lib/autoloader.php
View File

@ -30,21 +30,6 @@ class AutoLoader extends \PHPUnit_Framework_TestCase {
$this->assertEquals(array('private/legacy/files.php', 'private/files.php'), $this->loader->findClass('OC_Files'));
}
public function testClassPath() {
$this->loader->registerClass('Foo\Bar', 'foobar.php');
$this->assertEquals(array('foobar.php'), $this->loader->findClass('Foo\Bar'));
}
public function testPrefixNamespace() {
$this->loader->registerPrefix('Foo', 'foo');
$this->assertEquals(array('foo/Foo/Bar.php'), $this->loader->findClass('Foo\Bar'));
}
public function testPrefix() {
$this->loader->registerPrefix('Foo_', 'foo');
$this->assertEquals(array('foo/Foo/Bar.php'), $this->loader->findClass('Foo_Bar'));
}
public function testLoadTestNamespace() {
$this->assertEquals(array('tests/lib/foo/bar.php'), $this->loader->findClass('Test\Foo\Bar'));
}