Merge pull request #5476 from cakephp/3.0-matching-fixes

3.0 matching fixes

src/ORM/ResultSet.php

@@ -283,11 +283,12 @@ class ResultSet implements ResultSetInterface {
 		$map = $this->_query->eagerLoader()->associationsMap($this->_defaultTable);
 		$this->_matchingMap = (new Collection($map))
 			->match(['matching' => true])
-			->compile();
+			->toArray();
 
 		$this->_containMap = (new Collection(array_reverse($map)))
 			->match(['matching' => false])
-			->compile();
+			->indexBy('nestKey')
+			->toArray();
 	}
 
 /**
@@ -331,7 +332,10 @@ class ResultSet implements ResultSetInterface {
 				}
 				list($table, $field) = explode('__', $key);
 				$results['_matchingData'][$table][$field] = $value;
-				unset($row[$key]);
+
+				if (!isset($this->_containMap[$table])) {
+					unset($row[$key]);
+				}
 			}
 			if (empty($results['_matchingData'][$matching['alias']])) {
 				continue;
@@ -343,6 +347,7 @@ class ResultSet implements ResultSetInterface {
 			);
 
 			if ($this->_hydrate) {
+				$options['source'] = $matching['alias'];
 				$entity = new $matching['entityClass']($results['_matchingData'][$matching['alias']], $options);
 				$entity->clean();
 				$results['_matchingData'][$matching['alias']] = $entity;

tests/TestCase/ORM/QueryRegressionTest.php

@@ -576,4 +576,43 @@ class QueryRegressionTest extends TestCase {
 		$this->assertCount(3, $results->toArray());
 	}
 
+/**
+ * Checks that matching and contain can be called for the same belongsTo association
+ *
+ * @see https://github.com/cakephp/cakephp/issues/5463
+ * @return void
+ */
+	public function testFindMatchingAndContain() {
+		$table = TableRegistry::get('Articles');
+		$table->belongsTo('Authors');
+		$article = $table->find()
+			->contain('Authors')
+			->matching('Authors', function ($q) {
+				return $q->where(['Authors.id' => 1]);
+			})
+			->first();
+		$this->assertNotNull($article->author);
+		$this->assertEquals($article->author, $article->_matchingData['Authors']);
+	}
+
+/**
+ * Checks that matching and contain can be called for the same belongsTo association
+ *
+ * @see https://github.com/cakephp/cakephp/issues/5463
+ * @return void
+ */
+	public function testFindMatchingAndContainWithSubquery() {
+		$table = TableRegistry::get('authors');
+		$table->hasMany('articles', ['strategy' => 'subquery']);
+		$table->articles->belongsToMany('tags');
+
+		$result = $table->find()
+			->matching('articles.tags', function ($q) {
+				return $q->where(['tags.id' => 2]);
+			})
+			->contain('articles');
+
+		$this->assertCount(2, $result->first()->articles);
+	}
+
 }