adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue with using contain() and query[contain]

Browse source 
When contain() and query['contain'] = array(...) were used together
the query['contain'] values where not respected.

Fixes #3287
This commit is contained in:
mark_story 2012-10-20 14:51:52 -04:00
parent ea467e72d7
commit 888b1f4795
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/Cake/Model/Behavior/ContainableBehavior.php
View file

@ -91,21 +91,25 @@ class ContainableBehavior extends ModelBehavior {
*/ */
public function beforeFind(Model $Model, $query) { public function beforeFind(Model $Model, $query) {
$reset = (isset($query['reset']) ? $query['reset'] : true); $reset = (isset($query['reset']) ? $query['reset'] : true);
$noContain = ( $noContain = false;
(isset($this->runtime[$Model->alias]['contain']) && empty($this->runtime[$Model->alias]['contain'])) ||
(isset($query['contain']) && empty($query['contain']))
);
$contain = array(); $contain = array();
if (isset($this->runtime[$Model->alias]['contain'])) { if (isset($this->runtime[$Model->alias]['contain'])) {
$noContain = empty($this->runtime[$Model->alias]['contain']);
$contain = $this->runtime[$Model->alias]['contain']; $contain = $this->runtime[$Model->alias]['contain'];
unset($this->runtime[$Model->alias]['contain']); unset($this->runtime[$Model->alias]['contain']);
} }
if (isset($query['contain'])) { if (isset($query['contain'])) {
$noContain = $noContain || empty($query['contain']);
if ($query['contain'] !== false) {
$contain = array_merge($contain, (array)$query['contain']); $contain = array_merge($contain, (array)$query['contain']);
} }
}
$noContain = $noContain && empty($contain);
if ( if (
$noContain || !$contain || in_array($contain, array(null, false), true) || $noContain || empty($contain) || (isset($contain[0]) && $contain[0] === null)
(isset($contain[0]) && $contain[0] === null)
) { ) {
if ($noContain) { if ($noContain) {
$query['recursive'] = -1; $query['recursive'] = -1;

13
lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
View file

@ -261,6 +261,19 @@ class ContainableBehaviorTest extends CakeTestCase {
$this->assertFalse(Set::matches('/Comment/User', $r)); $this->assertFalse(Set::matches('/Comment/User', $r));
} }
/**
* Test that mixing contain() and the contain find option.
*
* @return void
*/
public function testContainAndContainOption() {
$this->Article->contain();
$r = $this->Article->find('all', array(
'contain' => array('Comment')
));
$this->assertTrue(isset($r[0]['Comment']), 'No comment returned');
}
/** /**
* testFindEmbeddedNoBindings method * testFindEmbeddedNoBindings method
* *