[Validator] Fix TimezoneValidator default option

ro0NL · nicolas-grekas · commit ee71cdbae4db · 2019-05-31T09:42:02.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/Timezone.php b/src/Symfony/Component/Validator/Constraints/Timezone.php
@@ -43,7 +43,7 @@ class Timezone extends Constraint
     /**
      * {@inheritdoc}
      */
-    public function __construct(array $options = null)
+    public function __construct($options = null)
     {
         parent::__construct($options);
 
@@ -58,4 +58,12 @@ public function __construct(array $options = null)
             throw new ConstraintDefinitionException('The option "intlCompatible" can only be used when the PHP intl extension is available.');
         }
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDefaultOption()
+    {
+        return 'zone';
+    }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
@@ -75,28 +75,6 @@ public function validate($value, Constraint $constraint)
               ->addViolation();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'zone';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function formatValue($value, $format = 0)
-    {
-        $value = parent::formatValue($value, $format);
-
-        if (!$value || \DateTimeZone::PER_COUNTRY === $value) {
-            return $value;
-        }
-
-        return array_search($value, (new \ReflectionClass(\DateTimeZone::class))->getConstants(), true) ?: $value;
-    }
-
     private static function getPhpTimezones(int $zone, string $countryCode = null): array
     {
         if (null !== $countryCode) {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/TimezoneTest.php b/src/Symfony/Component/Validator/Tests/Constraints/TimezoneTest.php
@@ -23,7 +23,7 @@ public function testValidTimezoneConstraints()
     {
         new Timezone();
         new Timezone(['zone' => \DateTimeZone::ALL]);
-        new Timezone(['zone' => \DateTimeZone::ALL_WITH_BC]);
+        new Timezone(\DateTimeZone::ALL_WITH_BC);
         new Timezone([
             'zone' => \DateTimeZone::PER_COUNTRY,
             'countryCode' => 'AR',
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/TimezoneValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/TimezoneValidatorTest.php
@@ -267,9 +267,7 @@ public function testGroupedTimezonesWithInvalidCountry()
      */
     public function testDeprecatedTimezonesAreValidWithBC(string $timezone)
     {
-        $constraint = new Timezone([
-            'zone' => \DateTimeZone::ALL_WITH_BC,
-        ]);
+        $constraint = new Timezone(\DateTimeZone::ALL_WITH_BC);
 
         $this->validator->validate($timezone, $constraint);
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class Timezone extends Constraint`
`43`	`43`	`/**`
`44`	`44`	`* {@inheritdoc}`
`45`	`45`	`*/`
`46`		`- public function __construct(array $options = null)`
	`46`	`+ public function __construct($options = null)`
`47`	`47`	`{`
`48`	`48`	`parent::__construct($options);`
`49`	`49`
`@@ -58,4 +58,12 @@ public function __construct(array $options = null)`
`58`	`58`	`throw new ConstraintDefinitionException('The option "intlCompatible" can only be used when the PHP intl extension is available.');`
`59`	`59`	`}`
`60`	`60`	`}`
	`61`	`+`
	`62`	`+ /**`
	`63`	`+ * {@inheritdoc}`
	`64`	`+ */`
	`65`	`+ public function getDefaultOption()`
	`66`	`+ {`
	`67`	`+ return 'zone';`
	`68`	`+ }`
`61`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public function testValidTimezoneConstraints()`
`23`	`23`	`{`
`24`	`24`	`new Timezone();`
`25`	`25`	`new Timezone(['zone' => \DateTimeZone::ALL]);`
`26`		`- new Timezone(['zone' => \DateTimeZone::ALL_WITH_BC]);`
	`26`	`+ new Timezone(\DateTimeZone::ALL_WITH_BC);`
`27`	`27`	`new Timezone([`
`28`	`28`	`'zone' => \DateTimeZone::PER_COUNTRY,`
`29`	`29`	`'countryCode' => 'AR',`
Original file line number	Diff line number	Diff line change
`@@ -267,9 +267,7 @@ public function testGroupedTimezonesWithInvalidCountry()`
`267`	`267`	`*/`
`268`	`268`	`public function testDeprecatedTimezonesAreValidWithBC(string $timezone)`
`269`	`269`	`{`
`270`		`- $constraint = new Timezone([`
`271`		`- 'zone' => \DateTimeZone::ALL_WITH_BC,`
`272`		`- ]);`
	`270`	`+ $constraint = new Timezone(\DateTimeZone::ALL_WITH_BC);`
`273`	`271`
`274`	`272`	`$this->validator->validate($timezone, $constraint);`
`275`	`273`