Merge pull request #11921 from owncloud/symfony-composer

Symfony composer

3rdparty

@@ -1 +1 @@
-Subproject commit 7534a6a2b7549cc5db0a7f32749d962bfe9b2d3d
+Subproject commit c37dc06ce2906813dec3296d1a58c1628c206a31

core/command/upgrade.php

@@ -34,6 +34,7 @@ class Upgrade extends Command {
 	 * @param IConfig $config
 	 */
 	public function __construct(IConfig $config) {
+		parent::__construct();
 		$this->config = $config;
 	}
 

lib/base.php

@@ -459,8 +459,6 @@ class OC {
 		if (file_exists($vendorAutoLoad)) {
 			$loader = require_once $vendorAutoLoad;
 			$loader->add('Pimple',OC::$THIRDPARTYROOT . '/3rdparty/Pimple');
-			$loader->add('Symfony\\Component\\Routing',OC::$THIRDPARTYROOT . '/3rdparty/symfony/routing');
-			$loader->add('Symfony\\Component\\Console',OC::$THIRDPARTYROOT . '/3rdparty/symfony/console');
 		} else {
 			OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
 			OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');