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

Fixing merging of actsAs and _findMethods from PluginAppModel classes. Adding test cases and necessary test classes

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7875 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
mark_story 2008-11-14 20:24:27 +00:00
parent b43128c809
commit 6806b895cb
3 changed files with 99 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cake/libs/model/model.php
View file

@ -379,6 +379,15 @@ class Model extends Overloadable {
if ($this->actsAs !== null || $this->actsAs !== false) {
$merge[] = 'actsAs';
}
$parentClass = get_parent_class($this);
if (strtolower($parentClass) !== 'appmodel') {
$parentVars = get_class_vars($parentClass);
foreach ($merge as $var) {
if (isset($parentVars[$var]) && !empty($parentVars[$var])) {
$appVars[$var] = Set::merge($appVars[$var], $parentVars[$var]);
}
}
}
foreach ($merge as $var) {
if (isset($appVars[$var]) && !empty($appVars[$var]) && is_array($this->{$var})) {

32
cake/tests/cases/libs/model/model.test.php
View file

@ -100,11 +100,14 @@ class ModelTest extends CakeTestCase {
$result = $TestModel->hasAndBelongsToMany;
$expected = array('AssociationTest2' => array(
'unique' => false, 'joinTable' => 'join_as_join_bs', 'foreignKey' => false,
'className' => 'AssociationTest2', 'with' => 'JoinAsJoinB',
'associationForeignKey' => 'join_b_id', 'conditions' => '', 'fields' => '',
'order' => '', 'limit' => '', 'offset' => '', 'finderQuery' => '',
'deleteQuery' => '', 'insertQuery' => ''
'unique' => false,
'joinTable' => 'join_as_join_bs',
'foreignKey' => false,
'className' => 'AssociationTest2',
'with' => 'JoinAsJoinB',
'associationForeignKey' => 'join_b_id',
'conditions' => '', 'fields' => '', 'order' => '', 'limit' => '', 'offset' => '',
'finderQuery' => '', 'deleteQuery' => '', 'insertQuery' => ''
));
$this->assertEqual($result, $expected);
@ -171,6 +174,25 @@ class ModelTest extends CakeTestCase {
$this->assertEqual($TestModel->Tag->name, 'Tag');
$this->assertEqual($TestFakeModel->Tag->name, 'Tag');
}
/**
* test Model::__construct
*
* ensure that $actsAS and $_findMethods are merged.
*
* @return void
**/
function testConstruct() {
$this->loadFixtures('Post', 'Comment');
$TestModel =& ClassRegistry::init('MergeVarPluginPost');
$this->assertEqual($TestModel->actsAs, array('Containable', 'Tree'));
$this->assertTrue(isset($TestModel->Behaviors->Containable));
$this->assertTrue(isset($TestModel->Behaviors->Tree));
$TestModel =& ClassRegistry::init('MergeVarPluginComment');
$this->assertEqual($TestModel->actsAs, array('Containable', 'Containable' => array('some_settings')));
$this->assertTrue(isset($TestModel->Behaviors->Containable));
}
/**
* testColumnTypeFetching method
*

63
cake/tests/cases/libs/model/models.php
View file

@ -497,6 +497,69 @@ class ModifiedComment extends CakeTestModel {
return $results;
}
}
/**
* MergeVarPluginAppModel class
*
* @package cake.tests
* @subpackage cake.tests.cases.libs.model
*/
class MergeVarPluginAppModel extends AppModel {
/**
* actsAs parameter
*
* @var array
*/
var $actsAs = array(
'Containable'
);
}
/**
* MergeVarPluginPost class
*
* @package cake.tests
* @subpackage cake.tests.cases.libs.model
*/
class MergeVarPluginPost extends MergeVarPluginAppModel {
/**
* actsAs parameter
*
* @var array
*/
var $actsAs = array(
'Tree'
);
/**
* useTable parameter
*
* @var string
*/
var $useTable = 'posts';
}
/**
* MergeVarPluginComment class
*
* @package cake.tests
* @subpackage cake.tests.cases.libs.model
*/
class MergeVarPluginComment extends MergeVarPluginAppModel {
/**
* actsAs parameter
*
* @var array
*/
var $actsAs = array(
'Containable' => array('some_settings')
);
/**
* useTable parameter
*
* @var string
*/
var $useTable = 'comments';
}
/**
* Attachment class
*