deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Load controller as services.

Browse source
This commit is contained in:
Marco Vito Moscaritolo 2015-05-31 13:31:16 +02:00
parent 601d42ea6e
commit b6f25e77c3
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
PHPCI/Application.php
View file

@ -135,8 +135,7 @@ class Application extends b8\Application
if ($this->response->hasLayout() && $this->controller->layout) {
$this->setLayoutVariables($this->controller->layout);
$this->controller->layout->content = $this->response->getContent();
$this->controller->layout->content = $this->response->getContent();
$this->response->setContent($this->controller->layout->render());
}
@ -144,18 +143,26 @@ class Application extends b8\Application
}
/**
* Loads a particular controller, and injects our layout view into it.
* @param $class
* @return mixed
* @return \PHPCI\Controller
*/
protected function loadController($class)
public function getController()
{
$controller = parent::loadController($class);
$controller->layout = new View('layout');
$controller->layout->title = 'PHPCI';
$controller->layout->breadcrumb = array();
if (empty($this->controller)) {
try {
$this->controller = $this->container->get('application.controller.' . strtolower($this->route['controller']));
}
catch (\Exception $e) {
var_dump($this->route);
var_dump($e);
}
}
return $controller;
return $this->controller;
}
public function controllerExists($route)
{
return $this->container->has('application.controller.' . strtolower($route['controller']));
}
/**

4
PHPCI/Controller.php
View file

@ -52,6 +52,10 @@ class Controller extends \b8\Controller
{
parent::__construct($config, $request, $response);
$this->layout = new View('layout');
$this->layout->title = 'PHPCI';
$this->layout->breadcrumb = array();
$class = explode('\\', get_class($this));
$this->className = substr(array_pop($class), 0, -10);
$this->setControllerView();