Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 414ff891ce17 · 2023-07-16T18:55:01.000+02:00
* 5.4:
  [Runtime][ErrorHandler] Don't mess with ini_set('assert.warning')
diff --git a/src/Symfony/Component/ErrorHandler/Debug.php b/src/Symfony/Component/ErrorHandler/Debug.php
@@ -31,7 +31,6 @@ public static function enable(): ErrorHandler
 
         @ini_set('zend.assertions', 1);
         ini_set('assert.active', 1);
-        ini_set('assert.warning', 0);
         ini_set('assert.exception', 1);
 
         DebugClassLoader::enable();
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
@@ -619,6 +619,7 @@ public function testAssertQuietEval()
             $this->markTestSkipped('zend.assertions is forcibly disabled');
         }
 
+        set_error_handler(function () {});
         $ini = [
             ini_set('zend.assertions', 1),
             ini_set('assert.active', 1),
@@ -627,6 +628,7 @@ public function testAssertQuietEval()
             ini_set('assert.callback', null),
             ini_set('assert.exception', 0),
         ];
+        restore_error_handler();
 
         $logger = new BufferingLogger();
         $handler = new ErrorHandler($logger);
diff --git a/src/Symfony/Component/Runtime/Internal/BasicErrorHandler.php b/src/Symfony/Component/Runtime/Internal/BasicErrorHandler.php
@@ -32,7 +32,6 @@ public static function register(bool $debug): void
         if (0 <= \ini_get('zend.assertions')) {
             ini_set('zend.assertions', 1);
             ini_set('assert.active', $debug);
-            ini_set('assert.warning', 0);
             ini_set('assert.exception', 1);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ public static function register(bool $debug): void`
`32`	`32`	`if (0 <= \ini_get('zend.assertions')) {`
`33`	`33`	`ini_set('zend.assertions', 1);`
`34`	`34`	`ini_set('assert.active', $debug);`
`35`		`- ini_set('assert.warning', 0);`
`36`	`35`	`ini_set('assert.exception', 1);`
`37`	`36`	`}`
`38`	`37`