Update doctrine/orm 3.0 (#18)

* Update doctrine/orm to v3 * Annotation to Attribute * force_case_insensitivity config parameter is not nullable * Force doctrine/dbal v3 * Fix mapping error on Item entity --------- Co-authored-by: Ali OGUZ <[email protected]>
SpiriitLabs · Apr 15, 2024 · 9f92e3b · 9f92e3b
1 parent 3337d9b
commit 9f92e3b
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 333 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,10 +17,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { php: 7.4, symfony: "5.4.*", composer-flags: '--prefer-stable'}
-          - { php: 8.3, symfony: "6.4.*", composer-flags: '--prefer-stable'}
-          - { php: 8.2, symfony: "6.3.*", composer-flags: '--prefer-stable'}
           - { php: 8.2, symfony: "6.4.*", composer-flags: '--prefer-stable' }
+          - { php: 8.2, symfony: "7.0.*", composer-flags: '--prefer-stable' }
+          - { php: 8.3, symfony: "6.4.*", composer-flags: '--prefer-stable' }
           - { php: 8.3, symfony: "7.0.*", composer-flags: '--prefer-stable' }
 
     steps:

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -59,7 +59,7 @@ public function getConfigTreeBuilder(): TreeBuilder
 
                 ->booleanNode('force_case_insensitivity')
                     ->info('Whether to do case insensitive LIKE comparisons.')
-                    ->defaultNull()
+                    ->defaultFalse()
                 ->end()
 
                 ->scalarNode('encoding')

diff --git a/Event/Listener/PrepareListener.php b/Event/Listener/PrepareListener.php
@@ -11,77 +11,34 @@
 
 namespace Spiriit\Bundle\FormFilterBundle\Event\Listener;
 
-use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
-use Doctrine\ODM\MongoDB\Query\Builder;
 use Doctrine\ORM\QueryBuilder;
 use Spiriit\Bundle\FormFilterBundle\Event\PrepareEvent;
 use Spiriit\Bundle\FormFilterBundle\Filter\Doctrine\DBALQuery;
-use Spiriit\Bundle\FormFilterBundle\Filter\Doctrine\MongodbQuery;
 use Spiriit\Bundle\FormFilterBundle\Filter\Doctrine\ORMQuery;
 
-/**
- * Prepare listener event
- */
 class PrepareListener
 {
-    /**
-     * @var boolean
-     */
-    protected $forceCaseInsensitivity = null;
-
-    /**
-     * @var string|null
-     */
-    protected $encoding;
+    protected bool $forceCaseInsensitivity = false;
+    protected ?string $encoding = null;
 
-    public function setForceCaseInsensitivity($value)
+    public function getForceCaseInsensitivity(): bool
     {
-        if (!is_bool($value)) {
-            throw new \InvalidArgumentException("Expected a boolean");
-        }
-
-        $this->forceCaseInsensitivity = $value;
-
-        return $this;
+        return $this->forceCaseInsensitivity;
     }
 
-    /**
-     * @param $qb
-     * @return boolean
-     */
-    public function getForceCaseInsensitivity($qb)
+    public function setForceCaseInsensitivity(bool $forceCaseInsensitivity): void
     {
-        if (isset($this->forceCaseInsensitivity)) {
-            return $this->forceCaseInsensitivity;
-        }
-
-        if (class_exists('\\' . QueryBuilder::class) && $qb instanceof QueryBuilder) {
-            return ($qb->getEntityManager()->getConnection()->getDatabasePlatform() instanceof PostgreSqlPlatform);
-        }
-
-        if (class_exists('\\' . \Doctrine\DBAL\Query\QueryBuilder::class) && $qb instanceof \Doctrine\DBAL\Query\QueryBuilder) {
-            return ($qb->getConnection()->getDatabasePlatform() instanceof PostgreSqlPlatform);
-        }
+        $this->forceCaseInsensitivity = $forceCaseInsensitivity;
     }
 
-    /**
-     * @return null|string
-     */
-    public function getEncoding()
+    public function getEncoding(): ?string
     {
         return $this->encoding;
     }
 
-    /**
-     * @param null|string $encoding
-     *
-     * @return PrepareListener
-     */
-    public function setEncoding($encoding)
+    public function setEncoding(?string $encoding): void
     {
         $this->encoding = $encoding;
-
-        return $this;
     }
 
     /**
@@ -93,11 +50,11 @@ public function onFilterBuilderPrepare(PrepareEvent $event)
     {
         $qb = $event->getQueryBuilder();
 
-        $queryClasses = [QueryBuilder::class => ORMQuery::class, \Doctrine\DBAL\Query\QueryBuilder::class => DBALQuery::class, Builder::class => MongodbQuery::class];
+        $queryClasses = [QueryBuilder::class => ORMQuery::class, \Doctrine\DBAL\Query\QueryBuilder::class => DBALQuery::class];
 
         foreach ($queryClasses as $builderClass => $queryClass) {
             if (class_exists($builderClass) && $qb instanceof $builderClass) {
-                $query = new $queryClass($qb, $this->getForceCaseInsensitivity($qb), $this->encoding);
+                $query = new $queryClass($qb, $this->getForceCaseInsensitivity(), $this->encoding);
 
                 $event->setFilterQuery($query);
                 $event->stopPropagation();

diff --git a/Tests/Event/Listenener/PrepareListenerTest.php b/Tests/Event/Listenener/PrepareListenerTest.php