Merge branch '6.4' into 7.2

nicolas-grekas · nicolas-grekas · commit 7cfa5d20bc9c · 2025-06-13T09:47:28.000+02:00
* 6.4:
  Silence E_DEPRECATED and E_USER_DEPRECATED
  [HttpCache] Hit the backend only once after waiting for the cache lock
  fix compatibility with Symfony 7.4
diff --git a/Debug.php b/Debug.php
@@ -20,7 +20,7 @@ class Debug
 {
     public static function enable(): ErrorHandler
     {
-        error_reporting(-1);
+        error_reporting(\E_ALL & ~\E_DEPRECATED & ~\E_USER_DEPRECATED);
 
         if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
             ini_set('display_errors', 0);

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class Debug`
`20`	`20`	`{`
`21`	`21`	`public static function enable(): ErrorHandler`
`22`	`22`	`{`
`23`		`- error_reporting(-1);`
	`23`	`+ error_reporting(\E_ALL & ~\E_DEPRECATED & ~\E_USER_DEPRECATED);`
`24`	`24`
`25`	`25`	`if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {`
`26`	`26`	`ini_set('display_errors', 0);`