minor #23616 [VarDumper] Remove hhvm compat in time zone caster (maidmaid)

nicolas-grekas · nicolas-grekas · commit 9fa38950ec14 · 2017-07-21T16:08:38.000+02:00
This PR was merged into the 4.0-dev branch. Discussion ---------- [VarDumper] Remove hhvm compat in time zone caster | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | / | License | MIT | Doc PR | / The 2nd arg of ``\Locale::getDisplayRegion()`` method is optional in PHP but required with HHVM. See https://3v4l.org/eAigW. Commits ------- 164015e Remove hhvm compat
diff --git a/src/Symfony/Component/VarDumper/Caster/DateCaster.php b/src/Symfony/Component/VarDumper/Caster/DateCaster.php
@@ -68,7 +68,7 @@ public static function castTimeZone(\DateTimeZone $timeZone, array $a, Stub $stu
     {
         $location = $timeZone->getLocation();
         $formatted = (new \Datetime('now', $timeZone))->format($location ? 'e (P)' : 'P');
-        $title = $location && extension_loaded('intl') ? \Locale::getDisplayRegion('-'.$location['country_code'], \Locale::getDefault()) : '';
+        $title = $location && extension_loaded('intl') ? \Locale::getDisplayRegion('-'.$location['country_code']) : '';
 
         $z = array(Caster::PREFIX_VIRTUAL.'timezone' => new ConstStub($formatted, $title));
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static function castTimeZone(\DateTimeZone $timeZone, array $a, Stub $stu`
`68`	`68`	`{`
`69`	`69`	`$location = $timeZone->getLocation();`
`70`	`70`	`$formatted = (new \Datetime('now', $timeZone))->format($location ? 'e (P)' : 'P');`
`71`		`- $title = $location && extension_loaded('intl') ? \Locale::getDisplayRegion('-'.$location['country_code'], \Locale::getDefault()) : '';`
	`71`	`+ $title = $location && extension_loaded('intl') ? \Locale::getDisplayRegion('-'.$location['country_code']) : '';`
`72`	`72`
`73`	`73`	`$z = array(Caster::PREFIX_VIRTUAL.'timezone' => new ConstStub($formatted, $title));`
`74`	`74`