Merge pull request #126 from MJBGO/master

l3pp4rd · web-flow · commit 6cedcd4c983c · 2016-12-06T20:05:13.000+02:00
Corrected distinct option
diff --git a/src/Knp/Component/Pager/Event/Subscriber/Paginate/Doctrine/ORM/QuerySubscriber/UsesPaginator.php b/src/Knp/Component/Pager/Event/Subscriber/Paginate/Doctrine/ORM/QuerySubscriber/UsesPaginator.php
@@ -37,6 +37,8 @@ public function items(ItemsEvent $event)
         $fetchJoinCollection = true;
         if ($event->target->hasHint(self::HINT_FETCH_JOIN_COLLECTION)) {
             $fetchJoinCollection = $event->target->getHint(self::HINT_FETCH_JOIN_COLLECTION);
+        } else if (isset($event->options['distinct'])) {
+            $fetchJoinCollection = $event->options['distinct'];
         }
 
         $paginator = new Paginator($event->target, $fetchJoinCollection);

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ public function items(ItemsEvent $event)`
`37`	`37`	`$fetchJoinCollection = true;`
`38`	`38`	`if ($event->target->hasHint(self::HINT_FETCH_JOIN_COLLECTION)) {`
`39`	`39`	`$fetchJoinCollection = $event->target->getHint(self::HINT_FETCH_JOIN_COLLECTION);`
	`40`	`+ } else if (isset($event->options['distinct'])) {`
	`41`	`+ $fetchJoinCollection = $event->options['distinct'];`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`$paginator = new Paginator($event->target, $fetchJoinCollection);`