Upgraded Doctrine to ORM 3 and DBAL 4

Signed-off-by: Tom Wright <[email protected]>
decodelabs · Apr 26, 2024 · 35c8729 · 35c8729
1 parent 2af3d06
commit 35c8729
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* Upgraded Doctrine to ORM 3 and DBAL 4
 * Updated dependency list
 
 ## v0.1.3 (2024-04-24)

diff --git a/composer.json b/composer.json
@@ -18,8 +18,8 @@
         "decodelabs/stash": "^0.5.0",
         "decodelabs/veneer": "^0.10.24",
 
-        "doctrine/orm": "^2.17",
-        "doctrine/dbal": "^3.7",
+        "doctrine/orm": "^3",
+        "doctrine/dbal": "^4",
         "doctrine/migrations": "^3.7"
     },
     "require-dev": {
@@ -51,7 +51,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.1.x-dev"
+            "dev-develop": "0.2.x-dev"
         }
     }
 }
diff --git a/src/Indoctrination/Generator/Uuid.php b/src/Indoctrination/Generator/Uuid.php
@@ -10,17 +10,14 @@
 namespace DecodeLabs\Indoctrination\Generator;
 
 use DecodeLabs\Guidance;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Id\AbstractIdGenerator;
 
 class Uuid extends AbstractIdGenerator
 {
-    /**
-     * @param object $entity
-     */
-    public function generate(
-        EntityManager $entityManager,
-        $entity
+    public function generateId(
+        EntityManagerInterface $entityManager,
+        ?object $entity
     ): string {
         return (string)Guidance::createV7();
     }