bug #28252 [DoctrineBridge] support __toString as documented for UniqueEntityValidator (dmaicher)

nicolas-grekas · nicolas-grekas · commit d446b6aefb93 · 2018-08-24T11:45:48.000+02:00
This PR was squashed before being merged into the 3.4 branch (closes #28252). Discussion ---------- [DoctrineBridge] support __toString as documented for UniqueEntityValidator | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #28245 | License | MIT | Doc PR | - This fixes #28245. It brings back handling `__toString` as documented for invalid values. Commits ------- 2ac883a [DoctrineBridge] support __toString as documented for UniqueEntityValidator
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -482,7 +482,7 @@ public function testAssociatedEntity()
 
         $this->buildViolation('myMessage')
             ->atPath('property.path.single')
-            ->setParameter('{{ value }}', 'object("Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity") identified by (id => 1)')
+            ->setParameter('{{ value }}', 'foo')
             ->setInvalidValue($entity1)
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->setCause(array($associated, $associated2))
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -186,6 +186,10 @@ private function formatWithIdentifiers(ObjectManager $em, ClassMetadata $class,
             return $this->formatValue($value, self::PRETTY_DATE);
         }
 
+        if (\method_exists($value, '__toString')) {
+            return (string) $value;
+        }
+
         if ($class->getName() !== $idClass = \get_class($value)) {
             // non unique value might be a composite PK that consists of other entity objects
             if ($em->getMetadataFactory()->hasMetadataFor($idClass)) {
