adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-02 09:32:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactoring component handling, closes #4795, tests added. deprecated Controller::_initComponents();

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7070 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2008-05-31 03:54:22 +00:00
parent 3a643bad92
commit cf896eaa9b
9 changed files with 259 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cake/dispatcher.php
View file

@ -114,7 +114,7 @@ class Dispatcher extends Object {
}
if (is_array($url)) {
$url = $this->extractParams($url, $additionalParams);
$url = $this->__extractParams($url, $additionalParams);
$parse = false;
}
@ -216,7 +216,6 @@ class Dispatcher extends Object {
}
Router::setRequestInfo(array($this->params, array('base' => $this->base, 'here' => $this->here, 'webroot' => $this->webroot)));
$controller->constructClasses();
$this->start($controller);
if ($privateAction) {
@ -268,15 +267,8 @@ class Dispatcher extends Object {
$controller->output = $output;
}
foreach ($controller->components as $c) {
$path = preg_split('/\/|\./', $c);
$c = $path[count($path) - 1];
if (isset($controller->{$c}) && is_object($controller->{$c}) && is_callable(array($controller->{$c}, 'shutdown'))) {
if (!array_key_exists('enabled', get_object_vars($controller->{$c})) || $controller->{$c}->enabled == true) {
$controller->{$c}->shutdown($controller);
}
}
}
$controller->Component->shutdown($controller);
$controller->afterFilter();
if (isset($params['return'])) {
return $controller->output;
@ -291,6 +283,10 @@ class Dispatcher extends Object {
* @access public
*/
function start(&$controller) {
$controller->constructClasses();
$controller->Component->initialize($controller);
if (!empty($controller->beforeFilter)) {
trigger_error(sprintf(__('Dispatcher::start - Controller::$beforeFilter property usage is deprecated and will no longer be supported. Use Controller::beforeFilter().', true)), E_USER_WARNING);
@ -308,15 +304,7 @@ class Dispatcher extends Object {
}
$controller->beforeFilter();
foreach ($controller->components as $c) {
$path = preg_split('/\/|\./', $c);
$c = $path[count($path) - 1];
if (isset($controller->{$c}) && is_object($controller->{$c}) && is_callable(array($controller->{$c}, 'startup'))) {
if (!array_key_exists('enabled', get_object_vars($controller->{$c})) || $controller->{$c}->enabled == true) {
$controller->{$c}->startup($controller);
}
}
}
$controller->Component->startup($controller);
}
/**
* Sets the params when $url is passed as an array to Object::requestAction();
@ -328,7 +316,7 @@ class Dispatcher extends Object {
* @todo commented Router::url(). this improved performance,
* will work on this more later.
*/
function extractParams($url, $additionalParams = array()) {
function __extractParams($url, $additionalParams = array()) {
$defaults = array('pass' => array(), 'named' => array(), 'form' => array());
$this->params = array_merge($defaults, $url, $additionalParams);
//$url = Router::url($url);