Update way of handling zone option

phansys · phansys · commit e09ad494cb25 · 2017-04-05T20:17:20.000-03:00
diff --git a/src/Symfony/Component/Validator/Constraints/Timezone.php b/src/Symfony/Component/Validator/Constraints/Timezone.php
@@ -24,7 +24,7 @@ class Timezone extends Constraint
 {
     const NO_SUCH_TIMEZONE_ERROR = '45de6628-3479-46d6-a210-00ad584f530a';
 
-    public $zone = \DateTimeZone::ALL;
+    public $zone;
 
     public $countryCode;
 
diff --git a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
@@ -40,7 +40,8 @@ public function validate($value, Constraint $constraint)
         }
 
         $value = (string) $value;
-        $timezoneIds = \DateTimeZone::listIdentifiers($constraint->zone, $constraint->countryCode);
+        $zone = null !== $constraint->zone ? $constraint->zone : \DateTimeZone::ALL;
+        $timezoneIds = \DateTimeZone::listIdentifiers($zone, $constraint->countryCode);
 
         if ($timezoneIds && !in_array($value, $timezoneIds, true)) {
             $this->context->buildViolation($constraint->message)
@@ -62,13 +63,16 @@ public function getDefaultOption()
      * Format the extra info which is appended to validation message based on
      * constraint options.
      *
-     * @param int         $zone
+     * @param int|null    $zone
      * @param string|null $countryCode
      *
      * @return string
      */
     private function formatExtraInfo($zone, $countryCode = null)
     {
+        if (null === $zone) {
+            return '';
+        }
         if ($countryCode) {
             $value = ' for ISO 3166-1 country code "'.$countryCode.'"';
         } else {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/TimezoneValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/TimezoneValidatorTest.php
@@ -106,7 +106,7 @@ public function getValidGroupedTimezones()
     /**
      * @dataProvider getInvalidTimezones
      */
-    public function testInvalidTimezones($timezone, $extraInfo)
+    public function testInvalidTimezonesWithoutZone($timezone, $extraInfo)
     {
         $constraint = new Timezone(array(
             'message' => 'myMessage',
@@ -115,17 +115,17 @@ public function testInvalidTimezones($timezone, $extraInfo)
         $this->validator->validate($timezone, $constraint);
 
         $this->buildViolation('myMessage')
-            ->setParameter('{{ extra_info }}', '"'.$extraInfo.'"')
+            ->setParameter('{{ extra_info }}', $extraInfo)
             ->setCode(Timezone::NO_SUCH_TIMEZONE_ERROR)
             ->assertRaised();
     }
 
     public function getInvalidTimezones()
     {
         return array(
-            array('Buenos_Aires/Argentina/America', ' for "ALL" zone'),
-            array('Mayotte/Indian', ' for "ALL" zone'),
-            array('foobar', ' for "ALL" zone'),
+            array('Buenos_Aires/Argentina/America', ''),
+            array('Mayotte/Indian', ''),
+            array('foobar', ''),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class Timezone extends Constraint`
`24`	`24`	`{`
`25`	`25`	`const NO_SUCH_TIMEZONE_ERROR = '45de6628-3479-46d6-a210-00ad584f530a';`
`26`	`26`
`27`		`- public $zone = \DateTimeZone::ALL;`
	`27`	`+ public $zone;`
`28`	`28`
`29`	`29`	`public $countryCode;`
`30`	`30`