Move \OC\AppFramework to PSR-4
* Also moved the autoloader setup a bit up since we need it in initpaths
This commit is contained in:
parent
606b756a94
commit
1d33a5ef13
23 changed files with 5 additions and 5 deletions
|
@ -488,6 +488,9 @@ class OC {
|
|||
|
||||
self::$CLI = (php_sapi_name() == 'cli');
|
||||
|
||||
// Add default composer PSR-4 autoloader
|
||||
require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
|
||||
|
||||
try {
|
||||
self::initPaths();
|
||||
// setup 3rdparty autoloader
|
||||
|
@ -507,9 +510,6 @@ 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);
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
namespace OC\AppFramework\routing;
|
||||
namespace OC\AppFramework\Routing;
|
||||
|
||||
use \OC\AppFramework\App;
|
||||
use \OC\AppFramework\DependencyInjection\DIContainer;
|
|
@ -24,7 +24,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
namespace OC\AppFramework\routing;
|
||||
namespace OC\AppFramework\Routing;
|
||||
|
||||
use OC\AppFramework\DependencyInjection\DIContainer;
|
||||
use OCP\Route\IRouter;
|
Loading…
Reference in a new issue