summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2016-01-10 09:59:30 +0100
committerRoeland Jago Douma <rullzer@owncloud.com>2016-03-09 16:53:27 +0100
commitf7729cdc403a8d4c5a4e9e75e3142bcb51b7250e (patch)
tree0f11b67bbf707e777dd5f1497cff3d9f85dbaea5 /lib/base.php
parent0cc53ee06dafbd3984bbf1d554585a5731b500a9 (diff)
downloadnextcloud-server-f7729cdc403a8d4c5a4e9e75e3142bcb51b7250e.tar.gz
nextcloud-server-f7729cdc403a8d4c5a4e9e75e3142bcb51b7250e.zip
Add composers default autoloader to core
This introduces the defacto standard PSR-4 autoloader from composer into core. This will allow proper PSR-4 naming of our classes. Since our original autoloader is still available we can slowly switch over classes to PSR-4.
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php
index 9db4a482f23..3e384f02a21 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -516,6 +516,9 @@ class OC {
exit();
}
+ // Add default composer PSR-4 autoloader
+ require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
+
// setup the basic server
self::$server = new \OC\Server(\OC::$WEBROOT, self::$config);
\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);