Merge pull request #3707 from cakephp/3.0-join-data-marshall

3.0 join data marshall

src/ORM/Marshaller.php

@@ -179,10 +179,6 @@ class Marshaller {
 		}
 
 		$records = $this->many($data, $include);
-		if (!in_array('_joinData', $include) && !isset($include['_joinData'])) {
-			return $records;
-		}
-
 		$joint = $assoc->junction();
 		$jointMarshaller = $joint->marshaller();
 

tests/TestCase/ORM/MarshallerTest.php

@@ -298,9 +298,7 @@ class MarshallerTest extends TestCase {
 		];
 		$marshall = new Marshaller($this->articles);
 		$result = $marshall->one($data, [
-			'Tags' => [
-				'associated' => ['_joinData']
-			]
+			'Tags'
 		]);
 
 		$this->assertEquals($data['title'], $result->title);