Support where expression (instead of criteria)

Author: tanigami

composer.json

@@ -13,7 +13,8 @@
     ],
     "require": {
         "php": ">=7.0",
-        "doctrine/common": "^2.9"
+        "doctrine/common": "^2.9",
+        "doctrine/orm": "^2.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.4",

src/AndSpecification.php

@@ -2,8 +2,6 @@
 
 namespace Tanigami\Specification;
 
-use Doctrine\Common\Collections\Criteria;
-
 class AndSpecification extends Specification
 {
     /**
@@ -37,9 +35,15 @@ public function isSatisfiedBy($object): bool
     /**
      * {@inheritdoc}
      */
-    public function criteria(): Criteria
+    public function whereExpression(string $alias): string
     {
-        return $this->one->criteria()->andWhere($this->other->criteria()->getWhereExpression());
+        return sprintf(
+            sprintf(
+                '(%s) AND (%s)',
+                $this->one()->whereExpression($alias),
+                $this->other()->whereExpression($alias)
+            )
+        );
     }
 
     /**

src/AnyOfSpecification.php

@@ -2,8 +2,6 @@
 
 namespace Tanigami\Specification;
 
-use Doctrine\Common\Collections\Criteria;
-
 class AnyOfSpecification extends Specification
 {
     /**
@@ -36,19 +34,14 @@ public function isSatisfiedBy($object): bool
     /**
      * {@inheritdoc}
      */
-    public function criteria(): Criteria
+    public function whereExpression(string $alias): string
     {
-        /** @var Criteria $criteria */
-        $criteria = null;
-        foreach ($this->specifications as $specification) {
-            if (is_null($criteria)) {
-                $criteria = $specification->criteria();
-            } else {
-                $criteria = $criteria->andWhere($specification->criteria()->getWhereExpression());
-            }
-        }
-
-        return $criteria;
+        return implode(' AND ', array_map(
+            function (Specification $specification) use ($alias) {
+                return '(' . $specification->whereExpression($alias) . ')';
+            },
+            $this->specifications
+        ));
     }
 
     /**

src/OneOfSpecification.php

@@ -2,8 +2,6 @@
 
 namespace Tanigami\Specification;
 
-use Doctrine\Common\Collections\Criteria;
-
 class OneOfSpecification extends Specification
 {
     /**
@@ -22,33 +20,28 @@ public function __construct(Specification ...$specifications)
     /**
      * {@inheritdoc}
      */
-    public function criteria(): Criteria
+    public function isSatisfiedBy($object): bool
     {
-        /** @var Criteria $criteria */
-        $criteria = null;
         foreach ($this->specifications as $specification) {
-            if (is_null($criteria)) {
-                $criteria = $specification->criteria();
-            } else {
-                $criteria = $criteria->orWhere($specification->criteria()->getWhereExpression());
+            if ($specification->isSatisfiedBy($object)) {
+                return true;
             }
         }
 
-        return $criteria;
+        return false;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function isSatisfiedBy($object): bool
+    public function whereExpression(string $alias): string
     {
-        foreach ($this->specifications as $specification) {
-            if ($specification->isSatisfiedBy($object)) {
-                return true;
-            }
-        }
-
-        return false;
+        return implode(' OR ', array_map(
+            function (Specification $specification) use ($alias) {
+                return '(' . $specification->whereExpression($alias) . ')';
+            },
+            $this->specifications
+        ));
     }
 
     /**

src/OrSpecification.php

@@ -2,8 +2,6 @@
 
 namespace Tanigami\Specification;
 
-use Doctrine\Common\Collections\Criteria;
-
 class OrSpecification extends Specification
 {
     /**
@@ -37,9 +35,15 @@ public function isSatisfiedBy($object): bool
     /**
      * {@inheritdoc}
      */
-    public function criteria(): Criteria
+    public function whereExpression(string $alias): string
     {
-        return $this->one->criteria()->orWhere($this->other->criteria()->getWhereExpression());
+        return sprintf(
+            sprintf(
+                '(%s) OR (%s)',
+                $this->one()->whereExpression($alias),
+                $this->other()->whereExpression($alias)
+            )
+        );
     }
 
     /**

src/Specification.php

@@ -3,7 +3,6 @@
 namespace Tanigami\Specification;
 
 use BadMethodCallException;
-use Doctrine\Common\Collections\Criteria;
 
 abstract class Specification
 {
@@ -14,11 +13,12 @@ abstract class Specification
     abstract public function isSatisfiedBy($object): bool;
 
     /**
-     * @return Criteria
+     * @param string $alias
+     * @return string
      */
-    public function criteria()
+    public function whereExpression(string $alias): string
     {
-        throw new BadMethodCallException('Criteria is not supported.');
+        throw new BadMethodCallException('Where expression is not supported');
     }
 
     /**

tests/SpecificationTest.php

@@ -85,20 +85,18 @@ public function testCriteriaComposition()
                 new OneOfSpecification($trueSpec, $falseSpec, $trueSpec),
                 $trueSpec
             );
-        $visitor = new Visitor();
-        $compositeSpec->criteria()->getWhereExpression()->visit($visitor);
         $this->assertSame(
-            '((((((bool = 1) AND (bool = 0)) OR (bool = 1)) AND (bool = 0)) AND (((bool = 1) OR (bool = 0)) OR (bool = 1))) AND (bool = 1))',
-            $visitor->trace()
+            '((((1) AND (0)) OR (1)) AND (0)) AND ((1) OR (0) OR (1)) AND (1)',
+            $compositeSpec->whereExpression('a')
         );
     }
 
     /**
      * @expectedException \BadMethodCallException
      */
-    public function testCriteriaIsNotSupported()
+    public function testWhereExpressionIsNotSupported()
     {
-        (new BoolSpecification(true))->not()->criteria();
+        (new BoolSpecification(true))->not()->whereExpression('a');
     }
 }
 
@@ -116,44 +114,8 @@ public function isSatisfiedBy($object): bool
         return $this->bool;
     }
 
-    public function criteria(): Criteria
+    public function whereExpression(string $alias): string
     {
-        return new Criteria(Criteria::expr()->eq('bool', $this->bool));
-    }
-}
-
-class Visitor extends ExpressionVisitor
-{
-    private $trace;
-
-    public function walkComparison(Comparison $comparison)
-    {
-        $this->trace .= '(';
-        $this->trace .= $comparison->getField();
-        $this->trace .= ' ' . $comparison->getOperator() . ' ';
-        $this->trace .= $this->walkValue($comparison->getValue());
-        $this->trace .= ')';
-    }
-
-    public function walkCompositeExpression(CompositeExpression $expr)
-    {
-        $this->trace .= '(';
-        foreach ($expr->getExpressionList() as $i => $child) {
-            if ($i !== 0) {
-                $this->trace .= (' ' . $expr->getType() . ' ');
-            }
-            $expressionList[] = $this->dispatch($child);
-        }
-        $this->trace .= ')';
-    }
-
-    public function walkValue(Value $value)
-    {
-        return $value->getValue() ? '1' : '0';
-    }
-
-    public function trace()
-    {
-        return $this->trace;
+        return $this->bool ? '1' : '0';
     }
 }