Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit c4f893a8cfcb · 2019-08-08T19:11:47.000+02:00
* 4.3:
  [Intl] use strict comparisons
  Fix s-maxage=3 transient test
diff --git a/DateFormatter/DateFormat/Hour1200Transformer.php b/DateFormatter/DateFormat/Hour1200Transformer.php
@@ -26,7 +26,7 @@ class Hour1200Transformer extends HourTransformer
     public function format(\DateTime $dateTime, int $length): string
     {
         $hourOfDay = $dateTime->format('g');
-        $hourOfDay = '12' == $hourOfDay ? '0' : $hourOfDay;
+        $hourOfDay = '12' === $hourOfDay ? '0' : $hourOfDay;
 
         return $this->padLeft($hourOfDay, $length);
     }
diff --git a/DateFormatter/DateFormat/Hour2400Transformer.php b/DateFormatter/DateFormat/Hour2400Transformer.php
@@ -33,9 +33,11 @@ public function format(\DateTime $dateTime, int $length): string
      */
     public function normalizeHour(int $hour, string $marker = null): int
     {
-        if ('AM' == $marker) {
+        $marker = (string) $marker;
+
+        if ('AM' === $marker) {
             $hour = 0;
-        } elseif ('PM' == $marker) {
+        } elseif ('PM' === $marker) {
             $hour = 12;
         }
 
diff --git a/DateFormatter/DateFormat/Hour2401Transformer.php b/DateFormatter/DateFormat/Hour2401Transformer.php
@@ -26,7 +26,7 @@ class Hour2401Transformer extends HourTransformer
     public function format(\DateTime $dateTime, int $length): string
     {
         $hourOfDay = $dateTime->format('G');
-        $hourOfDay = ('0' == $hourOfDay) ? '24' : $hourOfDay;
+        $hourOfDay = '0' === $hourOfDay ? '24' : $hourOfDay;
 
         return $this->padLeft($hourOfDay, $length);
     }
@@ -36,7 +36,7 @@ public function format(\DateTime $dateTime, int $length): string
      */
     public function normalizeHour(int $hour, string $marker = null): int
     {
-        if ((null === $marker && 24 === $hour) || 'AM' == $marker) {
+        if ((null === $marker && 24 == $hour) || 'AM' == $marker) {
             $hour = 0;
         } elseif ('PM' == $marker) {
             $hour = 12;
diff --git a/DateFormatter/DateFormat/TimezoneTransformer.php b/DateFormatter/DateFormat/TimezoneTransformer.php
@@ -102,7 +102,7 @@ public static function getEtcTimeZoneId($formattedTimeZone)
         if (preg_match('/GMT(?P<signal>[+-])(?P<hours>\d{2}):?(?P<minutes>\d{2})/', $formattedTimeZone, $matches)) {
             $hours = (int) $matches['hours'];
             $minutes = (int) $matches['minutes'];
-            $signal = '-' == $matches['signal'] ? '+' : '-';
+            $signal = '-' === $matches['signal'] ? '+' : '-';
 
             if (0 < $minutes) {
                 throw new NotImplementedException(sprintf('It is not possible to use a GMT time zone with minutes offset different than zero (0). GMT time zone tried: %s.', $formattedTimeZone));
diff --git a/NumberFormatter/NumberFormatter.php b/NumberFormatter/NumberFormatter.php
@@ -272,19 +272,19 @@ public function __construct(?string $locale = 'en', int $style = null, $pattern
             throw new MethodArgumentNotImplementedException(__METHOD__, 'pattern');
         }
 
-        $this->style = $style;
+        $this->style = null !== $style ? (int) $style : null;
     }
 
     /**
      * Static constructor.
      *
-     * @param string $locale  The locale code. The only supported locale is "en" (or null using the default locale, i.e. "en")
-     * @param int    $style   Style of the formatting, one of the format style constants.
-     *                        The only currently supported styles are NumberFormatter::DECIMAL
-     *                        and NumberFormatter::CURRENCY.
-     * @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or
-     *                        NumberFormat::PATTERN_RULEBASED. It must conform to  the syntax
-     *                        described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
+     * @param string|null $locale  The locale code. The only supported locale is "en" (or null using the default locale, i.e. "en")
+     * @param int         $style   Style of the formatting, one of the format style constants.
+     *                             The only currently supported styles are NumberFormatter::DECIMAL
+     *                             and NumberFormatter::CURRENCY.
+     * @param string      $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or
+     *                             NumberFormat::PATTERN_RULEBASED. It must conform to  the syntax
+     *                             described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
      *
      * @return self
      *
@@ -314,7 +314,7 @@ public static function create($locale = 'en', $style = null, $pattern = null)
      */
     public function formatCurrency($value, $currency)
     {
-        if (self::DECIMAL == $this->style) {
+        if (self::DECIMAL === $this->style) {
             return $this->format($value);
         }
 
@@ -353,19 +353,21 @@ public function formatCurrency($value, $currency)
      */
     public function format($value, $type = self::TYPE_DEFAULT)
     {
+        $type = (int) $type;
+
         // The original NumberFormatter does not support this format type
-        if (self::TYPE_CURRENCY == $type) {
+        if (self::TYPE_CURRENCY === $type) {
             trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;
         }
 
-        if (self::CURRENCY == $this->style) {
+        if (self::CURRENCY === $this->style) {
             throw new NotImplementedException(sprintf('%s() method does not support the formatting of currencies (instance with CURRENCY style). %s', __METHOD__, NotImplementedException::INTL_INSTALL_MESSAGE));
         }
 
         // Only the default type is supported.
-        if (self::TYPE_DEFAULT != $type) {
+        if (self::TYPE_DEFAULT !== $type) {
             throw new MethodArgumentValueNotImplementedException(__METHOD__, 'type', $type, 'Only TYPE_DEFAULT is supported');
         }
 
@@ -385,7 +387,7 @@ public function format($value, $type = self::TYPE_DEFAULT)
      *
      * @param int $attr An attribute specifier, one of the numeric attribute constants
      *
-     * @return bool|int The attribute value on success or false on error
+     * @return int|false The attribute value on success or false on error
      *
      * @see https://php.net/numberformatter.getattribute
      */
@@ -438,7 +440,7 @@ public function getLocale($type = Locale::ACTUAL_LOCALE)
     /**
      * Not supported. Returns the formatter's pattern.
      *
-     * @return bool|string The pattern string used by the formatter or false on error
+     * @return string|false The pattern string used by the formatter or false on error
      *
      * @see https://php.net/numberformatter.getpattern
      *
@@ -454,7 +456,7 @@ public function getPattern()
      *
      * @param int $attr A symbol specifier, one of the format symbol constants
      *
-     * @return bool|string The symbol value or false on error
+     * @return string|false The symbol value or false on error
      *
      * @see https://php.net/numberformatter.getsymbol
      */
@@ -468,7 +470,7 @@ public function getSymbol($attr)
      *
      * @param int $attr An attribute specifier, one of the text attribute constants
      *
-     * @return bool|string The attribute value or false on error
+     * @return string|false The attribute value or false on error
      *
      * @see https://php.net/numberformatter.gettextattribute
      */
@@ -484,7 +486,7 @@ public function getTextAttribute($attr)
      * @param string $currency Parameter to receive the currency name (reference)
      * @param int    $position Offset to begin the parsing on return this value will hold the offset at which the parsing ended
      *
-     * @return bool|string The parsed numeric value or false on error
+     * @return float|false The parsed numeric value or false on error
      *
      * @see https://php.net/numberformatter.parsecurrency
      *
@@ -508,7 +510,9 @@ public function parseCurrency($value, &$currency, &$position = null)
      */
     public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
     {
-        if (self::TYPE_DEFAULT == $type || self::TYPE_CURRENCY == $type) {
+        $type = (int) $type;
+
+        if (self::TYPE_DEFAULT === $type || self::TYPE_CURRENCY === $type) {
             trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;
@@ -565,6 +569,8 @@ public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
      */
     public function setAttribute($attr, $value)
     {
+        $attr = (int) $attr;
+
         if (!\in_array($attr, self::$supportedAttributes)) {
             $message = sprintf(
                 'The available attributes are: %s',
@@ -574,7 +580,7 @@ public function setAttribute($attr, $value)
             throw new MethodArgumentValueNotImplementedException(__METHOD__, 'attr', $value, $message);
         }
 
-        if (self::$supportedAttributes['ROUNDING_MODE'] == $attr && $this->isInvalidRoundingMode($value)) {
+        if (self::$supportedAttributes['ROUNDING_MODE'] === $attr && $this->isInvalidRoundingMode($value)) {
             $message = sprintf(
                 'The supported values for ROUNDING_MODE are: %s',
                 implode(', ', array_keys(self::$roundingModes))
@@ -583,11 +589,11 @@ public function setAttribute($attr, $value)
             throw new MethodArgumentValueNotImplementedException(__METHOD__, 'attr', $value, $message);
         }
 
-        if (self::$supportedAttributes['GROUPING_USED'] == $attr) {
+        if (self::$supportedAttributes['GROUPING_USED'] === $attr) {
             $value = $this->normalizeGroupingUsedValue($value);
         }
 
-        if (self::$supportedAttributes['FRACTION_DIGITS'] == $attr) {
+        if (self::$supportedAttributes['FRACTION_DIGITS'] === $attr) {
             $value = $this->normalizeFractionDigitsValue($value);
             if ($value < 0) {
                 // ignore negative values but do not raise an error
@@ -751,7 +757,7 @@ private function formatNumber($value, int $precision): string
      */
     private function getUninitializedPrecision($value, int $precision): int
     {
-        if (self::CURRENCY == $this->style) {
+        if (self::CURRENCY === $this->style) {
             return $precision;
         }
 
@@ -782,11 +788,13 @@ private function isInitializedAttribute(string $attr): bool
      */
     private function convertValueDataType($value, int $type)
     {
-        if (self::TYPE_DOUBLE == $type) {
+        $type = (int) $type;
+
+        if (self::TYPE_DOUBLE === $type) {
             $value = (float) $value;
-        } elseif (self::TYPE_INT32 == $type) {
+        } elseif (self::TYPE_INT32 === $type) {
             $value = $this->getInt32Value($value);
-        } elseif (self::TYPE_INT64 == $type) {
+        } elseif (self::TYPE_INT64 === $type) {
             $value = $this->getInt64Value($value);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class Hour1200Transformer extends HourTransformer`
`26`	`26`	`public function format(\DateTime $dateTime, int $length): string`
`27`	`27`	`{`
`28`	`28`	`$hourOfDay = $dateTime->format('g');`
`29`		`- $hourOfDay = '12' == $hourOfDay ? '0' : $hourOfDay;`
	`29`	`+ $hourOfDay = '12' === $hourOfDay ? '0' : $hourOfDay;`
`30`	`30`
`31`	`31`	`return $this->padLeft($hourOfDay, $length);`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,11 @@ public function format(\DateTime $dateTime, int $length): string`
`33`	`33`	`*/`
`34`	`34`	`public function normalizeHour(int $hour, string $marker = null): int`
`35`	`35`	`{`
`36`		`- if ('AM' == $marker) {`
	`36`	`+ $marker = (string) $marker;`
	`37`	`+`
	`38`	`+ if ('AM' === $marker) {`
`37`	`39`	`$hour = 0;`
`38`		`- } elseif ('PM' == $marker) {`
	`40`	`+ } elseif ('PM' === $marker) {`
`39`	`41`	`$hour = 12;`
`40`	`42`	`}`
`41`	`43`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class Hour2401Transformer extends HourTransformer`
`26`	`26`	`public function format(\DateTime $dateTime, int $length): string`
`27`	`27`	`{`
`28`	`28`	`$hourOfDay = $dateTime->format('G');`
`29`		`- $hourOfDay = ('0' == $hourOfDay) ? '24' : $hourOfDay;`
	`29`	`+ $hourOfDay = '0' === $hourOfDay ? '24' : $hourOfDay;`
`30`	`30`
`31`	`31`	`return $this->padLeft($hourOfDay, $length);`
`32`	`32`	`}`
`@@ -36,7 +36,7 @@ public function format(\DateTime $dateTime, int $length): string`
`36`	`36`	`*/`
`37`	`37`	`public function normalizeHour(int $hour, string $marker = null): int`
`38`	`38`	`{`
`39`		`- if ((null === $marker && 24 === $hour) \|\| 'AM' == $marker) {`
	`39`	`+ if ((null === $marker && 24 == $hour) \|\| 'AM' == $marker) {`
`40`	`40`	`$hour = 0;`
`41`	`41`	`} elseif ('PM' == $marker) {`
`42`	`42`	`$hour = 12;`
Original file line number	Diff line number	Diff line change
`@@ -272,19 +272,19 @@ public function __construct(?string $locale = 'en', int $style = null, $pattern`
`272`	`272`	`throw new MethodArgumentNotImplementedException(__METHOD__, 'pattern');`
`273`	`273`	`}`
`274`	`274`
`275`		`- $this->style = $style;`
	`275`	`+ $this->style = null !== $style ? (int) $style : null;`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`/**`
`279`	`279`	`* Static constructor.`
`280`	`280`	`*`
`281`		`- * @param string $locale The locale code. The only supported locale is "en" (or null using the default locale, i.e. "en")`
`282`		`- * @param int $style Style of the formatting, one of the format style constants.`
`283`		`- * The only currently supported styles are NumberFormatter::DECIMAL`
`284`		`- * and NumberFormatter::CURRENCY.`
`285`		`- * @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or`
`286`		`- * NumberFormat::PATTERN_RULEBASED. It must conform to the syntax`
`287`		`- * described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation`
	`281`	`+ * @param string\|null $locale The locale code. The only supported locale is "en" (or null using the default locale, i.e. "en")`
	`282`	`+ * @param int $style Style of the formatting, one of the format style constants.`
	`283`	`+ * The only currently supported styles are NumberFormatter::DECIMAL`
	`284`	`+ * and NumberFormatter::CURRENCY.`
	`285`	`+ * @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or`
	`286`	`+ * NumberFormat::PATTERN_RULEBASED. It must conform to the syntax`
	`287`	`+ * described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation`
`288`	`288`	`*`
`289`	`289`	`* @return self`
`290`	`290`	`*`
`@@ -314,7 +314,7 @@ public static function create($locale = 'en', $style = null, $pattern = null)`
`314`	`314`	`*/`
`315`	`315`	`public function formatCurrency($value, $currency)`
`316`	`316`	`{`
`317`		`- if (self::DECIMAL == $this->style) {`
	`317`	`+ if (self::DECIMAL === $this->style) {`
`318`	`318`	`return $this->format($value);`
`319`	`319`	`}`
`320`	`320`
`@@ -353,19 +353,21 @@ public function formatCurrency($value, $currency)`
`353`	`353`	`*/`
`354`	`354`	`public function format($value, $type = self::TYPE_DEFAULT)`
`355`	`355`	`{`
	`356`	`+ $type = (int) $type;`
	`357`	`+`
`356`	`358`	`// The original NumberFormatter does not support this format type`
`357`		`- if (self::TYPE_CURRENCY == $type) {`
	`359`	`+ if (self::TYPE_CURRENCY === $type) {`
`358`	`360`	`trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);`
`359`	`361`
`360`	`362`	`return false;`
`361`	`363`	`}`
`362`	`364`
`363`		`- if (self::CURRENCY == $this->style) {`
	`365`	`+ if (self::CURRENCY === $this->style) {`
`364`	`366`	`throw new NotImplementedException(sprintf('%s() method does not support the formatting of currencies (instance with CURRENCY style). %s', __METHOD__, NotImplementedException::INTL_INSTALL_MESSAGE));`
`365`	`367`	`}`
`366`	`368`
`367`	`369`	`// Only the default type is supported.`
`368`		`- if (self::TYPE_DEFAULT != $type) {`
	`370`	`+ if (self::TYPE_DEFAULT !== $type) {`
`369`	`371`	`throw new MethodArgumentValueNotImplementedException(__METHOD__, 'type', $type, 'Only TYPE_DEFAULT is supported');`
`370`	`372`	`}`
`371`	`373`
`@@ -385,7 +387,7 @@ public function format($value, $type = self::TYPE_DEFAULT)`
`385`	`387`	`*`
`386`	`388`	`* @param int $attr An attribute specifier, one of the numeric attribute constants`
`387`	`389`	`*`
`388`		`- * @return bool\|int The attribute value on success or false on error`
	`390`	`+ * @return int\|false The attribute value on success or false on error`
`389`	`391`	`*`
`390`	`392`	`* @see https://php.net/numberformatter.getattribute`
`391`	`393`	`*/`
`@@ -438,7 +440,7 @@ public function getLocale($type = Locale::ACTUAL_LOCALE)`
`438`	`440`	`/**`
`439`	`441`	`* Not supported. Returns the formatter's pattern.`
`440`	`442`	`*`
`441`		`- * @return bool\|string The pattern string used by the formatter or false on error`
	`443`	`+ * @return string\|false The pattern string used by the formatter or false on error`
`442`	`444`	`*`
`443`	`445`	`* @see https://php.net/numberformatter.getpattern`
`444`	`446`	`*`
`@@ -454,7 +456,7 @@ public function getPattern()`
`454`	`456`	`*`
`455`	`457`	`* @param int $attr A symbol specifier, one of the format symbol constants`
`456`	`458`	`*`
`457`		`- * @return bool\|string The symbol value or false on error`
	`459`	`+ * @return string\|false The symbol value or false on error`
`458`	`460`	`*`
`459`	`461`	`* @see https://php.net/numberformatter.getsymbol`
`460`	`462`	`*/`
`@@ -468,7 +470,7 @@ public function getSymbol($attr)`
`468`	`470`	`*`
`469`	`471`	`* @param int $attr An attribute specifier, one of the text attribute constants`
`470`	`472`	`*`
`471`		`- * @return bool\|string The attribute value or false on error`
	`473`	`+ * @return string\|false The attribute value or false on error`
`472`	`474`	`*`
`473`	`475`	`* @see https://php.net/numberformatter.gettextattribute`
`474`	`476`	`*/`
`@@ -484,7 +486,7 @@ public function getTextAttribute($attr)`
`484`	`486`	`* @param string $currency Parameter to receive the currency name (reference)`
`485`	`487`	`* @param int $position Offset to begin the parsing on return this value will hold the offset at which the parsing ended`
`486`	`488`	`*`
`487`		`- * @return bool\|string The parsed numeric value or false on error`
	`489`	`+ * @return float\|false The parsed numeric value or false on error`
`488`	`490`	`*`
`489`	`491`	`* @see https://php.net/numberformatter.parsecurrency`
`490`	`492`	`*`
`@@ -508,7 +510,9 @@ public function parseCurrency($value, &$currency, &$position = null)`
`508`	`510`	`*/`
`509`	`511`	`public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)`
`510`	`512`	`{`
`511`		`- if (self::TYPE_DEFAULT == $type \|\| self::TYPE_CURRENCY == $type) {`
	`513`	`+ $type = (int) $type;`
	`514`	`+`
	`515`	`+ if (self::TYPE_DEFAULT === $type \|\| self::TYPE_CURRENCY === $type) {`
`512`	`516`	`trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);`
`513`	`517`
`514`	`518`	`return false;`
`@@ -565,6 +569,8 @@ public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)`
`565`	`569`	`*/`
`566`	`570`	`public function setAttribute($attr, $value)`
`567`	`571`	`{`
	`572`	`+ $attr = (int) $attr;`
	`573`	`+`
`568`	`574`	`if (!\in_array($attr, self::$supportedAttributes)) {`
`569`	`575`	`$message = sprintf(`
`570`	`576`	`'The available attributes are: %s',`
`@@ -574,7 +580,7 @@ public function setAttribute($attr, $value)`
`574`	`580`	`throw new MethodArgumentValueNotImplementedException(__METHOD__, 'attr', $value, $message);`
`575`	`581`	`}`
`576`	`582`
`577`		`- if (self::$supportedAttributes['ROUNDING_MODE'] == $attr && $this->isInvalidRoundingMode($value)) {`
	`583`	`+ if (self::$supportedAttributes['ROUNDING_MODE'] === $attr && $this->isInvalidRoundingMode($value)) {`
`578`	`584`	`$message = sprintf(`
`579`	`585`	`'The supported values for ROUNDING_MODE are: %s',`
`580`	`586`	`implode(', ', array_keys(self::$roundingModes))`
`@@ -583,11 +589,11 @@ public function setAttribute($attr, $value)`
`583`	`589`	`throw new MethodArgumentValueNotImplementedException(__METHOD__, 'attr', $value, $message);`
`584`	`590`	`}`
`585`	`591`
`586`		`- if (self::$supportedAttributes['GROUPING_USED'] == $attr) {`
	`592`	`+ if (self::$supportedAttributes['GROUPING_USED'] === $attr) {`
`587`	`593`	`$value = $this->normalizeGroupingUsedValue($value);`
`588`	`594`	`}`
`589`	`595`
`590`		`- if (self::$supportedAttributes['FRACTION_DIGITS'] == $attr) {`
	`596`	`+ if (self::$supportedAttributes['FRACTION_DIGITS'] === $attr) {`
`591`	`597`	`$value = $this->normalizeFractionDigitsValue($value);`
`592`	`598`	`if ($value < 0) {`
`593`	`599`	`// ignore negative values but do not raise an error`
`@@ -751,7 +757,7 @@ private function formatNumber($value, int $precision): string`
`751`	`757`	`*/`
`752`	`758`	`private function getUninitializedPrecision($value, int $precision): int`
`753`	`759`	`{`
`754`		`- if (self::CURRENCY == $this->style) {`
	`760`	`+ if (self::CURRENCY === $this->style) {`
`755`	`761`	`return $precision;`
`756`	`762`	`}`
`757`	`763`
`@@ -782,11 +788,13 @@ private function isInitializedAttribute(string $attr): bool`
`782`	`788`	`*/`
`783`	`789`	`private function convertValueDataType($value, int $type)`
`784`	`790`	`{`
`785`		`- if (self::TYPE_DOUBLE == $type) {`
	`791`	`+ $type = (int) $type;`
	`792`	`+`
	`793`	`+ if (self::TYPE_DOUBLE === $type) {`
`786`	`794`	`$value = (float) $value;`
`787`		`- } elseif (self::TYPE_INT32 == $type) {`
	`795`	`+ } elseif (self::TYPE_INT32 === $type) {`
`788`	`796`	`$value = $this->getInt32Value($value);`
`789`		`- } elseif (self::TYPE_INT64 == $type) {`
	`797`	`+ } elseif (self::TYPE_INT64 === $type) {`
`790`	`798`	`$value = $this->getInt64Value($value);`
`791`	`799`	`}`
`792`	`800`