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

Merge pull request #8017 from Raydiation/master 

Remove dependency on container, removing service locator antipattern
This commit is contained in:
blizzz 2014-04-07 10:19:18 +02:00
parent e295d48fd4 5f3b8c45d7
commit 0c444fb2fb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/public/appframework/controller.php
View File

@ -38,10 +38,10 @@ use OCP\IRequest;
abstract class Controller {
/**
* app container for dependency injection
* @var \OCP\AppFramework\IAppContainer
* app name
* @var string
*/
protected $app;
protected $appName;
/**
* current request
@ -51,11 +51,11 @@ abstract class Controller {
/**
* constructor of the controller
* @param IAppContainer $app interface to the app
* @param string $appName the name of the app
* @param IRequest $request an instance of the request
*/
public function __construct(IAppContainer $app, IRequest $request){
$this->app = $app;
public function __construct($appName, IRequest $request){
$this->appName = $appName;
$this->request = $request;
}
@ -136,7 +136,7 @@ abstract class Controller {
*/
public function render($templateName, array $params=array(),
$renderAs='user', array $headers=array()){
$response = new TemplateResponse($this->app->getAppName(), $templateName);
$response = new TemplateResponse($this->appName, $templateName);
$response->setParams($params);
$response->renderAs($renderAs);