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

fixes #4858, self referencing components

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7133 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2008-06-06 16:18:14 +00:00
parent 52d72a63b5
commit 1c21457eef
2 changed files with 82 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/libs/controller/component.php
View file

@ -216,8 +216,8 @@ class Component extends Object {
} }
} }
if (isset($object->{$component}->components) && is_array($object->{$component}->components)) { if (isset($object->{$component}->components) && is_array($object->{$component}->components) && (!isset($object->{$component}->{$parent}))) {
$this->_loadComponents($object->{$component}); $this->_loadComponents($object->{$component}, $component);
} }
} }
} }

40
cake/tests/cases/libs/controller/component.test.php
View file

@ -207,6 +207,30 @@ class BananaComponent extends Object {
var $testField = 'BananaField'; var $testField = 'BananaField';
} }
/**
* MutuallyReferencingOneComponent class
*
* @package cake
* @subpackage cake.tests.cases.libs.controller
*/
class MutuallyReferencingOneComponent extends Object {
var $components = array('MutuallyReferencingTwo');
}
/**
* MutuallyReferencingTwoComponent class
*
* @package cake
* @subpackage cake.tests.cases.libs.controller
*/
class MutuallyReferencingTwoComponent extends Object {
var $components = array('MutuallyReferencingOne');
}
/** /**
* ComponentTest class * ComponentTest class
* *
@ -348,5 +372,21 @@ class ComponentTest extends CakeTestCase {
$this->assertEqual($Controller->Orange->settings, array('colour' => 'blood orange', 'ripeness' => 'perfect')); $this->assertEqual($Controller->Orange->settings, array('colour' => 'blood orange', 'ripeness' => 'perfect'));
$this->assertEqual($Controller->ParamTest->test, 'value'); $this->assertEqual($Controller->ParamTest->test, 'value');
} }
/**
* Test mutually referencing components.
*
*
*/
function testMutuallyReferencingComponents() {
$Controller =& new ComponentTestController();
$Controller->components = array('MutuallyReferencingOne');
$Controller->constructClasses();
$Controller->Component->initialize($Controller);
$this->assertTrue(is_a($Controller->MutuallyReferencingOne, 'MutuallyReferencingOneComponent'));
$this->assertTrue(is_a($Controller->MutuallyReferencingOne->MutuallyReferencingTwo, 'MutuallyReferencingTwoComponent'));
$this->assertTrue(is_a($Controller->MutuallyReferencingOne->MutuallyReferencingTwo->MutuallyReferencingOne, 'MutuallyReferencingOneComponent'));
}
} }
?> ?>