Merge branch '4.4' into 5.3

nicolas-grekas · nicolas-grekas · commit 18962649de78 · 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/ErrorHandler.php b/ErrorHandler.php
@@ -348,7 +348,7 @@ public function scopeAt(int $levels, bool $replace = false): int
     public function traceAt(int $levels, bool $replace = false): int
     {
         $prev = $this->tracedErrors;
-        $this->tracedErrors = (int) $levels;
+        $this->tracedErrors = $levels;
         if (!$replace) {
             $this->tracedErrors |= $prev;
         }

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ public function scopeAt(int $levels, bool $replace = false): int`
`348`	`348`	`public function traceAt(int $levels, bool $replace = false): int`
`349`	`349`	`{`
`350`	`350`	`$prev = $this->tracedErrors;`
`351`		`- $this->tracedErrors = (int) $levels;`
	`351`	`+ $this->tracedErrors = $levels;`
`352`	`352`	`if (!$replace) {`
`353`	`353`	`$this->tracedErrors \|= $prev;`
`354`	`354`	`}`