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

Fix issue with duplicate associations when using string form.

Browse source 
Fixes #2002
This commit is contained in:
mark_story 2011-09-18 12:26:59 -04:00
parent 6a4e7558fc
commit 8d43764801
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Model/Model.php
View file

@ -903,11 +903,12 @@ class Model extends Object {
unset ($this->{$type}[$assoc]);
$assoc = $value;
$value = array();
$this->{$type}[$assoc] = $value;
if (strpos($assoc, '.') !== false) {
list($plugin, $assoc) = pluginSplit($assoc);
$this->{$type}[$assoc] = array('className' => $plugin. '.' . $assoc);
} else {
$this->{$type}[$assoc] = $value;
}
}
$this->_generateAssociation($type, $assoc);

14
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
View file

@ -1289,6 +1289,20 @@ class ModelIntegrationTest extends BaseModelTest {
$this->assertEqual($TestFakeModel->Tag->name, 'Tag');
}
/**
* test creating associations with plugins. Ensure a double alias isn't created
*
* @return void
*/
public function testAutoConstructPluginAssociations() {
$Comment = ClassRegistry::init('TestPluginComment');
$this->assertEquals(2, count($Comment->belongsTo), 'Too many associations');
$this->assertFalse(isset($Comment->belongsTo['TestPlugin.User']));
$this->assertTrue(isset($Comment->belongsTo['User']), 'Missing association');
$this->assertTrue(isset($Comment->belongsTo['TestPluginArticle']), 'Missing association');
}
/**
* test Model::__construct
*

2
lib/Cake/Test/Case/Model/models.php
View file

@ -2709,7 +2709,7 @@ class TestPluginComment extends CakeTestModel {
'className' => 'TestPlugin.TestPluginArticle',
'foreignKey' => 'article_id',
),
'User'
'TestPlugin.User'
);
}