From ab87a9cae88cdee83d71242020036fab43cc7cf2 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 26 Jul 2024 20:39:52 +0800
Subject: [PATCH 1/2] Update phpunit to `^10.5.16 || ^11.2`

---
 admin/framework/composer.json | 2 +-
 composer.json                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index d46c7490ec56..79fc5c282e50 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -23,7 +23,7 @@
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
-        "phpunit/phpunit": "^10.5.16",
+        "phpunit/phpunit": "^10.5.16 || ^11.2",
         "predis/predis": "^1.1 || ^2.0"
     },
     "suggest": {
diff --git a/composer.json b/composer.json
index 6915af74aa8f..ae8cd107d363 100644
--- a/composer.json
+++ b/composer.json
@@ -25,8 +25,8 @@
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "^1.11",
         "phpstan/phpstan-strict-rules": "^1.6",
-        "phpunit/phpcov": "^9.0.2",
-        "phpunit/phpunit": "^10.5.16",
+        "phpunit/phpcov": "^9.0.2 || ^10.0",
+        "phpunit/phpunit": "^10.5.16 || ^11.2",
         "predis/predis": "^1.1 || ^2.0",
         "rector/rector": "1.2.2"
     },

From e33e6f22d32f26acc184d6cdd45b0380910e110d Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 26 Jul 2024 20:51:10 +0800
Subject: [PATCH 2/2] Fix phpunit errors

---
 tests/system/Autoloader/AutoloaderTest.php    |  6 +--
 tests/system/CodeIgniterTest.php              |  6 +--
 tests/system/Commands/GenerateKeyTest.php     |  6 +--
 tests/system/CommonFunctionsSendTest.php      |  6 +--
 tests/system/CommonFunctionsTest.php          | 51 ++++---------------
 tests/system/Config/BaseConfigTest.php        |  6 +--
 tests/system/Config/DotEnvTest.php            |  6 +--
 tests/system/Config/ServicesTest.php          |  6 +--
 tests/system/Events/EventsTest.php            |  6 +--
 tests/system/Filters/HoneypotTest.php         |  6 +--
 .../system/HTTP/ContentSecurityPolicyTest.php |  6 +--
 tests/system/HTTP/DownloadResponseTest.php    |  6 +--
 tests/system/HTTP/IncomingRequestTest.php     |  6 +--
 tests/system/HTTP/RedirectResponseTest.php    |  6 +--
 tests/system/HTTP/ResponseSendTest.php        | 16 ++----
 tests/system/Helpers/FormHelperTest.php       |  6 +--
 .../system/Helpers/URLHelper/MiscUrlTest.php  | 10 +---
 .../system/RESTful/ResourceControllerTest.php |  6 +--
 .../system/RESTful/ResourcePresenterTest.php  |  6 +--
 .../SecurityCSRFSessionRandomizeTokenTest.php |  5 +-
 .../Security/SecurityCSRFSessionTest.php      |  6 +--
 tests/system/Session/SessionTest.php          |  6 +--
 tests/system/Test/ControllerTestTraitTest.php |  6 +--
 tests/system/Test/TestCaseEmissionsTest.php   | 11 ++--
 tests/system/View/ParserPluginTest.php        |  6 +--
 25 files changed, 60 insertions(+), 153 deletions(-)

diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index 04dfe04e991f..8529d79dc118 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -25,6 +25,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use RuntimeException;
 use UnnamespacedClass;
 
