Merge 6951d94 into 452fe30

src/EventListener/PostQueryBuilderSubscriber.php

@@ -2,9 +2,13 @@
 
 namespace AlterPHP\EasyAdminExtensionBundle\EventListener;
 
+use AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator\GreaterThanModelTransformer;
+use AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator\GreaterThanOrEqualModelTransformer;
+use AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator\LowerThanModelTransformer;
+use AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator\LowerThanOrEqualModelTransformer;
 use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\Query\QueryException;
+use Doctrine\ORM\QueryBuilder;
 use EasyCorp\Bundle\EasyAdminBundle\Event\EasyAdminEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
@@ -14,6 +18,13 @@
  */
 class PostQueryBuilderSubscriber implements EventSubscriberInterface
 {
+    protected static $operators = [
+        GreaterThanModelTransformer::OPERATOR_PREFIX => '>',
+        GreaterThanOrEqualModelTransformer::OPERATOR_PREFIX => '>=',
+        LowerThanModelTransformer::OPERATOR_PREFIX => '<',
+        LowerThanOrEqualModelTransformer::OPERATOR_PREFIX => '<=',
+    ];
+
     /**
      * @var \AlterPHP\EasyAdminExtensionBundle\Helper\ListFormFiltersHelper
      */
@@ -156,7 +167,7 @@ protected function filterQueryBuilder(QueryBuilder $queryBuilder, string $field,
             // Multiple values leads to IN statement
             case $value instanceof Collection:
             case \is_array($value):
-                if (0 < count($value)) {
+                if (0 < \count($value)) {
                     $filterDqlPart = $field.' IN (:'.$parameter.')';
                 }
                 break;
@@ -170,6 +181,15 @@ protected function filterQueryBuilder(QueryBuilder $queryBuilder, string $field,
                 $parameter = null;
                 $filterDqlPart = $field.' IS NOT NULL';
                 break;
+            // Special case if value has an operatorPrefix
+            case $operatorPrefix = $this->getOperatorPrefix($value):
+                // get value without prefix
+                $value = \substr($value, \strlen($operatorPrefix));
+
+                $operator = static::$operators[$operatorPrefix];
+
+                $filterDqlPart = $field.' '.$operator.' :'.$parameter;
+                break;
             // Default is equality
             default:
                 $filterDqlPart = $field.' = :'.$parameter;
@@ -207,4 +227,17 @@ protected function isFilterAppliable(QueryBuilder $queryBuilder, string $field):
 
         return true;
     }
+
+    protected function getOperatorPrefix($value): string
+    {
+        $operatorPrefixes = \array_keys(static::$operators);
+
+        foreach ($operatorPrefixes as $operatorPrefix) {
+            if (0 === \strpos($value, $operatorPrefix)) {
+                return $operatorPrefix;
+            }
+        }
+
+        return '';
+    }
 }

src/Form/Transformer/Operator/GreaterThanModelTransformer.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator;
+
+use AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator\Traits\OperatorModelTransformerTrait;
+use Symfony\Component\Form\DataTransformerInterface;
+
+class GreaterThanModelTransformer implements DataTransformerInterface
+{
+    const OPERATOR_PREFIX = '_GT';
+
+    use OperatorModelTransformerTrait;
+}

src/Form/Transformer/Operator/GreaterThanOrEqualModelTransformer.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator;
+
+use AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator\Traits\OperatorModelTransformerTrait;
+use Symfony\Component\Form\DataTransformerInterface;
+
+class GreaterThanOrEqualModelTransformer implements DataTransformerInterface
+{
+    const OPERATOR_PREFIX = '_GTE';
+
+    use OperatorModelTransformerTrait;
+}

src/Form/Transformer/Operator/LowerThanModelTransformer.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator;
+
+use AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator\Traits\OperatorModelTransformerTrait;
+use Symfony\Component\Form\DataTransformerInterface;
+
+class LowerThanModelTransformer implements DataTransformerInterface
+{
+    const OPERATOR_PREFIX = '_LT';
+
+    use OperatorModelTransformerTrait;
+}

src/Form/Transformer/Operator/LowerThanOrEqualModelTransformer.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator;
+
+use AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator\Traits\OperatorModelTransformerTrait;
+use Symfony\Component\Form\DataTransformerInterface;
+
+class LowerThanOrEqualModelTransformer implements DataTransformerInterface
+{
+    const OPERATOR_PREFIX = '_LTE';
+
+    use OperatorModelTransformerTrait;
+}

src/Form/Transformer/Operator/Traits/OperatorModelTransformerTrait.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator\Traits;
+
+trait OperatorModelTransformerTrait
+{
+    public function transform($value)
+    {
+        if (0 !== \strpos($value, static::OPERATOR_PREFIX)) {
+            // remove prefix if set
+            $value = \substr($value, \strlen(static::OPERATOR_PREFIX));
+        }
+
+        return $value;
+    }
+
+    public function reverseTransform($value)
+    {
+        if (0 !== \strpos($value, static::OPERATOR_PREFIX)) {
+            // add prefix if not set
+            $value = static::OPERATOR_PREFIX.$value;
+        }
+
+        return $value;
+    }
+}

src/Form/Type/Operator/GreaterThanFilterTextType.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace AlterPHP\EasyAdminExtensionBundle\Form\Type\Operator;
+
+use AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator\GreaterThanModelTransformer;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class GreaterThanFilterTextType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->addModelTransformer(new GreaterThanModelTransformer());
+    }
+
+    public function getParent()
+    {
+        return TextType::class;
+    }
+}

src/Form/Type/Operator/GreaterThanOrEqualFilterTextType.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace AlterPHP\EasyAdminExtensionBundle\Form\Type\Operator;
+
+use AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator\GreaterThanOrEqualModelTransformer;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class GreaterThanOrEqualFilterTextType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->addModelTransformer(new GreaterThanOrEqualModelTransformer());
+    }
+
+    public function getParent()
+    {
+        return TextType::class;
+    }
+}

src/Form/Type/Operator/LowerThanFilterTextType.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace AlterPHP\EasyAdminExtensionBundle\Form\Type\Operator;
+
+use AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator\LowerThanModelTransformer;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class LowerThanFilterTextType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->addModelTransformer(new LowerThanModelTransformer());
+    }
+
+    public function getParent()
+    {
+        return TextType::class;
+    }
+}

src/Form/Type/Operator/LowerThanOrEqualFilterTextType.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace AlterPHP\EasyAdminExtensionBundle\Form\Type\Operator;
+
+use AlterPHP\EasyAdminExtensionBundle\Form\Transformer\Operator\LowerThanOrEqualModelTransformer;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class LowerThanOrEqualFilterTextType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->addModelTransformer(new LowerThanOrEqualModelTransformer());
+    }
+
+    public function getParent()
+    {
+        return TextType::class;
+    }
+}