Fix duplication

spec/Condition/NotInSpec.php

@@ -6,7 +6,6 @@
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use PhpSpec\ObjectBehavior;
-use Rb\Specification\Doctrine\Condition\In;
 use Rb\Specification\Doctrine\SpecificationInterface;
 
 class NotInSpec extends ObjectBehavior
@@ -23,7 +22,6 @@ public function let()
     public function it_is_an_expression()
     {
         $this->shouldBeAnInstanceOf(SpecificationInterface::class);
-        $this->shouldBeAnInstanceOf(In::class);
     }
 
     public function it_returns_an_expression_func_object(QueryBuilder $queryBuilder, ArrayCollection $parameters, Expr $expr)

src/Condition/Between.php

@@ -4,9 +4,12 @@
 
 use Doctrine\ORM\QueryBuilder;
 use Rb\Specification\Doctrine\AbstractSpecification;
+use Rb\Specification\Doctrine\Helper\ParameterTrait;
 
 class Between extends AbstractSpecification
 {
+    use ParameterTrait;
+
     /**
      * @var mixed
      */
@@ -36,8 +39,8 @@ public function __construct($field, $from, $to, $dqlAlias = null)
      */
     public function modify(QueryBuilder $queryBuilder, $dqlAlias)
     {
-        $fromParam = $this->generateParameterName('from', $queryBuilder);
-        $toParam   = $this->generateParameterName('to', $queryBuilder);
+        $fromParam = $this->generateParameterName($queryBuilder, 'from');
+        $toParam   = $this->generateParameterName($queryBuilder, 'to');
 
         $queryBuilder->setParameter($fromParam, $this->from);
         $queryBuilder->setParameter($toParam, $this->to);
@@ -48,15 +51,4 @@ public function modify(QueryBuilder $queryBuilder, $dqlAlias)
             sprintf(':%s', $toParam)
         );
     }
-
-    /**
-     * @param string       $type
-     * @param QueryBuilder $queryBuilder
-     *
-     * @return string
-     */
-    private function generateParameterName($type, QueryBuilder $queryBuilder)
-    {
-        return sprintf('%s_%d', $type, count($queryBuilder->getParameters()));
-    }
 }

src/Condition/Comparison.php

@@ -6,9 +6,14 @@
 use Doctrine\ORM\QueryBuilder;
 use Rb\Specification\Doctrine\AbstractSpecification;
 use Rb\Specification\Doctrine\Exception\InvalidArgumentException;
+use Rb\Specification\Doctrine\Helper\ParameterTrait;
+use Rb\Specification\Doctrine\Helper\ValueTrait;
 
 class Comparison extends AbstractSpecification
 {
+    use ParameterTrait;
+    use ValueTrait;
+
     const EQ   = '=';
     const NEQ  = '<>';
     const LT   = '<';
@@ -22,11 +27,6 @@ class Comparison extends AbstractSpecification
      */
     protected static $operators = [self::EQ, self::NEQ, self::LT, self::LTE, self::GT, self::GTE, self::LIKE];
 
-    /**
-     * @var string
-     */
-    protected $value;
-
     /**
      * @var string
      */
@@ -53,7 +53,7 @@ public function __construct($operator, $field, $value, $dqlAlias = null)
         }
 
         $this->operator = $operator;
-        $this->value    = $value;
+        $this->setValue($value);
 
         parent::__construct($field, $dqlAlias);
     }
@@ -68,25 +68,13 @@ public function __construct($operator, $field, $value, $dqlAlias = null)
      */
     public function modify(QueryBuilder $queryBuilder, $dqlAlias)
     {
-        $paramName = $this->generateParameterName($queryBuilder);
-        $queryBuilder->setParameter($paramName, $this->value);
+        $paramName = $this->generateParameterName($queryBuilder, 'comparison');
+        $queryBuilder->setParameter($paramName, $this->getValue());
 
         return (string) new DoctrineComparison(
             $this->createPropertyWithAlias($dqlAlias),
             $this->operator,
             sprintf(':%s', $paramName)
         );
     }
-
-    /**
-     * Return automatically generated parameter name.
-     *
-     * @param QueryBuilder $queryBuilder
-     *
-     * @return string
-     */
-    protected function generateParameterName(QueryBuilder $queryBuilder)
-    {
-        return sprintf('comparison_%d', count($queryBuilder->getParameters()));
-    }
 }

src/Condition/EqualsProperty.php

@@ -28,7 +28,7 @@ public function modify(QueryBuilder $queryBuilder, $dqlAlias)
         return (string) new DoctrineComparison(
             $this->createPropertyWithAlias($dqlAlias),
             $this->operator,
-            $this->createAliasedName($this->value, $dqlAlias)
+            $this->createAliasedName($this->getValue(), $dqlAlias)
         );
     }
 }

src/Condition/In.php

@@ -4,13 +4,13 @@
 
 use Doctrine\ORM\QueryBuilder;
 use Rb\Specification\Doctrine\AbstractSpecification;
