minor #29782 [Intl] make type-hinted arguments nullable (xabbuh)

fabpot · fabpot · commit 3299f272fc44 · 2019-01-05T12:46:06.000+01:00
This PR was merged into the 4.1 branch. Discussion ---------- [Intl] make type-hinted arguments nullable | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 16ebeb3 [Intl] make type-hinted arguments nullable
diff --git a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
@@ -132,7 +132,7 @@ class IntlDateFormatter
      * @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed
      * @throws MethodArgumentValueNotImplementedException When $calendar different than GREGORIAN is passed
      */
-    public function __construct(?string $locale, int $datetype, int $timetype, $timezone = null, ?int $calendar = self::GREGORIAN, string $pattern = null)
+    public function __construct(?string $locale, ?int $datetype, ?int $timetype, $timezone = null, ?int $calendar = self::GREGORIAN, string $pattern = null)
     {
         if ('en' !== $locale && null !== $locale) {
             throw new MethodArgumentValueNotImplementedException(__METHOD__, 'locale', $locale, 'Only the locale "en" is supported');

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ class IntlDateFormatter`
`132`	`132`	`* @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed`
`133`	`133`	`* @throws MethodArgumentValueNotImplementedException When $calendar different than GREGORIAN is passed`
`134`	`134`	`*/`
`135`		`- public function __construct(?string $locale, int $datetype, int $timetype, $timezone = null, ?int $calendar = self::GREGORIAN, string $pattern = null)`
	`135`	`+ public function __construct(?string $locale, ?int $datetype, ?int $timetype, $timezone = null, ?int $calendar = self::GREGORIAN, string $pattern = null)`
`136`	`136`	`{`
`137`	`137`	`if ('en' !== $locale && null !== $locale) {`
`138`	`138`	`throw new MethodArgumentValueNotImplementedException(__METHOD__, 'locale', $locale, 'Only the locale "en" is supported');`