Merge branch '1.x' into style-1.x

sroze · sroze · commit 33b5810d0cb1 · 2015-12-14T19:41:20.000+01:00
diff --git a/Doctrine/Orm/Filter/OrderFilter.php b/Doctrine/Orm/Filter/OrderFilter.php
@@ -79,7 +79,7 @@ public function apply(ResourceInterface $resource, QueryBuilder $queryBuilder, R
 
                 foreach ($propertyParts['associations'] as $association) {
                     $alias = QueryNameGenerator::generateJoinAlias($association);
-                    $queryBuilder->join(sprintf('%s.%s', $parentAlias, $association), $alias);
+                    $queryBuilder->leftJoin(sprintf('%s.%s', $parentAlias, $association), $alias);
                     $parentAlias = $alias;
                 }
 
diff --git a/Tests/Doctrine/Orm/Filter/OrderFilterTest.php b/Tests/Doctrine/Orm/Filter/OrderFilterTest.php
@@ -289,7 +289,7 @@ public function filterProvider()
                         'relatedDummy.symfony' => 'desc',
                     ],
                 ],
-                'SELECT o FROM Dunglas\ApiBundle\Tests\Behat\TestBundle\Entity\Dummy o INNER JOIN o.relatedDummy relatedDummy_123456abcdefg ORDER BY o.id ASC, o.name DESC, relatedDummy_123456abcdefg.symfony DESC',
+                'SELECT o FROM Dunglas\ApiBundle\Tests\Behat\TestBundle\Entity\Dummy o LEFT JOIN o.relatedDummy relatedDummy_123456abcdefg ORDER BY o.id ASC, o.name DESC, relatedDummy_123456abcdefg.symfony DESC',
             ],
             // Properties enabled with empty request (default values)
             [

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function apply(ResourceInterface $resource, QueryBuilder $queryBuilder, R`
`79`	`79`
`80`	`80`	`foreach ($propertyParts['associations'] as $association) {`
`81`	`81`	`$alias = QueryNameGenerator::generateJoinAlias($association);`
`82`		`- $queryBuilder->join(sprintf('%s.%s', $parentAlias, $association), $alias);`
	`82`	`+ $queryBuilder->leftJoin(sprintf('%s.%s', $parentAlias, $association), $alias);`
`83`	`83`	`$parentAlias = $alias;`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public function filterProvider()`
`289`	`289`	`'relatedDummy.symfony' => 'desc',`
`290`	`290`	`],`
`291`	`291`	`],`
`292`		`- 'SELECT o FROM Dunglas\ApiBundle\Tests\Behat\TestBundle\Entity\Dummy o INNER JOIN o.relatedDummy relatedDummy_123456abcdefg ORDER BY o.id ASC, o.name DESC, relatedDummy_123456abcdefg.symfony DESC',`
	`292`	`+ 'SELECT o FROM Dunglas\ApiBundle\Tests\Behat\TestBundle\Entity\Dummy o LEFT JOIN o.relatedDummy relatedDummy_123456abcdefg ORDER BY o.id ASC, o.name DESC, relatedDummy_123456abcdefg.symfony DESC',`
`293`	`293`	`],`
`294`	`294`	`// Properties enabled with empty request (default values)`
`295`	`295`	`[`