symfony
diff --git a/‎src/Symfony/Component/Validator/Constraints/Timezone.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/Timezone.php
+2Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/Timezone.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/Timezone.php
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
+9-1Lines changed: 9 additions & 1 deletion b/‎src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
+9-1Lines changed: 9 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Validator/Tests/Constraints/TimezoneValidatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/TimezoneValidatorTest.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Validator/Tests/Constraints/TimezoneValidatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/TimezoneValidatorTest.php
+2-2Lines changed: 2 additions & 2 deletions
@@ -23,6 +23,8 @@
 class Timezone extends Constraint
 {
     const NO_SUCH_TIMEZONE_ERROR = '45de6628-3479-46d6-a210-00ad584f530a';
+    const NO_SUCH_TIMEZONE_IN_ZONE_ERROR = 'b57767b1-36c0-40ac-a3d7-629420c775b8';
+    const NO_SUCH_TIMEZONE_IN_COUNTRY_ERROR = 'c4a22222-dc92-4fc0-abb0-d95b268c7d0b';
 
     public $zone;
 
 
@@ -44,9 +44,17 @@ public function validate($value, Constraint $constraint)
         $timezoneIds = \DateTimeZone::listIdentifiers($zone, $constraint->countryCode);
 
         if ($timezoneIds && !in_array($value, $timezoneIds, true)) {
+            if ($constraint->countryCode) {
+                $code = Timezone::NO_SUCH_TIMEZONE_IN_COUNTRY_ERROR;
+            } elseif (null !== $constraint->zone) {
+                $code = Timezone::NO_SUCH_TIMEZONE_IN_ZONE_ERROR;
+            } else {
+                $code = Timezone::NO_SUCH_TIMEZONE_ERROR;
+            }
+
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ extra_info }}', $this->formatExtraInfo($constraint->zone, $constraint->countryCode))
-                ->setCode(Timezone::NO_SUCH_TIMEZONE_ERROR)
+                ->setCode($code)
                 ->addViolation();
         }
     }
 
@@ -143,7 +143,7 @@ public function testInvalidGroupedTimezones($timezone, $what, $extraInfo)
 
         $this->buildViolation('myMessage')
             ->setParameter('{{ extra_info }}', '"'.$extraInfo.'"')
-            ->setCode(Timezone::NO_SUCH_TIMEZONE_ERROR)
+            ->setCode(Timezone::NO_SUCH_TIMEZONE_IN_ZONE_ERROR)
             ->assertRaised();
     }
 
@@ -207,7 +207,7 @@ public function testInvalidGroupedTimezonesByCountry($timezone, $what, $country,
 
         $this->buildViolation('myMessage')
             ->setParameter('{{ extra_info }}', '"'.$extraInfo.'"')
-            ->setCode(Timezone::NO_SUCH_TIMEZONE_ERROR)
+            ->setCode(Timezone::NO_SUCH_TIMEZONE_IN_COUNTRY_ERROR)
             ->assertRaised();
     }
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`class Timezone extends Constraint`
`24`	`24`	`{`
`25`	`25`	`const NO_SUCH_TIMEZONE_ERROR = '45de6628-3479-46d6-a210-00ad584f530a';`
	`26`	`+ const NO_SUCH_TIMEZONE_IN_ZONE_ERROR = 'b57767b1-36c0-40ac-a3d7-629420c775b8';`
	`27`	`+ const NO_SUCH_TIMEZONE_IN_COUNTRY_ERROR = 'c4a22222-dc92-4fc0-abb0-d95b268c7d0b';`
`26`	`28`
`27`	`29`	`public $zone;`
`28`	`30`