adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making Controller use ComponentCollection.

Browse source
This commit is contained in:
mark_story 2010-07-04 15:13:13 -04:00
parent 256532b8e4
commit fac97738ce
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cake/libs/controller/component_collection.php
View file

@ -20,6 +20,23 @@ App::import('Core', 'ObjectCollection');
class ComponentCollection extends ObjectCollection { class ComponentCollection extends ObjectCollection {
/**
* Initializes all the Components for a controller.
* Attaches a reference of each component to the Controller.
*
* @param Controller $controller Controller to initialize components for.
* @return void
*/
public function init(Controller $Controller) {
if (empty($Controller->components)) {
return;
}
$components = ComponentCollection::normalizeObjectArray($Controller->components);
foreach ($components as $name => $properties) {
$Controller->{$name} = $this->load($properites['class'], $properties['settings']);
}
}
/** /**
* Loads/constructs a component. Will return the instance in the registry if it already exists. * Loads/constructs a component. Will return the instance in the registry if it already exists.
* *

22
cake/libs/controller/controller.php
View file

@ -192,7 +192,7 @@ class Controller extends Object {
* *
* @var string * @var string
*/ */
public $Component = null; public $Components = null;
/** /**
* Array containing the names of components this controller uses. Component names * Array containing the names of components this controller uses. Component names
@ -342,7 +342,7 @@ class Controller extends Object {
} }
$this->modelClass = Inflector::classify($this->name); $this->modelClass = Inflector::classify($this->name);
$this->modelKey = Inflector::underscore($this->modelClass); $this->modelKey = Inflector::underscore($this->modelClass);
$this->Component = new Component(); $this->Components = new ComponentCollection();
$childMethods = get_class_methods($this); $childMethods = get_class_methods($this);
$parentMethods = get_class_methods('Controller'); $parentMethods = get_class_methods('Controller');
@ -443,7 +443,7 @@ class Controller extends Object {
*/ */
public function constructClasses() { public function constructClasses() {
$this->__mergeVars(); $this->__mergeVars();
$this->Component->init($this); $this->Components->init($this);
if ($this->uses !== null || ($this->uses !== array())) { if ($this->uses !== null || ($this->uses !== array())) {
if (empty($this->passedArgs) || !isset($this->passedArgs['0'])) { if (empty($this->passedArgs) || !isset($this->passedArgs['0'])) {
@ -471,7 +471,7 @@ class Controller extends Object {
/** /**
* Perform the startup process for this controller. * Perform the startup process for this controller.
* Fire the Component and Controller callbacks in the correct order. * Fire the Components and Controller callbacks in the correct order.
* *
* - Initializes components, which fires their `initialize` callback * - Initializes components, which fires their `initialize` callback
* - Calls the controller `beforeFilter`. * - Calls the controller `beforeFilter`.
@ -480,14 +480,14 @@ class Controller extends Object {
* @return void * @return void
*/ */
public function startupProcess() { public function startupProcess() {
$this->Component->initialize($this); $this->Components->trigger('initialize', array(&$this));
$this->beforeFilter(); $this->beforeFilter();
$this->Component->triggerCallback('startup', $this); $this->Components->trigger('startup', array(&$this));
} }
/** /**
* Perform the various shutdown processes for this controller. * Perform the various shutdown processes for this controller.
* Fire the Component and Controller callbacks in the correct order. * Fire the Components and Controller callbacks in the correct order.
* *
* - triggers the component `shutdown` callback. * - triggers the component `shutdown` callback.
* - calls the Controller's `afterFilter` method. * - calls the Controller's `afterFilter` method.
@ -495,7 +495,7 @@ class Controller extends Object {
* @return void * @return void
*/ */
public function shutdownProcess() { public function shutdownProcess() {
$this->Component->triggerCallback('shutdown', $this); $this->Components->trigger('shutdown', array(&$this));
$this->afterFilter(); $this->afterFilter();
} }
@ -622,7 +622,11 @@ class Controller extends Object {
if (is_array($status)) { if (is_array($status)) {
extract($status, EXTR_OVERWRITE); extract($status, EXTR_OVERWRITE);
} }
$response = $this->Component->beforeRedirect($this, $url, $status, $exit); $response = $this->Components->trigger(
'beforeRedirect',
array(&$this, $url, $status, $exit),
array('break' => true, 'breakOn' => false)
);
if ($response === false) { if ($response === false) {
return; return;