Fix inconsistent nameing of AppFramework

This commit is contained in:
Roeland Jago Douma 2016-04-22 15:28:48 +02:00
parent 1d33a5ef13
commit 4eebccd81f
No known key found for this signature in database
GPG Key ID: 1E152838F164D13B
10 changed files with 20 additions and 22 deletions

View File

@ -21,7 +21,7 @@
* *
*/ */
namespace OC\Appframework\Middleware\Security\Exceptions; namespace OC\AppFramework\Middleware\Security\Exceptions;
use OCP\AppFramework\Http; use OCP\AppFramework\Http;
@ -29,7 +29,7 @@ use OCP\AppFramework\Http;
* Class AppNotEnabledException is thrown when a resource for an application is * Class AppNotEnabledException is thrown when a resource for an application is
* requested that is not enabled. * requested that is not enabled.
* *
* @package OC\Appframework\Middleware\Security\Exceptions * @package OC\AppFramework\Middleware\Security\Exceptions
*/ */
class AppNotEnabledException extends SecurityException { class AppNotEnabledException extends SecurityException {
public function __construct() { public function __construct() {

View File

@ -21,7 +21,7 @@
* *
*/ */
namespace OC\Appframework\Middleware\Security\Exceptions; namespace OC\AppFramework\Middleware\Security\Exceptions;
use OCP\AppFramework\Http; use OCP\AppFramework\Http;
@ -29,7 +29,7 @@ use OCP\AppFramework\Http;
* Class CrossSiteRequestForgeryException is thrown when a CSRF exception has * Class CrossSiteRequestForgeryException is thrown when a CSRF exception has
* been encountered. * been encountered.
* *
* @package OC\Appframework\Middleware\Security\Exceptions * @package OC\AppFramework\Middleware\Security\Exceptions
*/ */
class CrossSiteRequestForgeryException extends SecurityException { class CrossSiteRequestForgeryException extends SecurityException {
public function __construct() { public function __construct() {

View File

@ -21,7 +21,7 @@
* *
*/ */
namespace OC\Appframework\Middleware\Security\Exceptions; namespace OC\AppFramework\Middleware\Security\Exceptions;
use OCP\AppFramework\Http; use OCP\AppFramework\Http;
@ -29,7 +29,7 @@ use OCP\AppFramework\Http;
* Class NotAdminException is thrown when a resource has been requested by a * Class NotAdminException is thrown when a resource has been requested by a
* non-admin user that is not accessible to non-admin users. * 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 { class NotAdminException extends SecurityException {
public function __construct() { public function __construct() {

View File

@ -21,7 +21,7 @@
* *
*/ */
namespace OC\Appframework\Middleware\Security\Exceptions; namespace OC\AppFramework\Middleware\Security\Exceptions;
use OCP\AppFramework\Http; use OCP\AppFramework\Http;
@ -29,7 +29,7 @@ use OCP\AppFramework\Http;
* Class NotLoggedInException is thrown when a resource has been requested by a * Class NotLoggedInException is thrown when a resource has been requested by a
* guest user that is not accessible to the public. * 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 { class NotLoggedInException extends SecurityException {
public function __construct() { public function __construct() {

View File

@ -26,10 +26,10 @@
namespace OC\AppFramework\Middleware\Security; namespace OC\AppFramework\Middleware\Security;
use OC\Appframework\Middleware\Security\Exceptions\AppNotEnabledException; use OC\AppFramework\Middleware\Security\Exceptions\AppNotEnabledException;
use OC\Appframework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException; use OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException;
use OC\Appframework\Middleware\Security\Exceptions\NotAdminException; use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException;
use OC\Appframework\Middleware\Security\Exceptions\NotLoggedInException; use OC\AppFramework\Middleware\Security\Exceptions\NotLoggedInException;
use OC\AppFramework\Utility\ControllerMethodReflector; use OC\AppFramework\Utility\ControllerMethodReflector;
use OC\Security\CSP\ContentSecurityPolicyManager; use OC\Security\CSP\ContentSecurityPolicyManager;
use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\ContentSecurityPolicy;

View File

@ -29,7 +29,7 @@
*/ */
namespace OCP\AppFramework; namespace OCP\AppFramework;
use OC\AppFramework\routing\RouteConfig; use OC\AppFramework\Routing\RouteConfig;
/** /**

View File

@ -23,7 +23,7 @@
namespace OC\Settings\Middleware; namespace OC\Settings\Middleware;
use OC\AppFramework\Http; use OC\AppFramework\Http;
use OC\Appframework\Middleware\Security\Exceptions\NotAdminException; use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException;
use OC\AppFramework\Utility\ControllerMethodReflector; use OC\AppFramework\Utility\ControllerMethodReflector;
use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Middleware; use OCP\AppFramework\Middleware;

View File

@ -26,10 +26,10 @@ namespace OC\AppFramework\Middleware\Security;
use OC\AppFramework\Http; use OC\AppFramework\Http;
use OC\AppFramework\Http\Request; use OC\AppFramework\Http\Request;
use OC\Appframework\Middleware\Security\Exceptions\AppNotEnabledException; use OC\AppFramework\Middleware\Security\Exceptions\AppNotEnabledException;
use OC\Appframework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException; use OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException;
use OC\Appframework\Middleware\Security\Exceptions\NotAdminException; use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException;
use OC\Appframework\Middleware\Security\Exceptions\NotLoggedInException; use OC\AppFramework\Middleware\Security\Exceptions\NotLoggedInException;
use OC\AppFramework\Middleware\Security\Exceptions\SecurityException; use OC\AppFramework\Middleware\Security\Exceptions\SecurityException;
use OC\AppFramework\Utility\ControllerMethodReflector; use OC\AppFramework\Utility\ControllerMethodReflector;
use OC\Security\CSP\ContentSecurityPolicy; use OC\Security\CSP\ContentSecurityPolicy;

View File

@ -3,8 +3,6 @@
namespace OC\AppFramework\Routing; namespace OC\AppFramework\Routing;
use OC\AppFramework\DependencyInjection\DIContainer; use OC\AppFramework\DependencyInjection\DIContainer;
use OC\AppFramework\routing\RouteConfig;
class RoutingTest extends \Test\TestCase class RoutingTest extends \Test\TestCase
{ {

View File

@ -10,7 +10,7 @@
namespace OC\Settings\Middleware; namespace OC\Settings\Middleware;
use OC\Appframework\Middleware\Security\Exceptions\NotAdminException; use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException;
use OC\AppFramework\Utility\ControllerMethodReflector; use OC\AppFramework\Utility\ControllerMethodReflector;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\TemplateResponse; 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() { public function testBeforeControllerAsUserWithExemption() {
$this->reflector $this->reflector