diff options
10 files changed, 20 insertions, 22 deletions
diff --git a/lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php b/lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php index 59e247f3307..ce2d68054f2 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 index 0eeb81730d4..251906bfca9 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 index be0f2f9d2a9..2a9fafa9f73 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 index f5b2e032032..54e78dc5a5b 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/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php index 4afd29cd060..2c2f46a59f4 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/public/appframework/app.php b/lib/public/appframework/app.php index 09297d91ee8..e5069150765 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 8e138bdc1a8..a860bdcfbf1 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 dd4ec3af96f..f70308dc731 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 b063ef32835..3ceab1aac48 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 2b76e4beaa9..c16c21c9c10 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 |