[DoctrineBridge] Fix UniqueEntity for non-integer identifiers

GiuseppeArcuti · GiuseppeArcuti · commit 8e1f62e9455c · 2024-12-07T12:56:32.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidName.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidName.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\Id;
+use Symfony\Component\Uid\Uuid;
+
+#[Entity]
+class UserUuidName
+{
+    #[Id, Column]
+    public ?Uuid $id = null;
+    #[Column]
+    public ?string $name = null;
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -44,9 +44,11 @@
 use Symfony\Bridge\Doctrine\Tests\Fixtures\UpdateCompositeIntIdEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\UpdateCompositeObjectNoToStringIdEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\UpdateEmployeeProfile;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\UserUuidName;
 use Symfony\Bridge\Doctrine\Tests\TestRepositoryFactory;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator;
+use Symfony\Component\Uid\Uuid;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
@@ -160,6 +162,7 @@ private function createSchema($em)
             $em->getClassMetadata(Employee::class),
             $em->getClassMetadata(CompositeObjectNoToStringIdEntity::class),
             $em->getClassMetadata(SingleIntIdStringWrapperNameEntity::class),
+            $em->getClassMetadata(UserUuidName::class),
         ]);
     }
 
@@ -1489,4 +1492,42 @@ public function testEntityManagerNullObjectWhenDTODoctrineStyle()
 
         $this->validator->validate($dto, $constraint);
     }
+
+    public function testIdentifierFieldNamesObject()
+    {
+        $entity1 = new UserUuidName();
+        $entity1->id = Uuid::v7();
+        $entity1->name = 'Foo';
+        $entity2 = new UserUuidName();
+        $entity2->id = Uuid::v6();
+        $entity2->name = 'Foo';
+
+        $constraint = new UniqueEntity(
+            message: 'myMessage',
+            fields: ['name'],
+            entityClass: UserUuidName::class,
+            identifierFieldNames: ['id'],
+            em: self::EM_NAME,
+        );
+        $this->validator->validate($entity1, $constraint);
+
+        $this->assertNoViolation();
+
+        $this->em->persist($entity1);
+        $this->em->flush();
+
+        $this->validator->validate($entity1, $constraint);
+
+        $this->assertNoViolation();
+
+        $this->validator->validate($entity2, $constraint);
+
+        $this->buildViolation('myMessage')
+            ->atPath('property.path.name')
+            ->setParameter('{{ value }}', '"Foo"')
+            ->setInvalidValue('Foo')
+            ->setCause([$entity1])
+            ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
+            ->assertRaised();
+    }
 }
