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

Automatic injection for CssController 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2017-05-10 09:42:40 +02:00
parent 9c8fe82000
commit d418ea550b
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/Application.php
View File

@ -32,9 +32,6 @@ namespace OC\Core;
use OC\Security\IdentityProof\Manager;
use OCP\AppFramework\App;
use OC\Core\Controller\CssController;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IRequest;
use OCP\Util;
/**
@ -58,13 +55,5 @@ class Application extends App {
\OC::$server->getCrypto()
);
});
$container->registerService(CssController::class, function () use ($container) {
return new CssController(
$container->query('appName'),
$container->query(IRequest::class),
\OC::$server->getAppDataDir('css'),
$container->query(ITimeFactory::class)
);
});
}
}

7
core/Controller/CssController.php
View File

@ -21,6 +21,7 @@
namespace OC\Core\Controller;
use OC\Files\AppData\Factory;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\NotFoundResponse;
@ -43,13 +44,13 @@ class CssController extends Controller {
/**
* @param string $appName
* @param IRequest $request
* @param IAppData $appData
* @param Factory $appDataFactory
* @param ITimeFactory $timeFactory
*/
public function __construct($appName, IRequest $request, IAppData $appData, ITimeFactory $timeFactory) {
public function __construct($appName, IRequest $request, Factory $appDataFactory, ITimeFactory $timeFactory) {
parent::__construct($appName, $request);
$this->appData = $appData;
$this->appData = $appDataFactory->get('css');
$this->timeFactory = $timeFactory;
}

13
tests/Core/Controller/CssControllerTest.php
View File

@ -23,7 +23,7 @@
namespace Tests\Core\Controller;
use OC\Core\Controller\CssController;
use OC\HintException;
use OC\Files\AppData\Factory;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\AppFramework\Http\NotFoundResponse;
@ -40,7 +40,7 @@ class CssControllerTest extends TestCase {
/** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */
private $appData;
/** @var IRequests|\PHPUnit_Framework_MockObject_MockObject */
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
private $request;
/** @var CssController */
@ -49,8 +49,15 @@ class CssControllerTest extends TestCase {
public function setUp() {
parent::setUp();
/** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */
$factory = $this->createMock(Factory::class);
$this->appData = $this->createMock(IAppData::class);
$factory->expects($this->once())
->method('get')
->with('css')
->willReturn($this->appData);
/** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject $timeFactory */
$timeFactory = $this->createMock(ITimeFactory::class);
$timeFactory->method('getTime')
->willReturn(1337);
@ -60,7 +67,7 @@ class CssControllerTest extends TestCase {
$this->controller = new CssController(
'core',
$this->request,
$this->appData,
$factory,
$timeFactory
);
}