mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5280 from owncloud/shorten_controller_namespace 

OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller
This commit is contained in:
Thomas Müller 2013-10-11 12:51:07 -07:00
parent 053b55721d d75d80ba13
commit 60541358ac
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/appframework/http/dispatcher.php
View File

@ -25,7 +25,7 @@
namespace OC\AppFramework\Http;
use \OC\AppFramework\Middleware\MiddlewareDispatcher;
use OCP\AppFramework\Controller\Controller;
use OCP\AppFramework\Controller;
/**

2
lib/private/appframework/middleware/middlewaredispatcher.php
View File

@ -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;

2
lib/public/appframework/controller/controller.php → lib/public/appframework/controller.php
View File

@ -22,7 +22,7 @@
*/
namespace OCP\AppFramework\Controller;
namespace OCP\AppFramework;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\IAppContainer;

2
lib/public/appframework/middleware.php
View File

@ -24,7 +24,7 @@
namespace OCP\AppFramework;
use OCP\AppFramework\Controller\Controller;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Response;

2
tests/lib/appframework/AppTest.php
View File

@ -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(

2
tests/lib/appframework/controller/ControllerTest.php
View File

@ -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;

2
tests/lib/appframework/http/DispatcherTest.php
View File

@ -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(

2
tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
View File

@ -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()));
}

2
tests/lib/appframework/middleware/MiddlewareTest.php
View File

@ -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');

4
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
View File

@ -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(