Merge pull request #258 from peter-gribanov/doctrine_orm_2.5

Require Doctrine ORM 2.5

.github/workflows/test.yaml

@@ -16,7 +16,7 @@ jobs:
             fail-fast: false
             matrix:
                 dependencies:
-                    # TODO require phpspec/phpspec >= 6.3.0 and doctrine/orm >= 2.5
+                    # TODO require phpspec/phpspec >= 6.3.0
                     #- lowest
                     - highest
                 php-version:

composer.json

@@ -21,7 +21,7 @@
     ],
     "require": {
         "php": ">=7.0",
-        "doctrine/orm": ">=2.2.3"
+        "doctrine/orm": "~2.5"
     },
     "require-dev": {
         "phpspec/phpspec": "~2.1"

src/Filter/InstanceOfX.php

@@ -50,6 +50,6 @@ public function getFilter(QueryBuilder $qb, $dqlAlias)
             $dqlAlias = $this->dqlAlias;
         }
 
-        return sprintf('%s INSTANCE OF %s', $dqlAlias, $this->value);
+        return (string) $qb->expr()->isInstanceOf($dqlAlias, $this->value);
     }
 }

tests/Filter/InstanceOfXSpec.php

@@ -14,6 +14,8 @@
 
 namespace tests\Happyr\DoctrineSpecification\Filter;
 
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\Query\Expr\Comparison;
 use Doctrine\ORM\QueryBuilder;
 use Happyr\DoctrineSpecification\Filter\Filter;
 use Happyr\DoctrineSpecification\Filter\InstanceOfX;
@@ -39,8 +41,13 @@ public function it_is_an_expression()
         $this->shouldBeAnInstanceOf(Filter::class);
     }
 
-    public function it_returns_expression_func_object(QueryBuilder $qb)
+    public function it_returns_expression_func_object(QueryBuilder $qb, Expr $exp)
     {
+        $exp_comparison = new Comparison('o', 'INSTANCE OF', 'My\Model');
+        $exp->isInstanceOf('o', 'My\Model')->willReturn($exp_comparison);
+
+        $qb->expr()->willReturn($exp);
+
         $this->getFilter($qb, null)->shouldReturn('o INSTANCE OF My\Model');
     }
 }