Merge branch '6.0' into 6.1

* 6.0:
  [DoctrineBridge] Fix compatibility with doctrine/orm 3 in Id generators
  Bump Symfony version to 6.0.5
  Update VERSION for 6.0.4
  Update CHANGELOG for 6.0.4
  Bump Symfony version to 5.4.5
  Update VERSION for 5.4.4
  Update CHANGELOG for 5.4.4
  Update VERSION for 5.3.15
  Update CHANGELOG for 5.3.15
  Remove 5.3 from PR template
  Bump Symfony version to 4.4.38
  Update VERSION for 4.4.37
  Update CONTRIBUTORS for 4.4.37
  Update CHANGELOG for 4.4.37
  [Process] Update PHPDoc to use proper placeholder syntax
  Fixed functional testing description

Author: derrabus

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();

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\NameBasedUuidFactory;
 use Symfony\Component\Uid\Factory\RandomBasedUuidFactory;
@@ -30,7 +31,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])) {