diff options
-rw-r--r-- | lib/base.php | 6 | ||||
-rw-r--r-- | lib/private/AppFramework/App.php (renamed from lib/private/appframework/app.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Core/API.php (renamed from lib/private/appframework/core/api.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Db/Db.php (renamed from lib/private/appframework/db/db.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/DependencyInjection/DIContainer.php (renamed from lib/private/appframework/dependencyinjection/dicontainer.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Http.php (renamed from lib/private/appframework/http.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Http/Dispatcher.php (renamed from lib/private/appframework/http/dispatcher.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Http/Output.php (renamed from lib/private/appframework/http/output.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Http/Request.php (renamed from lib/private/appframework/http/request.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Middleware/MiddlewareDispatcher.php (renamed from lib/private/appframework/middleware/middlewaredispatcher.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Middleware/Security/CORSMiddleware.php (renamed from lib/private/appframework/middleware/security/corsmiddleware.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php (renamed from lib/private/appframework/middleware/security/exceptions/appnotenabledexception.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php (renamed from lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php (renamed from lib/private/appframework/middleware/security/exceptions/notadminexception.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php (renamed from lib/private/appframework/middleware/security/exceptions/notloggedinexception.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Middleware/Security/Exceptions/SecurityException.php (renamed from lib/private/appframework/middleware/security/exceptions/securityexception.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php (renamed from lib/private/appframework/middleware/security/securitymiddleware.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Middleware/SessionMiddleware.php (renamed from lib/private/appframework/middleware/sessionmiddleware.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Routing/RouteActionHandler.php (renamed from lib/private/appframework/routing/routeactionhandler.php) | 2 | ||||
-rw-r--r-- | lib/private/AppFramework/Routing/RouteConfig.php (renamed from lib/private/appframework/routing/routeconfig.php) | 2 | ||||
-rw-r--r-- | lib/private/AppFramework/Utility/ControllerMethodReflector.php (renamed from lib/private/appframework/utility/controllermethodreflector.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Utility/SimpleContainer.php (renamed from lib/private/appframework/utility/simplecontainer.php) | 0 | ||||
-rw-r--r-- | lib/private/AppFramework/Utility/TimeFactory.php (renamed from lib/private/appframework/utility/timefactory.php) | 0 |
23 files changed, 5 insertions, 5 deletions
diff --git a/lib/base.php b/lib/base.php index 8ea164a5007..87e69842cb5 100644 --- a/lib/base.php +++ b/lib/base.php @@ -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); diff --git a/lib/private/appframework/app.php b/lib/private/AppFramework/App.php index 376a8559454..376a8559454 100644 --- a/lib/private/appframework/app.php +++ b/lib/private/AppFramework/App.php diff --git a/lib/private/appframework/core/api.php b/lib/private/AppFramework/Core/API.php index 67b696948f0..67b696948f0 100644 --- a/lib/private/appframework/core/api.php +++ b/lib/private/AppFramework/Core/API.php diff --git a/lib/private/appframework/db/db.php b/lib/private/AppFramework/Db/Db.php index 0d17d7bc225..0d17d7bc225 100644 --- a/lib/private/appframework/db/db.php +++ b/lib/private/AppFramework/Db/Db.php diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index f74fe4aeb99..f74fe4aeb99 100644 --- a/lib/private/appframework/dependencyinjection/dicontainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php diff --git a/lib/private/appframework/http.php b/lib/private/AppFramework/Http.php index a99f7ea437f..a99f7ea437f 100644 --- a/lib/private/appframework/http.php +++ b/lib/private/AppFramework/Http.php diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php index 641339c0d94..641339c0d94 100644 --- a/lib/private/appframework/http/dispatcher.php +++ b/lib/private/AppFramework/Http/Dispatcher.php diff --git a/lib/private/appframework/http/output.php b/lib/private/AppFramework/Http/Output.php index 469c809c21c..469c809c21c 100644 --- a/lib/private/appframework/http/output.php +++ b/lib/private/AppFramework/Http/Output.php diff --git a/lib/private/appframework/http/request.php b/lib/private/AppFramework/Http/Request.php index 7cd8cedcfdd..7cd8cedcfdd 100644 --- a/lib/private/appframework/http/request.php +++ b/lib/private/AppFramework/Http/Request.php diff --git a/lib/private/appframework/middleware/middlewaredispatcher.php b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php index 4bd25f79bba..4bd25f79bba 100644 --- a/lib/private/appframework/middleware/middlewaredispatcher.php +++ b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php diff --git a/lib/private/appframework/middleware/security/corsmiddleware.php b/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php index 258119b326a..258119b326a 100644 --- a/lib/private/appframework/middleware/security/corsmiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php diff --git a/lib/private/appframework/middleware/security/exceptions/appnotenabledexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php index 59e247f3307..59e247f3307 100644 --- a/lib/private/appframework/middleware/security/exceptions/appnotenabledexception.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php diff --git a/lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php index 0eeb81730d4..0eeb81730d4 100644 --- a/lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php diff --git a/lib/private/appframework/middleware/security/exceptions/notadminexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php index be0f2f9d2a9..be0f2f9d2a9 100644 --- a/lib/private/appframework/middleware/security/exceptions/notadminexception.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php diff --git a/lib/private/appframework/middleware/security/exceptions/notloggedinexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php index f5b2e032032..f5b2e032032 100644 --- a/lib/private/appframework/middleware/security/exceptions/notloggedinexception.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php diff --git a/lib/private/appframework/middleware/security/exceptions/securityexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/SecurityException.php index c86614ec477..c86614ec477 100644 --- a/lib/private/appframework/middleware/security/exceptions/securityexception.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/SecurityException.php diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php index 4afd29cd060..4afd29cd060 100644 --- a/lib/private/appframework/middleware/security/securitymiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php diff --git a/lib/private/appframework/middleware/sessionmiddleware.php b/lib/private/AppFramework/Middleware/SessionMiddleware.php index b218b48ea11..b218b48ea11 100644 --- a/lib/private/appframework/middleware/sessionmiddleware.php +++ b/lib/private/AppFramework/Middleware/SessionMiddleware.php diff --git a/lib/private/appframework/routing/routeactionhandler.php b/lib/private/AppFramework/Routing/RouteActionHandler.php index b282fc1b452..e8a7b8a1c61 100644 --- a/lib/private/appframework/routing/routeactionhandler.php +++ b/lib/private/AppFramework/Routing/RouteActionHandler.php @@ -21,7 +21,7 @@ * */ -namespace OC\AppFramework\routing; +namespace OC\AppFramework\Routing; use \OC\AppFramework\App; use \OC\AppFramework\DependencyInjection\DIContainer; diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/AppFramework/Routing/RouteConfig.php index dd029ba9a00..f2ec5c0c881 100644 --- a/lib/private/appframework/routing/routeconfig.php +++ b/lib/private/AppFramework/Routing/RouteConfig.php @@ -24,7 +24,7 @@ * */ -namespace OC\AppFramework\routing; +namespace OC\AppFramework\Routing; use OC\AppFramework\DependencyInjection\DIContainer; use OCP\Route\IRouter; diff --git a/lib/private/appframework/utility/controllermethodreflector.php b/lib/private/AppFramework/Utility/ControllerMethodReflector.php index de83749fbaf..de83749fbaf 100644 --- a/lib/private/appframework/utility/controllermethodreflector.php +++ b/lib/private/AppFramework/Utility/ControllerMethodReflector.php diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php index 78ded39735e..78ded39735e 100644 --- a/lib/private/appframework/utility/simplecontainer.php +++ b/lib/private/AppFramework/Utility/SimpleContainer.php diff --git a/lib/private/appframework/utility/timefactory.php b/lib/private/AppFramework/Utility/TimeFactory.php index 5241b367069..5241b367069 100644 --- a/lib/private/appframework/utility/timefactory.php +++ b/lib/private/AppFramework/Utility/TimeFactory.php |