minor symfony#38231 [Validator] catch ValueError thrown on PHP 8 (xabbuh)

xabbuh · xabbuh · commit e299544639ff · 2020-09-18T12:06:31.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Validator] catch ValueError thrown on PHP 8 | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | see php/php-src@95f4ee3 Commits ------- fb0d7be catch ValueError thrown on PHP 8
diff --git a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
@@ -78,7 +78,11 @@ public function validate($value, Constraint $constraint)
     private static function getPhpTimezones(int $zone, string $countryCode = null): array
     {
         if (null !== $countryCode) {
-            return @\DateTimeZone::listIdentifiers($zone, $countryCode) ?: [];
+            try {
+                return @\DateTimeZone::listIdentifiers($zone, $countryCode) ?: [];
+            } catch (\ValueError $e) {
+                return [];
+            }
         }
 
         return \DateTimeZone::listIdentifiers($zone);

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,11 @@ public function validate($value, Constraint $constraint)`
`78`	`78`	`private static function getPhpTimezones(int $zone, string $countryCode = null): array`
`79`	`79`	`{`
`80`	`80`	`if (null !== $countryCode) {`
`81`		`- return @\DateTimeZone::listIdentifiers($zone, $countryCode) ?: [];`
	`81`	`+ try {`
	`82`	`+ return @\DateTimeZone::listIdentifiers($zone, $countryCode) ?: [];`
	`83`	`+ } catch (\ValueError $e) {`
	`84`	`+ return [];`
	`85`	`+ }`
`82`	`86`	`}`
`83`	`87`
`84`	`88`	`return \DateTimeZone::listIdentifiers($zone);`