Add Doctrine DBAL v4 / ORM v3 support, remove DBAL v2 support

hlecorche · Nov 16, 2024 · c3551f1 · c3551f1
1 parent 70206c2
commit c3551f1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -14,11 +14,11 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "doctrine/collections": "^1.5|^2.0",
-        "doctrine/dbal": "^2.13.1|^3.2",
+        "doctrine/dbal": "^3.2|^4.0",
         "doctrine/doctrine-bundle": "^2.4.5",
-        "doctrine/orm": "^2.9",
+        "doctrine/orm": "^2.9|^3.0",
         "doctrine/persistence": "^1.3|^2.0|^3.0",
-        "ecommit/doctrine-utils": "^1.0",
+        "ecommit/doctrine-utils": "^1.0|^2.0",
         "ecommit/paginator": "^1.0",
         "ecommit/scalar-values": "^1.0",
         "psr/container": "^1.1|^2.0",

diff --git a/src/Crud/Crud.php b/src/Crud/Crud.php
@@ -584,9 +584,10 @@ protected function resetDisplaySettings(): void
         if ($this->options['persistent_settings']) {
             // Remove settings in database
             $qb = $this->container->get('doctrine')->getManager()->createQueryBuilder();
-            $qb->delete('EcommitCrudBundle:UserCrudSettings', 's')
+            $qb->delete(UserCrudSettings::class, 's')
                 ->andWhere('s.user = :user AND s.crudName = :crud_name')
-                ->setParameters(['user' => $this->container->get('security.token_storage')->getToken()->getUser(), 'crud_name' => $this->getSessionName()])
+                ->setParameter('user', $this->container->get('security.token_storage')->getToken()->getUser())
+                ->setParameter('crud_name', $this->getSessionName())
                 ->getQuery()
                 ->execute();
         }

diff --git a/src/EventListener/MappingEntities.php b/src/EventListener/MappingEntities.php
@@ -14,6 +14,7 @@
 namespace Ecommit\CrudBundle\EventListener;
 
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
+use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 final class MappingEntities
@@ -43,7 +44,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
         }
     }
 
-    protected function mappUserCrudSettings(ClassMetadataInfo $userCrudSettingsMetadata, ClassMetadataInfo $userMetadata): void
+    protected function mappUserCrudSettings(ClassMetadataInfo|ClassMetadata $userCrudSettingsMetadata, ClassMetadataInfo|ClassMetadata $userMetadata): void
     {
         $this->isLoad = true;