owncloud · DeepDiver1975 · Apr 22, 2016 · Apr 22, 2016 · Apr 22, 2016
diff --git a/lib/base.php b/lib/base.php
@@ -488,6 +488,9 @@ public static function init() {
 
 		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 @@ public static function init() {
 			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 → lib/private/AppFramework/App.php b/lib/private/appframework/app.php → lib/private/AppFramework/App.php
diff --git a/lib/private/appframework/core/api.php → lib/private/AppFramework/Core/API.php b/lib/private/appframework/core/api.php → lib/private/AppFramework/Core/API.php
diff --git a/lib/private/appframework/db/db.php → lib/private/AppFramework/Db/Db.php b/lib/private/appframework/db/db.php → lib/private/AppFramework/Db/Db.php
diff --git a/...ework/dependencyinjection/dicontainer.php → ...ework/DependencyInjection/DIContainer.php b/...ework/dependencyinjection/dicontainer.php → ...ework/DependencyInjection/DIContainer.php
diff --git a/lib/private/appframework/http.php → lib/private/AppFramework/Http.php b/lib/private/appframework/http.php → lib/private/AppFramework/Http.php
diff --git a/lib/private/appframework/http/dispatcher.php → lib/private/AppFramework/Http/Dispatcher.php b/lib/private/appframework/http/dispatcher.php → lib/private/AppFramework/Http/Dispatcher.php
diff --git a/lib/private/appframework/http/output.php → lib/private/AppFramework/Http/Output.php b/lib/private/appframework/http/output.php → lib/private/AppFramework/Http/Output.php
diff --git a/lib/private/appframework/http/request.php → lib/private/AppFramework/Http/Request.php b/lib/private/appframework/http/request.php → lib/private/AppFramework/Http/Request.php
diff --git a/...ework/middleware/middlewaredispatcher.php → ...ework/Middleware/MiddlewareDispatcher.php b/...ework/middleware/middlewaredispatcher.php → ...ework/Middleware/MiddlewareDispatcher.php
diff --git a/...rk/middleware/security/corsmiddleware.php → ...rk/Middleware/Security/CORSMiddleware.php b/...rk/middleware/security/corsmiddleware.php → ...rk/Middleware/Security/CORSMiddleware.php
diff --git a/...ity/exceptions/appnotenabledexception.php → ...ity/Exceptions/AppNotEnabledException.php b/...ity/exceptions/appnotenabledexception.php → ...ity/Exceptions/AppNotEnabledException.php
@@ -21,15 +21,15 @@
  *
  */
 
-namespace OC\Appframework\Middleware\Security\Exceptions;
+namespace OC\AppFramework\Middleware\Security\Exceptions;
 
 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/...ions/crosssiterequestforgeryexception.php → ...ions/CrossSiteRequestForgeryException.php b/...ions/crosssiterequestforgeryexception.php → ...ions/CrossSiteRequestForgeryException.php
@@ -21,15 +21,15 @@
  *
  */
 
-namespace OC\Appframework\Middleware\Security\Exceptions;
+namespace OC\AppFramework\Middleware\Security\Exceptions;
 
 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/...security/exceptions/notadminexception.php → ...Security/Exceptions/NotAdminException.php b/...security/exceptions/notadminexception.php → ...Security/Exceptions/NotAdminException.php
@@ -21,15 +21,15 @@
  *
  */
 
-namespace OC\Appframework\Middleware\Security\Exceptions;
+namespace OC\AppFramework\Middleware\Security\Exceptions;
 
 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/...urity/exceptions/notloggedinexception.php → ...urity/Exceptions/NotLoggedInException.php b/...urity/exceptions/notloggedinexception.php → ...urity/Exceptions/NotLoggedInException.php
@@ -21,15 +21,15 @@
  *
  */
 
-namespace OC\Appframework\Middleware\Security\Exceptions;
+namespace OC\AppFramework\Middleware\Security\Exceptions;
 
 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/...security/exceptions/securityexception.php → ...Security/Exceptions/SecurityException.php b/...security/exceptions/securityexception.php → ...Security/Exceptions/SecurityException.php
diff --git a/...iddleware/security/securitymiddleware.php → ...iddleware/Security/SecurityMiddleware.php b/...iddleware/security/securitymiddleware.php → ...iddleware/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/...ramework/middleware/sessionmiddleware.php → ...ramework/Middleware/SessionMiddleware.php b/...ramework/middleware/sessionmiddleware.php → ...ramework/Middleware/SessionMiddleware.php
diff --git a/...pframework/routing/routeactionhandler.php → ...pFramework/Routing/RouteActionHandler.php b/...pframework/routing/routeactionhandler.php → ...pFramework/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/...vate/appframework/routing/routeconfig.php → ...vate/AppFramework/Routing/RouteConfig.php b/...vate/appframework/routing/routeconfig.php → ...vate/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/...ork/utility/controllermethodreflector.php → ...ork/Utility/ControllerMethodReflector.php b/...ork/utility/controllermethodreflector.php → ...ork/Utility/ControllerMethodReflector.php
diff --git a/.../appframework/utility/simplecontainer.php → .../AppFramework/Utility/SimpleContainer.php b/.../appframework/utility/simplecontainer.php → .../AppFramework/Utility/SimpleContainer.php
diff --git a/...vate/appframework/utility/timefactory.php → ...vate/AppFramework/Utility/TimeFactory.php b/...vate/appframework/utility/timefactory.php → ...vate/AppFramework/Utility/TimeFactory.php
diff --git 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
@@ -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
@@ -26,10 +26,10 @@
 
 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
@@ -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
@@ -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 @@ protected function setUp() {
 	}
 
 	/**
-	 * @expectedException \OC\Appframework\Middleware\Security\Exceptions\NotAdminException
+	 * @expectedException \OC\AppFramework\Middleware\Security\Exceptions\NotAdminException
 	 */
 	public function testBeforeControllerAsUserWithExemption() {
 		$this->reflector