[Validator] Unique should support objects fields

mpiot · mpiot · commit 08428b9966e1 · 2022-09-28T15:53:25.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/UniqueValidator.php b/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
+use Symfony\Component\PropertyAccess\PropertyAccess;
+use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
@@ -21,6 +23,13 @@
  */
 class UniqueValidator extends ConstraintValidator
 {
+    private ?PropertyAccessorInterface $propertyAccessor;
+
+    public function __construct(PropertyAccessorInterface $propertyAccessor = null)
+    {
+        $this->propertyAccessor = $propertyAccessor;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -72,18 +81,34 @@ private function getNormalizer(Unique $unique): callable
         return $unique->normalizer;
     }
 
-    private function reduceElementKeys(array $fields, array $element): array
+    private function reduceElementKeys(array $fields, array|object $element): array
     {
         $output = [];
         foreach ($fields as $field) {
             if (!\is_string($field)) {
                 throw new UnexpectedTypeException($field, 'string');
             }
-            if (isset($element[$field])) {
-                $output[$field] = $element[$field];
+
+            // For no BC, because PropertyAccessor require brackets for array keys
+            // Previous implementation, only check in array
+            if (\is_array($element) && !str_contains($field, '[')) {
+                $field = "[{$field}]";
+            }
+
+            if (null !== $value = $this->getPropertyAccessor()->getValue($element, $field)) {
+                $output[$field] = $value;
             }
         }
 
         return $output;
     }
+
+    private function getPropertyAccessor(): PropertyAccessorInterface
+    {
+        if (null === $this->propertyAccessor) {
+            $this->propertyAccessor = PropertyAccess::createPropertyAccessor();
+        }
+
+        return $this->propertyAccessor;
+    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php
@@ -280,6 +280,19 @@ public function getInvalidCollectionValues(): array
                 ['id' => 1, 'email' => 'bar@email.com'],
                 ['id' => 1, 'email' => 'foo@email.com'],
             ], ['id']],
+            'unique string attribute' => [[
+                (object) ['lang' => 'eng', 'translation' => 'hi'],
+                (object) ['lang' => 'eng', 'translation' => 'hello'],
+            ], ['lang']],
+            'unique float attribute' => [[
+                (object) ['latitude' => 51.509865, 'longitude' => -0.118092, 'poi' => 'capital'],
+                (object) ['latitude' => 52.520008, 'longitude' => 13.404954],
+                (object) ['latitude' => 51.509865, 'longitude' => -0.118092],
+            ], ['latitude', 'longitude']],
+            'unique int attribute' => [[
+                (object) ['id' => 1, 'email' => 'bar@email.com'],
+                (object) ['id' => 1, 'email' => 'foo@email.com'],
+            ], ['id']],
         ];
     }
 }
