changed: allow a QueryBuilder for the Doctrine ORM Adapter

asm89 · Sep 26, 2011 · 64094bd · 64094bd
1 parent 596edc4
commit 64094bd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Pagerfanta/Adapter/DoctrineORMAdapter.php b/src/Pagerfanta/Adapter/DoctrineORMAdapter.php
@@ -35,13 +35,17 @@ class DoctrineORMAdapter implements AdapterInterface
     /**
      * Constructor.
      *
-     * @param Query   $query               A Doctrine ORM query or query builder.
-     * @param Boolean $fetchJoinCollection Whether the query joins a collection (false by default).
+     * @param Query|QueryBuilder $query               A Doctrine ORM query or query builder.
+     * @param Boolean            $fetchJoinCollection Whether the query joins a collection (false by default).
      *
      * @api
      */
     public function __construct($query, $fetchJoinCollection = false)
     {
+        if ($query instanceof QueryBuilder) {
+            $query = $query->getQuery();
+        }
+
         $this->query = $query;
         $this->fetchJoinCollection = (Boolean) $fetchJoinCollection;
     }