Merge branch '12.3'

Author: sebastianbergmann

tests/end-to-end/regression/5592-process-isolation.phpt

@@ -5,9 +5,13 @@ https://github.com/sebastianbergmann/phpunit/pull/5592
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = __DIR__ . '/5592/Issue5592Test.php';
+$_SERVER['argv'][] = __DIR__ . '/5592/Issue5592TestIsolation.php';
 
-set_exception_handler(static fn () => null);
+function global5592IsolationExceptionHandler(Throwable $exception): void
+{
+}
+
+set_exception_handler('global5592IsolationExceptionHandler');
 
 require_once __DIR__ . '/../../bootstrap.php';
 (new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
@@ -22,34 +26,34 @@ Time: %s, Memory: %s
 
 There were 4 failures:
 
-1) PHPUnit\TestFixture\Issue5592Test::testAddedErrorHandler
+1) PHPUnit\TestFixture\Issue5592TestIsolation::testAddedErrorHandler
 Failed asserting that false is true.
 
-%sIssue5592Test.php:%i
+%sIssue5592TestIsolation.php:%i
 
-2) PHPUnit\TestFixture\Issue5592Test::testRemovedErrorHandler
+2) PHPUnit\TestFixture\Issue5592TestIsolation::testRemovedErrorHandler
 Failed asserting that false is true.
 
-%sIssue5592Test.php:%i
+%sIssue5592TestIsolation.php:%i
 
-3) PHPUnit\TestFixture\Issue5592Test::testAddedExceptionHandler
+3) PHPUnit\TestFixture\Issue5592TestIsolation::testAddedExceptionHandler
 Failed asserting that false is true.
 
-%sIssue5592Test.php:%i
+%sIssue5592TestIsolation.php:%i
 
-4) PHPUnit\TestFixture\Issue5592Test::testRemovedExceptionHandler
+4) PHPUnit\TestFixture\Issue5592TestIsolation::testRemovedExceptionHandler
 Failed asserting that false is true.
 
-%sIssue5592Test.php:%i
+%sIssue5592TestIsolation.php:%i
 
 --
 
 There was 1 risky test:
 
-1) PHPUnit\TestFixture\Issue5592Test::testRemovedErrorHandler
+1) PHPUnit\TestFixture\Issue5592TestIsolation::testRemovedErrorHandler
 Test code or tested code removed error handlers other than its own
 
-%sIssue5592Test.php:%i
+%sIssue5592TestIsolation.php:%i
 
 FAILURES!
-Tests: 6, Assertions: 6, Failures: 4, Risky: 1.
+Tests: 6, Assertions: 10, Failures: 4, Risky: 1.

tests/end-to-end/regression/5592.phpt

@@ -6,7 +6,11 @@ $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = __DIR__ . '/5592/Issue5592Test.php';
 
