Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 84180a25fad3 · 2020-09-02T18:08:58.000+02:00
* 3.4:
  Enable "native_constant_invocation" CS rule
  Make AbstractPhpFileCacheWarmer public
diff --git a/TranslatorTrait.php b/TranslatorTrait.php
@@ -92,8 +92,8 @@ public function trans($id, array $parameters = [], $domain = null, $locale = nul
                         }
                     }
                 } else {
-                    $leftNumber = '-Inf' === $matches['left'] ? -INF : (float) $matches['left'];
-                    $rightNumber = is_numeric($matches['right']) ? (float) $matches['right'] : INF;
+                    $leftNumber = '-Inf' === $matches['left'] ? -\INF : (float) $matches['left'];
+                    $rightNumber = is_numeric($matches['right']) ? (float) $matches['right'] : \INF;
 
                     if (('[' === $matches['left_delimiter'] ? $number >= $leftNumber : $number > $leftNumber)
                         && (']' === $matches['right_delimiter'] ? $number <= $rightNumber : $number < $rightNumber)

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,8 @@ public function trans($id, array $parameters = [], $domain = null, $locale = nul`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`} else {`
`95`		`- $leftNumber = '-Inf' === $matches['left'] ? -INF : (float) $matches['left'];`
`96`		`- $rightNumber = is_numeric($matches['right']) ? (float) $matches['right'] : INF;`
	`95`	`+ $leftNumber = '-Inf' === $matches['left'] ? -\INF : (float) $matches['left'];`
	`96`	`+ $rightNumber = is_numeric($matches['right']) ? (float) $matches['right'] : \INF;`
`97`	`97`
`98`	`98`	`if (('[' === $matches['left_delimiter'] ? $number >= $leftNumber : $number > $leftNumber)`
`99`	`99`	`&& (']' === $matches['right_delimiter'] ? $number <= $rightNumber : $number < $rightNumber)`