Fix phpspec tests

Sylius · Jun 5, 2024 · 51f5aa3 · 51f5aa3
1 parent 65aebc0
commit 51f5aa3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/Bundle/spec/Doctrine/PHPCRODM/DataSourceSpec.php b/src/Bundle/spec/Doctrine/PHPCRODM/DataSourceSpec.php
@@ -16,10 +16,10 @@
 use Doctrine\Common\Collections\Expr\Comparison;
 use Doctrine\Common\Collections\Expr\Value;
 use Doctrine\ODM\PHPCR\Query\Builder\ConstraintComparison;
-use Doctrine\ODM\PHPCR\Query\Builder\ConstraintOrx;
 use Doctrine\ODM\PHPCR\Query\Builder\OrderBy;
 use Doctrine\ODM\PHPCR\Query\Builder\Ordering;
 use Doctrine\ODM\PHPCR\Query\Builder\QueryBuilder;
+use Doctrine\ODM\PHPCR\Query\Builder\WhereOr;
 use Doctrine\ODM\PHPCR\Query\Query;
 use Pagerfanta\Pagerfanta;
 use PhpSpec\ObjectBehavior;
@@ -47,7 +47,7 @@ function it_should_restrict_with_or_condition(
         ExpressionBuilderInterface $expressionBuilder,
         Comparison $comparison,
         Value $value,
-        ConstraintOrx $constraint,
+        WhereOr $constraint,
         ConstraintComparison $comparisonConstraint,
     ): void {
         $this->beConstructedWith($queryBuilder, $expressionBuilder);
@@ -91,12 +91,13 @@ function it_should_get_the_data(
         QueryBuilder $queryBuilder,
         ExpressionBuilderInterface $expressionBuilder,
         Query $query,
+        OrderBy $orderBy,
     ): void {
         $this->beConstructedWith($queryBuilder, $expressionBuilder);
 
         $expressionBuilder->getOrderBys()->willReturn([]);
 
-        $queryBuilder->orderBy()->willReturn(null);
+        $queryBuilder->orderBy()->willReturn($orderBy);
         $queryBuilder->getQuery()->willReturn($query);
         $query->setMaxResults(Argument::any())->willReturn($query);
         $query->setFirstResult(Argument::any())->willReturn($query);

diff --git a/src/Bundle/spec/Doctrine/PHPCRODM/ExpressionBuilderSpec.php b/src/Bundle/spec/Doctrine/PHPCRODM/ExpressionBuilderSpec.php
@@ -13,7 +13,7 @@
 
 namespace spec\Sylius\Bundle\GridBundle\Doctrine\PHPCRODM;
 
-use Doctrine\Common\Collections\Expr\Comparison;
+use Doctrine\Common\Collections\Expr\Expression;
 use Doctrine\Common\Collections\ExpressionBuilder as CollectionsExpressionBuilder;
 use PhpSpec\ObjectBehavior;
 use Sylius\Bundle\GridBundle\Doctrine\PHPCRODM\ExtraComparison;
@@ -29,19 +29,19 @@ function let(CollectionsExpressionBuilder $expressionBuilder): void
     }
 
     function it_builds_andx(
-        Comparison $comparison,
+        Expression $expression,
         CollectionsExpressionBuilder $expressionBuilder,
     ): void {
-        $this->andX([$comparison]);
-        $expressionBuilder->andX([$comparison])->shouldHaveBeenCalled();
+        $this->andX($expression);
+        $expressionBuilder->andX($expression)->shouldHaveBeenCalled();
     }
 
     function it_builds_orx(
-        Comparison $comparison,
+        Expression $expression,
         CollectionsExpressionBuilder $expressionBuilder,
     ): void {
-        $this->orX([$comparison]);
-        $expressionBuilder->orX([$comparison])->shouldHaveBeenCalled();
+        $this->orX($expression);
+        $expressionBuilder->orX($expression)->shouldHaveBeenCalled();
     }
 
     function it_builds_equals(