From d75d80ba133c40ec519422db85f1493cbdc9edeb Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Fri, 11 Oct 2013 10:07:57 +0200 Subject: [PATCH] OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller --- lib/private/appframework/http/dispatcher.php | 2 +- lib/private/appframework/middleware/middlewaredispatcher.php | 2 +- lib/public/appframework/{controller => }/controller.php | 2 +- lib/public/appframework/middleware.php | 2 +- tests/lib/appframework/AppTest.php | 2 +- tests/lib/appframework/controller/ControllerTest.php | 2 +- tests/lib/appframework/http/DispatcherTest.php | 2 +- .../lib/appframework/middleware/MiddlewareDispatcherTest.php | 2 +- tests/lib/appframework/middleware/MiddlewareTest.php | 2 +- .../middleware/security/SecurityMiddlewareTest.php | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) rename lib/public/appframework/{controller => }/controller.php (99%) diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/appframework/http/dispatcher.php index 2a9ed121488..51283fd64e7 100644 --- a/lib/private/appframework/http/dispatcher.php +++ b/lib/private/appframework/http/dispatcher.php @@ -25,7 +25,7 @@ namespace OC\AppFramework\Http; use \OC\AppFramework\Middleware\MiddlewareDispatcher; -use OCP\AppFramework\Controller\Controller; +use OCP\AppFramework\Controller; /** diff --git a/lib/private/appframework/middleware/middlewaredispatcher.php b/lib/private/appframework/middleware/middlewaredispatcher.php index c46ddc7cb02..681140c2242 100644 --- a/lib/private/appframework/middleware/middlewaredispatcher.php +++ b/lib/private/appframework/middleware/middlewaredispatcher.php @@ -24,7 +24,7 @@ namespace OC\AppFramework\Middleware; -use OCP\AppFramework\Controller\Controller; +use OCP\AppFramework\Controller; use OCP\AppFramework\Http\Response; use OCP\AppFramework\MiddleWare; diff --git a/lib/public/appframework/controller/controller.php b/lib/public/appframework/controller.php similarity index 99% rename from lib/public/appframework/controller/controller.php rename to lib/public/appframework/controller.php index b3de8c991ad..1642b508572 100644 --- a/lib/public/appframework/controller/controller.php +++ b/lib/public/appframework/controller.php @@ -22,7 +22,7 @@ */ -namespace OCP\AppFramework\Controller; +namespace OCP\AppFramework; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\IAppContainer; diff --git a/lib/public/appframework/middleware.php b/lib/public/appframework/middleware.php index 13b4b8cab99..94f71ea8520 100644 --- a/lib/public/appframework/middleware.php +++ b/lib/public/appframework/middleware.php @@ -24,7 +24,7 @@ namespace OCP\AppFramework; -use OCP\AppFramework\Controller\Controller; +use OCP\AppFramework\Controller; use OCP\AppFramework\Http\Response; diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php index 8942e2f442d..9bedcb446e7 100644 --- a/tests/lib/appframework/AppTest.php +++ b/tests/lib/appframework/AppTest.php @@ -40,7 +40,7 @@ class AppTest extends \PHPUnit_Framework_TestCase { protected function setUp() { $this->container = new \OC\AppFramework\DependencyInjection\DIContainer('test'); $this->controller = $this->getMockBuilder( - 'OCP\AppFramework\Controller\Controller') + 'OCP\AppFramework\Controller') ->disableOriginalConstructor() ->getMock(); $this->dispatcher = $this->getMockBuilder( diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php index 614744394ed..f17d5f24aa5 100644 --- a/tests/lib/appframework/controller/ControllerTest.php +++ b/tests/lib/appframework/controller/ControllerTest.php @@ -25,7 +25,7 @@ namespace Test\AppFramework\Controller; use OC\AppFramework\Http\Request; -use OCP\AppFramework\Controller\Controller; +use OCP\AppFramework\Controller; use OCP\AppFramework\Http\TemplateResponse; diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php index fb9fd0d582a..9052fe0781a 100644 --- a/tests/lib/appframework/http/DispatcherTest.php +++ b/tests/lib/appframework/http/DispatcherTest.php @@ -62,7 +62,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { ->disableOriginalConstructor() ->getMock(); $this->controller = $this->getMock( - '\OCP\AppFramework\Controller\Controller', + '\OCP\AppFramework\Controller', array($this->controllerMethod), array($app, $request)); $this->dispatcher = new Dispatcher( diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php index 5a43099ebb5..95d42e4eb8e 100644 --- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php +++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php @@ -128,7 +128,7 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase { private function getControllerMock(){ - return $this->getMock('OCP\AppFramework\Controller\Controller', array('method'), + return $this->getMock('OCP\AppFramework\Controller', array('method'), array($this->getAPIMock(), new Request())); } diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php index fde67fbd395..7a93c0d4dda 100644 --- a/tests/lib/appframework/middleware/MiddlewareTest.php +++ b/tests/lib/appframework/middleware/MiddlewareTest.php @@ -47,7 +47,7 @@ class MiddlewareTest extends \PHPUnit_Framework_TestCase { $this->api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', array(), array('test')); - $this->controller = $this->getMock('OCP\AppFramework\Controller\Controller', + $this->controller = $this->getMock('OCP\AppFramework\Controller', array(), array($this->api, new Request())); $this->exception = new \Exception(); $this->response = $this->getMock('OCP\AppFramework\Http\Response'); diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php index b647c01826b..4bfd725ffd0 100644 --- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php +++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php @@ -40,7 +40,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { public function setUp() { $api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', array(), array('test')); - $this->controller = $this->getMock('OCP\AppFramework\Controller\Controller', + $this->controller = $this->getMock('OCP\AppFramework\Controller', array(), array($api, new Request())); $this->request = new Request(); @@ -302,7 +302,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { $api->expects($this->once())->method('getServer') ->will($this->returnValue($serverMock)); - $this->controller = $this->getMock('OCP\AppFramework\Controller\Controller', + $this->controller = $this->getMock('OCP\AppFramework\Controller', array(), array($api, new Request())); $this->request = new Request( -- 2.39.5