Merge branch '4.4' into 5.3

nicolas-grekas · nicolas-grekas · commit dc07a318dae6 · 2021-11-28T16:23:54.000+01:00
* 4.4:
  [Process] intersect with getenv() in case-insensitive manner to get default envs
  [Serializer] fix support for lazy/unset properties
  Fix redundant type casts
  Revert "[DoctrineBridge] add support for the JSON type"
diff --git a/Inline.php b/Inline.php
@@ -667,7 +667,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
`@@ -667,7 +667,7 @@ private static function evaluateScalar(string $scalar, int $flags, array &$refer`
`667`	`667`	`// no break`
`668`	`668`	`case \in_array($scalar[0], ['+', '-', '.'], true) \|\| is_numeric($scalar[0]):`
`669`	`669`	`if (Parser::preg_match('{^[+-]?[0-9][0-9_]*$}', $scalar)) {`
`670`		`- $scalar = str_replace('_', '', (string) $scalar);`
	`670`	`+ $scalar = str_replace('_', '', $scalar);`
`671`	`671`	`}`
`672`	`672`
`673`	`673`	`switch (true) {`