AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move some class instancaiations outside the router

Browse Source
This commit is contained in:
Frédéric Guillot
2014-11-14 23:04:20 -05:00
parent b081288188
commit 46f19336c0
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Controller/Base.php
View File

@@ -4,8 +4,11 @@ namespace Controller;
use Pimple\Container; use Pimple\Container;
use Core\Tool; use Core\Tool;
use Core\Registry;
use Core\Security; use Core\Security;
use Core\Request;
use Core\Response;
use Core\Template;
use Core\Session;
use Model\LastLogin; use Model\LastLogin;
/** /**
@@ -46,34 +49,34 @@ abstract class Base
/** /**
* Request instance * Request instance
* *
* @accesss public * @accesss protected
* @var \Core\Request * @var Core\Request
*/ */
public $request; protected $request;
/** /**
* Response instance * Response instance
* *
* @accesss public * @accesss protected
* @var \Core\Response * @var Core\Response
*/ */
public $response; protected $response;
/** /**
* Template instance * Template instance
* *
* @accesss public * @accesss protected
* @var \Core\Template * @var Core\Template
*/ */
public $template; protected $template;
/** /**
* Session instance * Session instance
* *
* @accesss public * @accesss public
* @var \Core\Session * @var Core\Session
*/ */
public $session; protected $session;
/** /**
* Container instance * Container instance
@@ -92,6 +95,10 @@ abstract class Base
public function __construct(Container $container) public function __construct(Container $container)
{ {
$this->container = $container; $this->container = $container;
$this->request = new Request;
$this->response = new Response;
$this->session = new Session;
$this->template = new Template;
} }
/** /**

4
app/Core/Router.php
View File

@@ -84,10 +84,6 @@ class Router
} }
$instance = new $class($this->container); $instance = new $class($this->container);
$instance->request = new Request;
$instance->response = new Response;
$instance->session = new Session;
$instance->template = new Template;
$instance->beforeAction($this->controller, $this->action); $instance->beforeAction($this->controller, $this->action);
$instance->$method(); $instance->$method();

2
app/Event/Base.php
View File

@@ -22,7 +22,7 @@ use Core\Tool;
abstract class Base implements Listener abstract class Base implements Listener
{ {
/** /**
* Registry instance * Container instance
* *
* @access protected * @access protected
* @var Pimple\Container * @var Pimple\Container