Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit f3064a2e0b5e · 2021-11-28T16:34:37.000+01:00
* 5.4:
  [Process] intersect with getenv() in case-insensitive manner to get default envs
  [Serializer] fix support for lazy/unset properties
  Fix redundant type casts
  [Notifier] Fix AllMySms bridge body content
  Revert "[DoctrineBridge] add support for the JSON type"
diff --git a/Inline.php b/Inline.php
@@ -637,7 +637,7 @@ private static function evaluateScalar(string $scalar, int $flags, array &$refer
             // no break
             case \in_array($scalar[0], ['+', '-', '.'], true) || is_numeric($scalar[0]):
                 if (Parser::preg_match('{^[+-]?[0-9][0-9_]*$}', $scalar)) {
-                    $scalar = str_replace('_', '', (string) $scalar);
+                    $scalar = str_replace('_', '', $scalar);
                 }
 
                 switch (true) {

Original file line number	Diff line number	Diff line change
`@@ -637,7 +637,7 @@ private static function evaluateScalar(string $scalar, int $flags, array &$refer`
`637`	`637`	`// no break`
`638`	`638`	`case \in_array($scalar[0], ['+', '-', '.'], true) \|\| is_numeric($scalar[0]):`
`639`	`639`	`if (Parser::preg_match('{^[+-]?[0-9][0-9_]*$}', $scalar)) {`
`640`		`- $scalar = str_replace('_', '', (string) $scalar);`
	`640`	`+ $scalar = str_replace('_', '', $scalar);`
`641`	`641`	`}`
`642`	`642`
`643`	`643`	`switch (true) {`