minor #54258 [ErrorHandler] Fix tests (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 8832a0a771b4 · 2024-03-12T15:57:47.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [ErrorHandler] Fix tests | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Fixing #54189 Commits ------- 59d7c72 [ErrorHandler] Fix tests
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -517,7 +517,12 @@ public function handleError(int $type, string $message, string $file, int $line)
                         }
 
                         // Display the original error message instead of the default one.
-                        $this->handleException($errorAsException);
+                        $exitCode = self::$exitCode;
+                        try {
+                            $this->handleException($errorAsException);
+                        } finally {
+                            self::$exitCode = $exitCode;
+                        }
 
                         // Stop the process by giving back the error to the native handler.
                         return false;
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();`