Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit 9cce9a8a78af · 2024-03-12T15:58:20.000+01:00
* 5.4:
  [ErrorHandler] Fix tests
  [CI] Remove experimental flag on PHP 8.4 job
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -33,7 +33,7 @@ jobs:
             mode: low-deps
           - php: '8.3'
           - php: '8.4'
-            mode: experimental
+            #mode: experimental
       fail-fast: false
 
     runs-on: ubuntu-20.04
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
@@ -31,6 +31,13 @@
  */
 class ErrorHandlerTest extends TestCase
 {
+    public function tearDown(): void
+    {
+        $r = new \ReflectionProperty(ErrorHandler::class, 'exitCode');
+        $r->setAccessible(true);
+        $r->setValue(null, 0);
+    }
+
     public function testRegister()
     {
         $handler = ErrorHandler::register();

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,13 @@`
`31`	`31`	`*/`
`32`	`32`	`class ErrorHandlerTest extends TestCase`
`33`	`33`	`{`
	`34`	`+ public function tearDown(): void`
	`35`	`+ {`
	`36`	`+ $r = new \ReflectionProperty(ErrorHandler::class, 'exitCode');`
	`37`	`+ $r->setAccessible(true);`
	`38`	`+ $r->setValue(null, 0);`
	`39`	`+ }`
	`40`	`+`
`34`	`41`	`public function testRegister()`
`35`	`42`	`{`
`36`	`43`	`$handler = ErrorHandler::register();`