+use Rb\Specification\Doctrine\Helper\ParameterTrait;
+use Rb\Specification\Doctrine\Helper\ValueTrait;
 
 class In extends AbstractSpecification
 {
-    /**
-     * @var mixed
-     */
-    protected $value;
+    use ParameterTrait;
+    use ValueTrait;
 
     /**
      * @param string      $field
@@ -19,7 +19,7 @@ class In extends AbstractSpecification
      */
     public function __construct($field, $value, $dqlAlias = null)
     {
-        $this->value = $value;
+        $this->setValue($value);
 
         parent::__construct($field, $dqlAlias);
     }
@@ -29,22 +29,12 @@ public function __construct($field, $value, $dqlAlias = null)
      */
     public function modify(QueryBuilder $queryBuilder, $dqlAlias)
     {
-        $paramName = $this->generateParameterName($queryBuilder);
-        $queryBuilder->setParameter($paramName, $this->value);
+        $paramName = $this->generateParameterName($queryBuilder, 'in');
+        $queryBuilder->setParameter($paramName, $this->getValue());
 
         return (string) $queryBuilder->expr()->in(
             $this->createPropertyWithAlias($dqlAlias),
             sprintf(':%s', $paramName)
         );
     }
-
-    /**
-     * @param QueryBuilder $queryBuilder
-     *
-     * @return string
-     */
-    protected function generateParameterName(QueryBuilder $queryBuilder)
-    {
-        return sprintf('in_%d', count($queryBuilder->getParameters()));
-    }
 }

src/Condition/IsInstanceOf.php

@@ -4,13 +4,11 @@
 
 use Doctrine\ORM\QueryBuilder;
 use Rb\Specification\Doctrine\AbstractSpecification;
+use Rb\Specification\Doctrine\Helper\ValueTrait;
 
 class IsInstanceOf extends AbstractSpecification
 {
-    /**
-     * @var string
-     */
-    private $className;
+    use ValueTrait;
 
     /**
      * @param string $field
@@ -19,7 +17,7 @@ class IsInstanceOf extends AbstractSpecification
      */
     public function __construct($field, $className, $dqlAlias = null)
     {
-        $this->className = $className;
+        $this->setValue($className);
 
         parent::__construct($field, $dqlAlias);
     }
@@ -31,7 +29,7 @@ public function modify(QueryBuilder $queryBuilder, $dqlAlias)
     {
         return (string) $queryBuilder->expr()->isInstanceOf(
             $this->createPropertyWithAlias($dqlAlias),
-            $this->className
+            $this->getValue()
         );
     }
 }

src/Condition/IsNotNull.php

@@ -3,8 +3,9 @@
 namespace Rb\Specification\Doctrine\Condition;
 
 use Doctrine\ORM\QueryBuilder;
+use Rb\Specification\Doctrine\AbstractSpecification;
 
-class IsNotNull extends IsNull
+class IsNotNull extends AbstractSpecification
 {
     /**
      * {@inheritdoc}

src/Condition/NotIn.php

@@ -3,27 +3,35 @@
 namespace Rb\Specification\Doctrine\Condition;
 
 use Doctrine\ORM\QueryBuilder;
+use Rb\Specification\Doctrine\AbstractSpecification;
+use Rb\Specification\Doctrine\Helper\ParameterTrait;
+use Rb\Specification\Doctrine\Helper\ValueTrait;
 
-class NotIn extends In
+class NotIn extends AbstractSpecification
 {
+    use ValueTrait;
+    use ParameterTrait;
+
+    /**
+     * @param string      $field
+     * @param mixed       $value
+     * @param string|null $dqlAlias
+     */
+    public function __construct($field, $value, $dqlAlias = null)
+    {
+        $this->setValue($value);
+
+        parent::__construct($field, $dqlAlias);
+    }
+
     public function modify(QueryBuilder $queryBuilder, $dqlAlias)
     {
-        $paramName = $this->generateParameterName($queryBuilder);
-        $queryBuilder->setParameter($paramName, $this->value);
+        $paramName = $this->generateParameterName($queryBuilder, 'not_in');
+        $queryBuilder->setParameter($paramName, $this->getValue());
 
         return (string) $queryBuilder->expr()->notIn(
             $this->createPropertyWithAlias($dqlAlias),
             sprintf(':%s', $paramName)
         );
     }
-
-    /**
-     * @param QueryBuilder $queryBuilder
-     *
-     * @return string
-     */
-    protected function generateParameterName(QueryBuilder $queryBuilder)
-    {
-        return sprintf('not_in_%d', count($queryBuilder->getParameters()));
-    }
 }

src/Helper/ParameterTrait.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Rb\Specification\Doctrine\Helper;
+
+use Doctrine\ORM\QueryBuilder;
+
+trait ParameterTrait
+{
+    /**
+     * Return automatically generated parameter name.
+     *
+     * @param QueryBuilder $queryBuilder
+     * @param string|null  $name
+     *
+     * @return string
+     */
+    protected function generateParameterName(QueryBuilder $queryBuilder, $name = null)
+    {
+        if (null === $name) {
+            $name = get_class($this);
+        }
+
+        return sprintf('%s_%d', $name, count($queryBuilder->getParameters()));
+    }
+}

src/Helper/TypeCheckerTrait.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Rb\Specification\Doctrine\Helper;
+
+use Rb\Specification\Doctrine\Exception\InvalidArgumentException;
+
+trait TypeCheckerTrait
+{
+    /**
+     * @var string[]
+     */
+    protected $validTypes;
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @param string $type
+     *
+     * @throws InvalidArgumentException
+     */
+    public function setType($type)
+    {
+        if (! in_array($type, $this->validTypes, true)) {
+            throw new InvalidArgumentException(sprintf(
+                '"%s" is not a valid type! Valid types: %s',
+                $type,
+                implode(', ', $this->validTypes)
+            ));
+        }
+
+        $this->type = $type;
+    }
+}

src/Helper/ValueTrait.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rb\Specification\Doctrine\Helper;
+
+trait ValueTrait
+{
+    /**
+     * @var mixed
+     */
+    private $value;
+
+    /**
+     * @return string
+     */
+    protected function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    protected function setValue($value)
+    {
+        $this->value = $value;
+    }
+}