Keep the composer instance so we can add psr4 paths later

This commit is contained in:
Joas Schilling 2016-05-02 14:10:53 +02:00
parent d7eb17bdc0
commit 8668560352
No known key found for this signature in database
GPG Key ID: 70A0B324C41C0946
1 changed files with 4 additions and 1 deletions

View File

@ -103,6 +103,9 @@ class OC {
*/ */
public static $loader = null; public static $loader = null;
/** @var \Composer\Autoload\ClassLoader $composerAutoloader */
public static $composerAutoloader = null;
/** /**
* @var \OC\Server * @var \OC\Server
*/ */
@ -493,7 +496,7 @@ class OC {
self::$CLI = (php_sapi_name() == 'cli'); self::$CLI = (php_sapi_name() == 'cli');
// Add default composer PSR-4 autoloader // Add default composer PSR-4 autoloader
require_once OC::$SERVERROOT . '/lib/composer/autoload.php'; self::$composerAutoloader = require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
try { try {
self::initPaths(); self::initPaths();