Issue/622 Address the review findings of the PHPUnit 10 upgrade

.coderabbit.yaml

@@ -0,0 +1,7 @@
+# CodeRabbit reviews pull requests into the default branch only, unless more branches are listed here.
+# Also review the pull requests into the maintenance branches (3.1.x, 3.2.x, ...), so a change is
+# reviewed in its own pull request and not only in the merge of the branch into master.
+reviews:
+  auto_review:
+    base_branches:
+      - '^\d+\.\d+\.x$'

phpunit.xml

@@ -6,6 +6,8 @@
         colors="true"
         stderr="true"
         stopOnFailure="false"
+        failOnWarning="true"
+        failOnRisky="true"
         cacheDirectory=".phpunit.cache"
 >
     <php>

tests/Unit/Tracer/ErrorHandlerTest.php

@@ -27,30 +27,28 @@ public function setUp(): void
         $this->errorHandler = new ErrorHandler();
     }
 
-    public function tearDown(): void
-    {
-        restore_error_handler();
-        restore_exception_handler();
-        parent::tearDown();
-    }
-
     public function testSetupRegistersErrorHandler(): void
     {
         $logger = Mockery::mock(Logger::class);
 
         $this->errorHandler->setup($logger);
 
-        $currentHandler = set_error_handler(function () {
-        });
-        restore_error_handler();
+        try {
+            $currentHandler = set_error_handler(function () {
+            });
+            restore_error_handler();
 
-        $this->assertNotNull($currentHandler);
-        $this->assertInstanceOf(Closure::class, $currentHandler);
+            $this->assertNotNull($currentHandler);
+            $this->assertInstanceOf(Closure::class, $currentHandler);
 
-        $reflection = new ReflectionFunction($currentHandler);
+            $reflection = new ReflectionFunction($currentHandler);
 
-        $this->assertInstanceOf(ErrorHandler::class, $reflection->getClosureThis());
-        $this->assertEquals('handleError', $reflection->getName());
+            $this->assertInstanceOf(ErrorHandler::class, $reflection->getClosureThis());
+            $this->assertEquals('handleError', $reflection->getName());
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
     }
 
     public function testSetupRegistersExceptionHandler(): void
@@ -59,17 +57,22 @@ public function testSetupRegistersExceptionHandler(): void
 
         $this->errorHandler->setup($logger);
 
-        $currentHandler = set_exception_handler(function () {
-        });
-        restore_exception_handler();
+        try {
+            $currentHandler = set_exception_handler(function () {
+            });
+            restore_exception_handler();
 
-        $this->assertNotNull($currentHandler);
-        $this->assertInstanceOf(Closure::class, $currentHandler);
+            $this->assertNotNull($currentHandler);
+            $this->assertInstanceOf(Closure::class, $currentHandler);
 
-        $reflection = new ReflectionFunction($currentHandler);
+            $reflection = new ReflectionFunction($currentHandler);
 
-        $this->assertInstanceOf(ErrorHandler::class, $reflection->getClosureThis());
-        $this->assertEquals('handleException', $reflection->getName());
+            $this->assertInstanceOf(ErrorHandler::class, $reflection->getClosureThis());
+            $this->assertEquals('handleException', $reflection->getName());
+        } finally {
+            restore_error_handler();
+            restore_exception_handler();
+        }
     }
 
     public function testHandleErrorThrowsErrorException(): void