diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/autoloader.php | 28 | ||||
| -rw-r--r-- | lib/base.php | 34 |
2 files changed, 18 insertions, 44 deletions
diff --git a/lib/autoloader.php b/lib/autoloader.php index 54f01d9be94..f5927128820 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -22,26 +22,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 */ public function disableGlobalClassPath() { @@ -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; } diff --git a/lib/base.php b/lib/base.php index 4a5f4e77a59..50e415c334c 100644 --- a/lib/base.php +++ b/lib/base.php @@ -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); |