diff --git a/lib/base.php b/lib/base.php index 0174627cb7..fb58177a43 100644 --- a/lib/base.php +++ b/lib/base.php @@ -492,6 +492,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 @@ -511,9 +514,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 similarity index 100% rename from lib/private/appframework/app.php rename to lib/private/AppFramework/App.php diff --git a/lib/private/appframework/core/api.php b/lib/private/AppFramework/Core/API.php similarity index 100% rename from lib/private/appframework/core/api.php rename to lib/private/AppFramework/Core/API.php diff --git a/lib/private/appframework/db/db.php b/lib/private/AppFramework/Db/Db.php similarity index 100% rename from lib/private/appframework/db/db.php rename to lib/private/AppFramework/Db/Db.php diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php similarity index 100% rename from lib/private/appframework/dependencyinjection/dicontainer.php rename to lib/private/AppFramework/DependencyInjection/DIContainer.php diff --git a/lib/private/appframework/http.php b/lib/private/AppFramework/Http.php similarity index 100% rename from lib/private/appframework/http.php rename to lib/private/AppFramework/Http.php diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php similarity index 100% rename from lib/private/appframework/http/dispatcher.php rename to lib/private/AppFramework/Http/Dispatcher.php diff --git a/lib/private/appframework/http/output.php b/lib/private/AppFramework/Http/Output.php similarity index 100% rename from lib/private/appframework/http/output.php rename to lib/private/AppFramework/Http/Output.php diff --git a/lib/private/appframework/http/request.php b/lib/private/AppFramework/Http/Request.php similarity index 100% rename from lib/private/appframework/http/request.php rename to lib/private/AppFramework/Http/Request.php diff --git a/lib/private/appframework/middleware/middlewaredispatcher.php b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php similarity index 100% rename from lib/private/appframework/middleware/middlewaredispatcher.php rename to lib/private/AppFramework/Middleware/MiddlewareDispatcher.php diff --git a/lib/private/appframework/middleware/security/corsmiddleware.php b/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php similarity index 100% rename from lib/private/appframework/middleware/security/corsmiddleware.php rename to 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 similarity index 90% rename from lib/private/appframework/middleware/security/exceptions/appnotenabledexception.php rename to lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php index 59e247f330..ce2d68054f 100644 --- a/lib/private/appframework/middleware/security/exceptions/appnotenabledexception.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php @@ -21,7 +21,7 @@ * */ -namespace OC\Appframework\Middleware\Security\Exceptions; +namespace OC\AppFramework\Middleware\Security\Exceptions; use OCP\AppFramework\Http; @@ -29,7 +29,7 @@ use OCP\AppFramework\Http; * Class AppNotEnabledException is thrown when a resource for an application is * requested that is not enabled. * - * @package OC\Appframework\Middleware\Security\Exceptions + * @package OC\AppFramework\Middleware\Security\Exceptions */ class AppNotEnabledException extends SecurityException { public function __construct() { diff --git a/lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php similarity index 90% rename from lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php rename to lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php index 0eeb81730d..251906bfca 100644 --- a/lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php @@ -21,7 +21,7 @@ * */ -namespace OC\Appframework\Middleware\Security\Exceptions; +namespace OC\AppFramework\Middleware\Security\Exceptions; use OCP\AppFramework\Http; @@ -29,7 +29,7 @@ use OCP\AppFramework\Http; * Class CrossSiteRequestForgeryException is thrown when a CSRF exception has * been encountered. * - * @package OC\Appframework\Middleware\Security\Exceptions + * @package OC\AppFramework\Middleware\Security\Exceptions */ class CrossSiteRequestForgeryException extends SecurityException { public function __construct() { diff --git a/lib/private/appframework/middleware/security/exceptions/notadminexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php similarity index 91% rename from lib/private/appframework/middleware/security/exceptions/notadminexception.php rename to lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php index be0f2f9d2a..2a9fafa9f7 100644 --- a/lib/private/appframework/middleware/security/exceptions/notadminexception.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php @@ -21,7 +21,7 @@ * */ -namespace OC\Appframework\Middleware\Security\Exceptions; +namespace OC\AppFramework\Middleware\Security\Exceptions; use OCP\AppFramework\Http; @@ -29,7 +29,7 @@ use OCP\AppFramework\Http; * Class NotAdminException is thrown when a resource has been requested by a * non-admin user that is not accessible to non-admin users. * - * @package OC\Appframework\Middleware\Security\Exceptions + * @package OC\AppFramework\Middleware\Security\Exceptions */ class NotAdminException extends SecurityException { public function __construct() { diff --git a/lib/private/appframework/middleware/security/exceptions/notloggedinexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php similarity index 91% rename from lib/private/appframework/middleware/security/exceptions/notloggedinexception.php rename to lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php index f5b2e03203..54e78dc5a5 100644 --- a/lib/private/appframework/middleware/security/exceptions/notloggedinexception.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php @@ -21,7 +21,7 @@ * */ -namespace OC\Appframework\Middleware\Security\Exceptions; +namespace OC\AppFramework\Middleware\Security\Exceptions; use OCP\AppFramework\Http; @@ -29,7 +29,7 @@ use OCP\AppFramework\Http; * Class NotLoggedInException is thrown when a resource has been requested by a * guest user that is not accessible to the public. * - * @package OC\Appframework\Middleware\Security\Exceptions + * @package OC\AppFramework\Middleware\Security\Exceptions */ class NotLoggedInException extends SecurityException { public function __construct() { diff --git a/lib/private/appframework/middleware/security/exceptions/securityexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/SecurityException.php similarity index 100% rename from lib/private/appframework/middleware/security/exceptions/securityexception.php rename to 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 similarity index 96% rename from lib/private/appframework/middleware/security/securitymiddleware.php rename to lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php index 4afd29cd06..2c2f46a59f 100644 --- a/lib/private/appframework/middleware/security/securitymiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php @@ -26,10 +26,10 @@ namespace OC\AppFramework\Middleware\Security; -use OC\Appframework\Middleware\Security\Exceptions\AppNotEnabledException; -use OC\Appframework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException; -use OC\Appframework\Middleware\Security\Exceptions\NotAdminException; -use OC\Appframework\Middleware\Security\Exceptions\NotLoggedInException; +use OC\AppFramework\Middleware\Security\Exceptions\AppNotEnabledException; +use OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException; +use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException; +use OC\AppFramework\Middleware\Security\Exceptions\NotLoggedInException; use OC\AppFramework\Utility\ControllerMethodReflector; use OC\Security\CSP\ContentSecurityPolicyManager; use OCP\AppFramework\Http\ContentSecurityPolicy; diff --git a/lib/private/appframework/middleware/sessionmiddleware.php b/lib/private/AppFramework/Middleware/SessionMiddleware.php similarity index 100% rename from lib/private/appframework/middleware/sessionmiddleware.php rename to lib/private/AppFramework/Middleware/SessionMiddleware.php diff --git a/lib/private/appframework/routing/routeactionhandler.php b/lib/private/AppFramework/Routing/RouteActionHandler.php similarity index 97% rename from lib/private/appframework/routing/routeactionhandler.php rename to lib/private/AppFramework/Routing/RouteActionHandler.php index b282fc1b45..e8a7b8a1c6 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 similarity index 99% rename from lib/private/appframework/routing/routeconfig.php rename to lib/private/AppFramework/Routing/RouteConfig.php index dd029ba9a0..f2ec5c0c88 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 similarity index 100% rename from lib/private/appframework/utility/controllermethodreflector.php rename to lib/private/AppFramework/Utility/ControllerMethodReflector.php diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php similarity index 100% rename from lib/private/appframework/utility/simplecontainer.php rename to lib/private/AppFramework/Utility/SimpleContainer.php diff --git a/lib/private/appframework/utility/timefactory.php b/lib/private/AppFramework/Utility/TimeFactory.php similarity index 100% rename from lib/private/appframework/utility/timefactory.php rename to lib/private/AppFramework/Utility/TimeFactory.php diff --git a/lib/public/appframework/app.php b/lib/public/appframework/app.php index 09297d91ee..e506915076 100644 --- a/lib/public/appframework/app.php +++ b/lib/public/appframework/app.php @@ -29,7 +29,7 @@ */ namespace OCP\AppFramework; -use OC\AppFramework\routing\RouteConfig; +use OC\AppFramework\Routing\RouteConfig; /** diff --git a/settings/Middleware/SubadminMiddleware.php b/settings/Middleware/SubadminMiddleware.php index 8e138bdc1a..a860bdcfbf 100644 --- a/settings/Middleware/SubadminMiddleware.php +++ b/settings/Middleware/SubadminMiddleware.php @@ -23,7 +23,7 @@ namespace OC\Settings\Middleware; use OC\AppFramework\Http; -use OC\Appframework\Middleware\Security\Exceptions\NotAdminException; +use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException; use OC\AppFramework\Utility\ControllerMethodReflector; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Middleware; diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php index dd4ec3af96..f70308dc73 100644 --- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php +++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php @@ -26,10 +26,10 @@ namespace OC\AppFramework\Middleware\Security; use OC\AppFramework\Http; use OC\AppFramework\Http\Request; -use OC\Appframework\Middleware\Security\Exceptions\AppNotEnabledException; -use OC\Appframework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException; -use OC\Appframework\Middleware\Security\Exceptions\NotAdminException; -use OC\Appframework\Middleware\Security\Exceptions\NotLoggedInException; +use OC\AppFramework\Middleware\Security\Exceptions\AppNotEnabledException; +use OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException; +use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException; +use OC\AppFramework\Middleware\Security\Exceptions\NotLoggedInException; use OC\AppFramework\Middleware\Security\Exceptions\SecurityException; use OC\AppFramework\Utility\ControllerMethodReflector; use OC\Security\CSP\ContentSecurityPolicy; diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php index b063ef3283..3ceab1aac4 100644 --- a/tests/lib/appframework/routing/RoutingTest.php +++ b/tests/lib/appframework/routing/RoutingTest.php @@ -3,8 +3,6 @@ namespace OC\AppFramework\Routing; use OC\AppFramework\DependencyInjection\DIContainer; -use OC\AppFramework\routing\RouteConfig; - class RoutingTest extends \Test\TestCase { diff --git a/tests/settings/middleware/subadminmiddlewaretest.php b/tests/settings/middleware/subadminmiddlewaretest.php index 2b76e4beaa..c16c21c9c1 100644 --- a/tests/settings/middleware/subadminmiddlewaretest.php +++ b/tests/settings/middleware/subadminmiddlewaretest.php @@ -10,7 +10,7 @@ namespace OC\Settings\Middleware; -use OC\Appframework\Middleware\Security\Exceptions\NotAdminException; +use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException; use OC\AppFramework\Utility\ControllerMethodReflector; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\TemplateResponse; @@ -42,7 +42,7 @@ class SubadminMiddlewareTest extends \Test\TestCase { } /** - * @expectedException \OC\Appframework\Middleware\Security\Exceptions\NotAdminException + * @expectedException \OC\AppFramework\Middleware\Security\Exceptions\NotAdminException */ public function testBeforeControllerAsUserWithExemption() { $this->reflector