bug #50017 [Validator] Fix support of Enum to ConstraintValidator::formatValue (PhoneixS)

nicolas-grekas · nicolas-grekas · commit 831e0cabfc2a · 2023-04-19T09:44:41.000+02:00
This PR was submitted for the 6.2 branch but it was squashed and merged into the 5.4 branch instead. Discussion ---------- [Validator] Fix support of Enum to `ConstraintValidator::formatValue` | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #50000 | License | MIT I have added a simple check in the `formatValue` to see if the object is an enum and in that case, return the name of the enum instead of the "object" string. Commits ------- 128b3da [Validator] Fix support of Enum to `ConstraintValidator::formatValue`
diff --git a/src/Symfony/Component/Validator/ConstraintValidator.php b/src/Symfony/Component/Validator/ConstraintValidator.php
@@ -99,6 +99,10 @@ protected function formatValue($value, int $format = 0)
             return $value->format('Y-m-d H:i:s');
         }
 
+        if ($value instanceof \UnitEnum) {
+            return $value->name;
+        }
+
         if (\is_object($value)) {
             if (($format & self::OBJECT_TO_STRING) && method_exists($value, '__toString')) {
                 return $value->__toString();
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintValidatorTest.php b/src/Symfony/Component/Validator/Tests/ConstraintValidatorTest.php
@@ -41,6 +41,7 @@ public static function formatValueProvider()
             ['array', []],
             ['object', $toString = new TestToStringObject()],
             ['ccc', $toString, ConstraintValidator::OBJECT_TO_STRING],
+            ['FirstCase', $toString = TestEnum::FirstCase],
             ['object', $dateTime = new \DateTimeImmutable('1971-02-02T08:00:00UTC')],
             [class_exists(\IntlDateFormatter::class) ? 'Oct 4, 2019, 11:02 AM' : '2019-10-04 11:02:03', new \DateTimeImmutable('2019-10-04T11:02:03+09:00'), ConstraintValidator::PRETTY_DATE],
             [class_exists(\IntlDateFormatter::class) ? 'Feb 2, 1971, 8:00 AM' : '1971-02-02 08:00:00', $dateTime, ConstraintValidator::PRETTY_DATE],
@@ -73,3 +74,9 @@ public function __toString()
         return 'ccc';
     }
 }
+
+enum TestEnum
+{
+    case FirstCase;
+    case SecondCase;
+}
