Merge branch '7.1' into 7.2

nicolas-grekas · nicolas-grekas · commit acd0ff17cb6e · 2024-07-26T15:20:48.000+02:00
* 7.1:
  Fix merge
  Sync .github/expected-missing-return-types.diff
  [ErrorHandler] Fix `E_STRICT` logging level
diff --git a/ErrorHandler.php b/ErrorHandler.php
@@ -182,7 +182,7 @@ public function __construct(
     ) {
         if (\PHP_VERSION_ID < 80400) {
             $this->levels[\E_STRICT] = 'Runtime Notice';
-            $this->loggers[\E_STRICT] = [null, LogLevel::WARNING];
+            $this->loggers[\E_STRICT] = [null, LogLevel::ERROR];
         }
 
         if ($bootstrappingLogger) {

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public function __construct(`
`182`	`182`	`) {`
`183`	`183`	`if (\PHP_VERSION_ID < 80400) {`
`184`	`184`	`$this->levels[\E_STRICT] = 'Runtime Notice';`
`185`		`- $this->loggers[\E_STRICT] = [null, LogLevel::WARNING];`
	`185`	`+ $this->loggers[\E_STRICT] = [null, LogLevel::ERROR];`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`if ($bootstrappingLogger) {`