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

fixed configuration of 'enabled' setting in components inside a

Browse source 
component
This commit is contained in:
Val Bancer 2016-10-28 22:14:20 +02:00
parent 1a58d15632
commit 744b455de1
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Controller/Component.php
View file

@ -90,7 +90,7 @@ class Component extends CakeObject {
*/ */
public function __get($name) { public function __get($name) {
if (isset($this->_componentMap[$name]) && !isset($this->{$name})) { if (isset($this->_componentMap[$name]) && !isset($this->{$name})) {
$settings = array('enabled' => false) + (array)$this->_componentMap[$name]['settings']; $settings = (array)$this->_componentMap[$name]['settings'] + array('enabled' => false);
$this->{$name} = $this->_Collection->load($this->_componentMap[$name]['class'], $settings); $this->{$name} = $this->_Collection->load($this->_componentMap[$name]['class'], $settings);
} }
if (isset($this->{$name})) { if (isset($this->{$name})) {

18
lib/Cake/Test/Case/Controller/ComponentTest.php
View file

@ -31,7 +31,10 @@ class ParamTestComponent extends Component {
* *
* @var array * @var array
*/ */
public $components = array('Banana' => array('config' => 'value')); public $components = array(
'Apple' => array('enabled' => true),
'Banana' => array('config' => 'value'),
);
} }
/** /**
@ -286,4 +289,17 @@ class ComponentTest extends CakeTestCase {
$this->assertInstanceOf('EmailComponent', $Controller->SomethingWithEmail->Email); $this->assertInstanceOf('EmailComponent', $Controller->SomethingWithEmail->Email);
} }
/**
* Test lazy loading of components inside components and both explicit and
* implicit 'enabled' setting.
*
* @return void
*/
public function testGet() {
$Collection = new ComponentCollection();
$ParamTest = $Collection->load('ParamTest');
$this->assertTrue($ParamTest->Apple->settings['enabled']);
$this->assertFalse($ParamTest->Banana->settings['enabled']);
}
} }