-set_exception_handler(static fn () => null);
+function global5592ExceptionHandler(Throwable $exception): void
+{
+}
+
+set_exception_handler('global5592ExceptionHandler');
 
 require_once __DIR__ . '/../../bootstrap.php';
 (new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
@@ -66,4 +70,4 @@ Test code or tested code removed exception handlers other than its own
 %sIssue5592Test.php:%i
 
 FAILURES!
-Tests: 6, Assertions: 6, Failures: 4, Risky: 4.
+Tests: 6, Assertions: 10, Failures: 4, Risky: 4.

tests/end-to-end/regression/5592/Issue5592Test.php

@@ -14,19 +14,25 @@
 use function set_error_handler;
 use function set_exception_handler;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Runner\ErrorHandler;
+use Throwable;
 
 class Issue5592Test extends TestCase
 {
     public function testAddedAndRemovedErrorHandler(): void
     {
-        set_error_handler(static fn () => false);
+        $previous = set_error_handler([$this, 'addedAndRemovedErrorHandler']);
         restore_error_handler();
+
+        $this->assertInstanceOf(ErrorHandler::class, $previous);
         $this->assertTrue(true);
     }
 
     public function testAddedErrorHandler(): void
     {
-        set_error_handler(static fn () => false);
+        $previous = set_error_handler([$this, 'addedErrorHandler']);
+
+        $this->assertInstanceOf(ErrorHandler::class, $previous);
         $this->assertTrue(false);
     }
 
@@ -38,14 +44,18 @@ public function testRemovedErrorHandler(): void
 
     public function testAddedAndRemovedExceptionHandler(): void
     {
-        set_exception_handler(static fn () => null);
+        $previous = set_exception_handler([$this, 'addedAndRemovedExceptionHandler']);
         restore_exception_handler();
+
+        $this->assertSame('global5592ExceptionHandler', $previous);
         $this->assertTrue(true);
     }
 
     public function testAddedExceptionHandler(): void
     {
-        set_exception_handler(static fn () => null);
+        $previous = set_exception_handler([$this, 'addedExceptionHandler']);
+
+        $this->assertSame('global5592ExceptionHandler', $previous);
         $this->assertTrue(false);
     }
 
@@ -54,4 +64,22 @@ public function testRemovedExceptionHandler(): void
         restore_exception_handler();
         $this->assertTrue(false);
     }
+
+    public function addedAndRemovedErrorHandler($errno, $errstr, $errfile, $errline): bool
+    {
+        return false;
+    }
+
+    public function addedErrorHandler($errno, $errstr, $errfile, $errline): bool
+    {
+        return false;
+    }
+
+    public function addedAndRemovedExceptionHandler(Throwable $exception): void
+    {
+    }
+
+    public function addedExceptionHandler(Throwable $exception): void
+    {
+    }
 }

tests/end-to-end/regression/5592/Issue5592TestIsolation.php

@@ -0,0 +1,85 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture;
+
+use function restore_error_handler;
+use function restore_exception_handler;
+use function set_error_handler;
+use function set_exception_handler;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Runner\ErrorHandler;
+use Throwable;
+
+class Issue5592TestIsolation extends TestCase
+{
+    public function testAddedAndRemovedErrorHandler(): void
+    {
+        $previous = set_error_handler([$this, 'addedAndRemovedErrorHandler']);
+        restore_error_handler();
+
+        $this->assertInstanceOf(ErrorHandler::class, $previous);
+        $this->assertTrue(true);
+    }
+
+    public function testAddedErrorHandler(): void
+    {
+        $previous = set_error_handler([$this, 'addedErrorHandler']);
+
+        $this->assertInstanceOf(ErrorHandler::class, $previous);
+        $this->assertTrue(false);
+    }
+
+    public function testRemovedErrorHandler(): void
+    {
+        restore_error_handler();
+        $this->assertTrue(false);
+    }
+
+    public function testAddedAndRemovedExceptionHandler(): void
+    {
+        $previous = set_exception_handler([$this, 'addedAndRemovedExceptionHandler']);
+        restore_exception_handler();
+
+        $this->assertNull($previous);
+        $this->assertTrue(true);
+    }
+
+    public function testAddedExceptionHandler(): void
+    {
+        $previous = set_exception_handler([$this, 'addedExceptionHandler']);
+
+        $this->assertNull($previous);
+        $this->assertTrue(false);
+    }
+
+    public function testRemovedExceptionHandler(): void
+    {
+        restore_exception_handler();
+        $this->assertTrue(false);
+    }
+
+    public function addedAndRemovedErrorHandler($errno, $errstr, $errfile, $errline): bool
+    {
+        return false;
+    }
+
+    public function addedErrorHandler($errno, $errstr, $errfile, $errline): bool
+    {
+        return false;
+    }
+
+    public function addedAndRemovedExceptionHandler(Throwable $exception): void
+    {
+    }
+
+    public function addedExceptionHandler(Throwable $exception): void
+    {
+    }
+}