diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameDto.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameDto.php
new file mode 100644
index 0000000000000..8c2c60d21ba85
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameDto.php
@@ -0,0 +1,24 @@
+
+ *
+ * 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 Symfony\Component\Uid\Uuid;
+
+class UserUuidNameDto
+{
+ public function __construct(
+ public ?Uuid $id,
+ public ?string $fullName,
+ public ?string $address,
+ ) {
+ }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameEntity.php
new file mode 100644
index 0000000000000..3ac3ead8d201a
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameEntity.php
@@ -0,0 +1,29 @@
+
+ *
+ * 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 UserUuidNameEntity
+{
+ public function __construct(
+ #[Id, Column]
+ public ?Uuid $id = null,
+ #[Column(unique: true)]
+ public ?string $fullName = null,
+ ) {
+ }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
index a985eaae7b2dc..4d7a9b1f78f77 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -41,9 +41,12 @@
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\UserUuidNameDto;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\UserUuidNameEntity;
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;
@@ -116,6 +119,7 @@ private function createSchema($em)
$em->getClassMetadata(Employee::class),
$em->getClassMetadata(CompositeObjectNoToStringIdEntity::class),
$em->getClassMetadata(SingleIntIdStringWrapperNameEntity::class),
+ $em->getClassMetadata(UserUuidNameEntity::class),
]);
}
@@ -1401,4 +1405,25 @@ public function testEntityManagerNullObjectWhenDTODoctrineStyle()
$this->validator->validate($dto, $constraint);
}
+
+ public function testUuidIdentifierWithSameValueDifferentInstanceDoesNotCauseViolation()
+ {
+ $uuidString = 'ec562e21-1fc8-4e55-8de7-a42389ac75c5';
+ $existingPerson = new UserUuidNameEntity(Uuid::fromString($uuidString), 'Foo Bar');
+ $this->em->persist($existingPerson);
+ $this->em->flush();
+
+ $dto = new UserUuidNameDto(Uuid::fromString($uuidString), 'Foo Bar', '');
+
+ $constraint = new UniqueEntity(
+ fields: ['fullName'],
+ entityClass: UserUuidNameEntity::class,
+ identifierFieldNames: ['id'],
+ em: self::EM_NAME,
+ );
+
+ $this->validator->validate($dto, $constraint);
+
+ $this->assertNoViolation();
+ }
}
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
index 87eebbca142c6..4aed1cd3a44c2 100644
--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -197,6 +197,12 @@ public function validate(mixed $value, Constraint $constraint): void
foreach ($constraint->identifierFieldNames as $identifierFieldName) {
$propertyValue = $this->getPropertyValue($entityClass, $identifierFieldName, current($result));
+ if ($fieldValues[$identifierFieldName] instanceof \Stringable) {
+ $fieldValues[$identifierFieldName] = (string) $fieldValues[$identifierFieldName];
+ }
+ if ($propertyValue instanceof \Stringable) {
+ $propertyValue = (string) $propertyValue;
+ }
if ($fieldValues[$identifierFieldName] !== $propertyValue) {
$entityMatched = false;
break;
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy