[owncloud] add the renamed patch i forgot to include...
Adam Williamson
adamwill at fedoraproject.org
Fri Aug 29 06:49:26 UTC 2014
commit cf9db91ade1c26311171428b830189fd2f8f8c00
Author: Adam Williamson <awilliam at redhat.com>
Date: Thu Aug 28 23:48:38 2014 -0700
add the renamed patch i forgot to include...
owncloud-7.0.2-composer_3rdparty_autoloader.patch | 90 +++++++++++++++++++++
1 files changed, 90 insertions(+), 0 deletions(-)
---
diff --git a/owncloud-7.0.2-composer_3rdparty_autoloader.patch b/owncloud-7.0.2-composer_3rdparty_autoloader.patch
new file mode 100644
index 0000000..8297a85
--- /dev/null
+++ b/owncloud-7.0.2-composer_3rdparty_autoloader.patch
@@ -0,0 +1,90 @@
+diff --git a/lib/autoloader.php b/lib/autoloader.php
+index 54f01d9..f592712 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 1c69d6f..01e6dea 100644
+--- a/lib/base.php
++++ b/lib/base.php
+@@ -439,12 +439,6 @@ class OC {
+ // register autoloader
+ 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'));
+
+ // make a dummy session available as early as possible since error pages need it
+@@ -484,14 +478,23 @@ class OC {
+ self::initPaths();
+ self::registerAutoloaderCache();
+
+- OC_Util::isSetLocaleWorking();
+-
+ // setup 3rdparty autoloader
+ $vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
+ if (file_exists($vendorAutoLoad)) {
+- require_once $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.');
+ }
+
++ OC_Util::isSetLocaleWorking();
++
+ if (!defined('PHPUNIT_RUN')) {
+ OC\Log\ErrorHandler::setLogger(OC_Log::$object);
+ if (defined('DEBUG') and DEBUG) {
More information about the scm-commits
mailing list