bug #45243 [DoctrineBridge] Fix compatibility with doctrine/orm 3 in Id generators (ostrolucky)

derrabus · derrabus · commit a02a8e3bedeb · 2022-01-30T19:13:23.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [DoctrineBridge] Fix compatibility with doctrine/orm 3 in Id generators | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | Method has been renamed, see https://github.com/doctrine/DoctrineBundle/runs/4993900737?check_suite_focus=true Commits ------- c0eede4 [DoctrineBridge] Fix compatibility with doctrine/orm 3 in Id generators
diff --git a/src/Symfony/Bridge/Doctrine/IdGenerator/UlidGenerator.php b/src/Symfony/Bridge/Doctrine/IdGenerator/UlidGenerator.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\Doctrine\IdGenerator;
 
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Id\AbstractIdGenerator;
 use Symfony\Component\Uid\Factory\UlidFactory;
 use Symfony\Component\Uid\Ulid;
@@ -25,7 +26,15 @@ public function __construct(UlidFactory $factory = null)
         $this->factory = $factory;
     }
 
+    /**
+     * doctrine/orm < 2.11 BC layer.
+     */
     public function generate(EntityManager $em, $entity): Ulid
+    {
+        return $this->generateId($em, $entity);
+    }
+
+    public function generateId(EntityManagerInterface $em, $entity): Ulid
     {
         if ($this->factory) {
             return $this->factory->create();
diff --git a/src/Symfony/Bridge/Doctrine/IdGenerator/UuidGenerator.php b/src/Symfony/Bridge/Doctrine/IdGenerator/UuidGenerator.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\Doctrine\IdGenerator;
 
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Id\AbstractIdGenerator;
 use Symfony\Component\Uid\Factory\UuidFactory;
 use Symfony\Component\Uid\Uuid;
@@ -27,7 +28,15 @@ public function __construct(UuidFactory $factory = null)
         $this->protoFactory = $this->factory = $factory ?? new UuidFactory();
     }
 
+    /**
+     * doctrine/orm < 2.11 BC layer.
+     */
     public function generate(EntityManager $em, $entity): Uuid
+    {
+        return $this->generateId($em, $entity);
+    }
+
+    public function generateId(EntityManagerInterface $em, $entity): Uuid
     {
         if (null !== $this->entityGetter) {
             if (\is_callable([$entity, $this->entityGetter])) {
