Merge pull request #204 from ostrolucky/patch-1

Remove old InExpression workaround
KnpLabs · Aug 3, 2018 · f0f8303 · f0f8303
2 parents 72dacb4 + 26f5246
commit f0f8303
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/src/Knp/Component/Pager/Event/Subscriber/Paginate/Doctrine/ORM/Query/WhereInWalker.php b/src/Knp/Component/Pager/Event/Subscriber/Paginate/Doctrine/ORM/Query/WhereInWalker.php
@@ -94,16 +94,9 @@ public function walkSelectStatement(SelectStatement $AST)
         $count = $this->_getQuery()->getHint(self::HINT_PAGINATOR_ID_COUNT);
 
         if ($count > 0) {
-            // in new doctrine 2.2 version theres a different expression
-            if (property_exists('Doctrine\ORM\Query\AST\InExpression', 'expression')) {
-                $arithmeticExpression = new ArithmeticExpression();
-                $arithmeticExpression->simpleArithmeticExpression = new SimpleArithmeticExpression(
-                    array($pathExpression)
-                );
-                $expression = new InExpression($arithmeticExpression);
-            } else {
-                $expression = new InExpression($pathExpression);
-            }
+            $arithmeticExpression = new ArithmeticExpression();
+            $arithmeticExpression->simpleArithmeticExpression = new SimpleArithmeticExpression(array($pathExpression));
+            $expression = new InExpression($arithmeticExpression);
             $ns = self::PAGINATOR_ID_ALIAS;
 
             for ($i = 1; $i <= $count; $i++) {