@@ -394,12 +395,9 @@ public function testAutoloaderLoadsNonClassFiles(): void
 
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testLoadHelpers(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $config            = new Autoload();
         $config->helpers[] = 'form';
 
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index a550e098e9b0..d87d0d8661ba 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -34,6 +34,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use Tests\Support\Filters\Customfilter;
 use Tests\Support\Filters\RedirectFilter;
 
@@ -48,15 +49,12 @@ final class CodeIgniterTest extends CIUnitTestCase
     private CodeIgniter $codeigniter;
     protected $routes;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
         $this->resetServices();
 
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 
         $this->codeigniter = new MockCodeIgniter(new App());
diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php
index 289a294f5d0c..40df8d1477c3 100644
--- a/tests/system/Commands/GenerateKeyTest.php
+++ b/tests/system/Commands/GenerateKeyTest.php
@@ -19,6 +19,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * @internal
@@ -31,6 +32,7 @@ final class GenerateKeyTest extends CIUnitTestCase
     private string $envPath;
     private string $backupEnvPath;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
@@ -43,10 +45,6 @@ protected function setUp(): void
         }
 
         $this->resetEnvironment();
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     protected function tearDown(): void
diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php
index 46871c6284df..e1f3f9dff961 100644
--- a/tests/system/CommonFunctionsSendTest.php
+++ b/tests/system/CommonFunctionsSendTest.php
@@ -17,6 +17,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * @internal
@@ -24,15 +25,12 @@
 #[Group('SeparateProcess')]
 final class CommonFunctionsSendTest extends CIUnitTestCase
 {
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
 
         unset($_ENV['foo'], $_SERVER['foo']);
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     /**
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index fbbece86ddd1..faa96e1fea4e 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -46,6 +46,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use RuntimeException;
 use stdClass;
 use Tests\Support\Models\JobModel;
@@ -274,12 +275,9 @@ public function testEscapeRecursiveArrayRaw(): void
 
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testSessionInstance(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $this->injectSessionMock();
 
         $this->assertInstanceOf(Session::class, session());
@@ -287,12 +285,9 @@ public function testSessionInstance(): void
 
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testSessionVariable(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $this->injectSessionMock();
 
         $_SESSION['notbogus'] = 'Hi there';
@@ -302,12 +297,9 @@ public function testSessionVariable(): void
 
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testSessionVariableNotThere(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $this->injectSessionMock();
 
         $_SESSION['bogus'] = 'Hi there';
@@ -428,12 +420,9 @@ public function testModelExistsAbsoluteClassname(): void
 
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testOldInput(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $this->injectSessionMock();
         // setup from RedirectResponseTest...
         $_SERVER['REQUEST_METHOD'] = 'GET';
@@ -465,12 +454,9 @@ public function testOldInput(): void
 
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testOldInputSerializeData(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $this->injectSessionMock();
         // setup from RedirectResponseTest...
         $_SERVER['REQUEST_METHOD'] = 'GET';
@@ -503,12 +489,9 @@ public function testOldInputSerializeData(): void
      */
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testOldInputArray(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $this->injectSessionMock();
         // setup from RedirectResponseTest...
         $_SERVER['REQUEST_METHOD'] = 'GET';
@@ -622,12 +605,9 @@ public function testRedirectResponseCookies1(): void
 
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testTrace(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         ob_start();
         trace();
         $content = ob_get_clean();
@@ -647,12 +627,9 @@ public function testViewNotSaveData(): void
 
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testForceHttpsNullRequestAndResponse(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $this->assertNull(Services::response()->header('Location'));
 
         Services::response()->setCookie('force', 'cookie');
@@ -763,12 +740,9 @@ public function testDWithCSP(): void
 
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testTraceWithCSP(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $this->resetServices();
 
         /** @var App $config */
@@ -780,11 +754,6 @@ public function testTraceWithCSP(): void
 
         Kint::$cli_detection = false;
 
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        // `$app->initialize()` sets error handler.
-        restore_error_handler();
-
         $this->expectOutputRegex('/<style class="kint-rich-style" nonce="[0-9a-z]{24}">/u');
         trace();
     }
diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index 2217120f1ea4..9f5afc600fae 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -20,6 +20,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use PHPUnit\Framework\MockObject\MockObject;
 use RegistrarConfig;
 use RuntimeException;
@@ -35,6 +36,7 @@ final class BaseConfigTest extends CIUnitTestCase
 {
     private string $fixturesFolder;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
@@ -54,10 +56,6 @@ protected function setUp(): void
         }
 
         BaseConfig::reset();
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     protected function tearDown(): void
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index db54d2663820..b2f8e8e947b7 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -21,6 +21,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use TypeError;
 
 /**
@@ -34,6 +35,7 @@ final class DotEnvTest extends CIUnitTestCase
     private string $path;
     private string $fixturesFolder;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
@@ -46,10 +48,6 @@ protected function setUp(): void
         $file = 'unreadable.env';
         $path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
         chmod($path, 0644);
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     protected function tearDown(): void
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index e80e2d394eeb..2c093724ac71 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -52,6 +52,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use RuntimeException;
 use Tests\Support\Config\Services;
 
@@ -63,15 +64,12 @@ final class ServicesTest extends CIUnitTestCase
 {
     private array $original;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
 
         $this->original = $_SERVER;
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     protected function tearDown(): void
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
index a2de4fb2f432..e761c7dff958 100644
--- a/tests/system/Events/EventsTest.php
+++ b/tests/system/Events/EventsTest.php
@@ -19,6 +19,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * @internal
@@ -31,6 +32,7 @@ final class EventsTest extends CIUnitTestCase
      */
     private Events $manager;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
@@ -38,10 +40,6 @@ protected function setUp(): void
         $this->manager = new MockEvents();
 
         Events::removeAllListeners();
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     protected function tearDown(): void
diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php
index 50909abe5a3e..79519709d72c 100644
--- a/tests/system/Filters/HoneypotTest.php
+++ b/tests/system/Filters/HoneypotTest.php
@@ -24,6 +24,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * @internal
@@ -42,6 +43,7 @@ final class HoneypotTest extends CIUnitTestCase
 
     private ?Response $response = null;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
@@ -51,10 +53,6 @@ protected function setUp(): void
         unset($_POST[$this->honey->name]);
         $_SERVER['REQUEST_METHOD'] = 'POST';
         $_POST[$this->honey->name] = 'hey';
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     public function testBeforeTriggered(): void
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index 31c915b09b1b..7000a881b9d6 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -20,6 +20,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * Test the CSP policy directive creation.
@@ -35,13 +36,10 @@ final class ContentSecurityPolicyTest extends CIUnitTestCase
     private ?Response $response         = null;
     private ?ContentSecurityPolicy $csp = null;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     // Having this method as setUp() doesn't work - can't find Config\App !?
diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php
index 2f27bc4651ea..b62996f3d825 100644
--- a/tests/system/HTTP/DownloadResponseTest.php
+++ b/tests/system/HTTP/DownloadResponseTest.php
@@ -21,6 +21,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * @internal
@@ -28,13 +29,10 @@
 #[Group('SeparateProcess')]
 final class DownloadResponseTest extends CIUnitTestCase
 {
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     protected function tearDown(): void
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index f76ea4a0c7cf..fa76e8289d46 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -26,6 +26,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use TypeError;
 
 /**
@@ -37,6 +38,7 @@ final class IncomingRequestTest extends CIUnitTestCase
 {
     private Request $request;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
@@ -45,10 +47,6 @@ protected function setUp(): void
         $this->request = $this->createRequest($config);
 
         $_POST = $_GET = $_SERVER = $_REQUEST = $_ENV = $_COOKIE = $_SESSION = [];
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     private function createRequest(?App $config = null, $body = null, ?string $path = null): IncomingRequest
diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php
index a800ce0afb2b..41ac8139bdc4 100644
--- a/tests/system/HTTP/RedirectResponseTest.php
+++ b/tests/system/HTTP/RedirectResponseTest.php
@@ -26,6 +26,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * @internal
@@ -41,6 +42,7 @@ final class RedirectResponseTest extends CIUnitTestCase
     private MockIncomingRequest $request;
     private App $config;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
@@ -62,10 +64,6 @@ protected function setUp(): void
             new UserAgent()
         );
         Services::injectMock('request', $this->request);
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     public function testRedirectToFullURI(): void
diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php
index d910b2de5c29..c7ad15195d97 100644
--- a/tests/system/HTTP/ResponseSendTest.php
+++ b/tests/system/HTTP/ResponseSendTest.php
@@ -20,6 +20,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * This test suite has been created separately from
@@ -47,12 +48,9 @@ final class ResponseSendTest extends CIUnitTestCase
      */
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testHeadersMissingDate(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $response = new Response(new App());
         $response->pretend(false);
 
@@ -83,12 +81,9 @@ public function testHeadersMissingDate(): void
      */
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testHeadersWithCSP(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $this->resetFactories();
         $this->resetServices();
 
@@ -122,12 +117,9 @@ public function testHeadersWithCSP(): void
      */
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testRedirectResponseCookies(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $loginTime = time();
 
         $response = new Response(new App());
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 35ed834a174c..fc9eb0ab021a 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -22,6 +22,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * @internal
@@ -29,6 +30,7 @@
 #[Group('SeparateProcess')]
 final class FormHelperTest extends CIUnitTestCase
 {
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         $this->resetServices();
@@ -36,10 +38,6 @@ protected function setUp(): void
         parent::setUp();
 
         helper('form');
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     private function setRequest(): void
diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index d38db01c56bf..125356e7d0ed 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -28,6 +28,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * @internal
@@ -61,12 +62,9 @@ protected function tearDown(): void
     #[Group('SeparateProcess')]
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testPreviousURLUsesSessionFirst(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $uri1 = 'http://example.com/one?two';
         $uri2 = 'http://example.com/two?foo';
 
@@ -98,10 +96,6 @@ private function createRequest(string $uri): void
     #[RunInSeparateProcess]
     public function testPreviousURLUsesRefererIfNeeded(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $uri1 = 'http://example.com/one?two';
 
         $_SERVER['HTTP_REFERER'] = $uri1;
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index 000abee6e317..77ca329248dc 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -30,6 +30,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use Psr\Log\NullLogger;
 use Tests\Support\Models\UserModel;
 use Tests\Support\RESTful\Worker;
@@ -54,16 +55,13 @@ final class ResourceControllerTest extends CIUnitTestCase
      */
     protected $routes;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
 
         $this->resetServices(true);
         $this->resetFactories();
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     private function createCodeigniter(): void
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 5d98dee4e583..e5614adfd1c0 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -24,6 +24,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use Tests\Support\Models\EntityModel;
 use Tests\Support\Models\UserModel;
 use Tests\Support\RESTful\Worker2;
@@ -48,16 +49,13 @@ final class ResourcePresenterTest extends CIUnitTestCase
      */
     protected $routes;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
 
         $this->resetServices(true);
         $this->resetFactories();
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     private function createCodeigniter(): void
diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
index 7e8f753d08e0..44ec179cda8c 100644
--- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
+++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
@@ -57,6 +57,7 @@ final class SecurityCSRFSessionRandomizeTokenTest extends CIUnitTestCase
 
     private SecurityConfig $config;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
@@ -70,10 +71,6 @@ protected function setUp(): void
         Factories::injectMock('config', 'Security', $this->config);
 
         $this->injectSession($this->hash);
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     private function createSession($options = []): Session
diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php
index 771193bc3171..7fb618bef936 100644
--- a/tests/system/Security/SecurityCSRFSessionTest.php
+++ b/tests/system/Security/SecurityCSRFSessionTest.php
@@ -34,6 +34,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * @internal
@@ -50,6 +51,7 @@ final class SecurityCSRFSessionTest extends CIUnitTestCase
 
     private SecurityConfig $config;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
@@ -62,10 +64,6 @@ protected function setUp(): void
         Factories::injectMock('config', 'Security', $this->config);
 
         $this->injectSession($this->hash);
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     private function createSession($options = []): Session
diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
index 9faadb66b219..0e6b3415149a 100644
--- a/tests/system/Session/SessionTest.php
+++ b/tests/system/Session/SessionTest.php
@@ -25,6 +25,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * @internal
@@ -34,16 +35,13 @@
 #[RunTestsInSeparateProcesses]
 final class SessionTest extends CIUnitTestCase
 {
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
 
         $_COOKIE  = [];
         $_SESSION = [];
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     protected function getInstance($options = [])
diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php
index 8708bcce2008..3a5ffb47fcfd 100644
--- a/tests/system/Test/ControllerTestTraitTest.php
+++ b/tests/system/Test/ControllerTestTraitTest.php
@@ -24,6 +24,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use Tests\Support\Controllers\Newautorouting;
 use Tests\Support\Controllers\Popcorn;
 
@@ -39,13 +40,10 @@ final class ControllerTestTraitTest extends CIUnitTestCase
 {
     use ControllerTestTrait;
 
+    #[WithoutErrorHandler]
     protected function setUp(): void
     {
         parent::setUp();
-
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
     }
 
     public function testBadController(): void
diff --git a/tests/system/Test/TestCaseEmissionsTest.php b/tests/system/Test/TestCaseEmissionsTest.php
index e46a4bf5581d..8ebcdcc28d92 100644
--- a/tests/system/Test/TestCaseEmissionsTest.php
+++ b/tests/system/Test/TestCaseEmissionsTest.php
@@ -18,6 +18,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * This test suite has been created separately from
@@ -45,12 +46,9 @@ final class TestCaseEmissionsTest extends CIUnitTestCase
      */
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testHeadersEmitted(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $response = new Response(new App());
         $response->pretend(false);
 
@@ -75,12 +73,9 @@ public function testHeadersEmitted(): void
 
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testHeadersNotEmitted(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $response = new Response(new App());
         $response->pretend(false);
 
diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php
index e37aab0e2309..cdbb82178e19 100644
--- a/tests/system/View/ParserPluginTest.php
+++ b/tests/system/View/ParserPluginTest.php
@@ -19,6 +19,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 
 /**
  * @internal
@@ -49,12 +50,9 @@ public function testCurrentURL(): void
     #[Group('SeparateProcess')]
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
+    #[WithoutErrorHandler]
     public function testPreviousURL(): void
     {
-        // Workaround for errors on PHPUnit 10 and PHP 8.3.
-        // See https://github.com/sebastianbergmann/phpunit/issues/5403#issuecomment-1906810619
-        restore_error_handler();
-
         $template = '{+ previous_url +}';
 
         // Ensure a previous URL exists to work with.