From 75721c09be52dc4f1ec5e18f8a275be2c73be924 Mon Sep 17 00:00:00 2001
From: Matthew Setter <matthew@matthewsetter.com>
Date: Fri, 21 Mar 2025 20:51:11 +1000
Subject: [PATCH] Refactor to support PHPUnit's new event system

This change refactors some of the test code to support PHPUnit's most
recent iteration of its event system. The previous iteration worked for
earlier versions, but there was a newer version release in PHPUnit
10.0.7.

Signed-off-by: Matthew Setter <matthew@matthewsetter.com>
---
 phpunit.xml.dist                              | 12 +++----
 .../IntegrationTestStartedListener.php}       | 32 ++++---------------
 .../IntegrationTestStoppedListener.php        | 31 ++++++++++++++++++
 .../Extension/ListenerExtension.php           | 22 +++++++++++++
 4 files changed, 63 insertions(+), 34 deletions(-)
 rename test/integration/{IntegrationTestListener.php => Extension/IntegrationTestStartedListener.php} (57%)
 create mode 100644 test/integration/Extension/IntegrationTestStoppedListener.php
 create mode 100644 test/integration/Extension/ListenerExtension.php

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0d4ce670a..52ce8bc98 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -4,11 +4,10 @@
     xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="vendor/autoload.php"
     colors="true">
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
+
+    <extensions>
+        <bootstrap class="LaminasIntegrationTest\Db\Extension\ListenerExtension" />
+    </extensions>
 
     <testsuites>
         <testsuite name="unit test">
@@ -19,9 +18,6 @@
         </testsuite>
     </testsuites>
 
-    <listeners>
-        <listener class="LaminasIntegrationTest\Db\IntegrationTestListener" file="./test/integration/IntegrationTestListener.php"/>
-    </listeners>
 
     <php>
         <!-- Note: the following is a FULL list of ALL POSSIBLE constants
diff --git a/test/integration/IntegrationTestListener.php b/test/integration/Extension/IntegrationTestStartedListener.php
similarity index 57%
rename from test/integration/IntegrationTestListener.php
rename to test/integration/Extension/IntegrationTestStartedListener.php
index 8c2d4250f..8e775e8d2 100644
--- a/test/integration/IntegrationTestListener.php
+++ b/test/integration/Extension/IntegrationTestStartedListener.php
@@ -1,29 +1,25 @@
 <?php
 
-namespace LaminasIntegrationTest\Db;
+namespace LaminasIntegrationTest\Db\Extension;
 
 use LaminasIntegrationTest\Db\Platform\FixtureLoader;
 use LaminasIntegrationTest\Db\Platform\MysqlFixtureLoader;
 use LaminasIntegrationTest\Db\Platform\PgsqlFixtureLoader;
 use LaminasIntegrationTest\Db\Platform\SqlServerFixtureLoader;
-use PHPUnit\Framework\TestListener;
-use PHPUnit\Framework\TestListenerDefaultImplementation;
-use PHPUnit\Framework\TestSuite;
-use PHPUnit\Runner\TestHook;
+use PHPUnit\Event\TestSuite\Started;
+use PHPUnit\Event\TestSuite\StartedSubscriber;
 
 use function getenv;
 use function printf;
 
-class IntegrationTestListener implements TestHook, TestListener
+final class IntegrationTestStartedListener implements StartedSubscriber
 {
-    use TestListenerDefaultImplementation;
-
     /** @var FixtureLoader[] */
     private $fixtureLoaders = [];
 
-    public function startTestSuite(TestSuite $suite): void
+    public function notify(Started $event): void
     {
-        if ($suite->getName() !== 'integration test') {
+        if ($event->testSuite()->name() !== 'integration test') {
             return;
         }
 
@@ -49,20 +45,4 @@ public function startTestSuite(TestSuite $suite): void
             $fixtureLoader->createDatabase();
         }
     }
-
-    public function endTestSuite(TestSuite $suite): void
-    {
-        if (
-            $suite->getName() !== 'integration test'
-            || empty($this->fixtureLoaders)
-        ) {
-            return;
-        }
-
-        printf("\nIntegration test ended.\n");
-
-        foreach ($this->fixtureLoaders as $fixtureLoader) {
-            $fixtureLoader->dropDatabase();
-        }
-    }
 }
diff --git a/test/integration/Extension/IntegrationTestStoppedListener.php b/test/integration/Extension/IntegrationTestStoppedListener.php
new file mode 100644
index 000000000..04f2ab276
--- /dev/null
+++ b/test/integration/Extension/IntegrationTestStoppedListener.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace LaminasIntegrationTest\Db\Extension;
+
+use LaminasIntegrationTest\Db\Platform\FixtureLoader;
+use PHPUnit\Event\TestSuite\Finished;
+use PHPUnit\Event\TestSuite\FinishedSubscriber;
+
+use function printf;
+
+final class IntegrationTestStoppedListener implements FinishedSubscriber
+{
+    /** @var FixtureLoader[] */
+    private $fixtureLoaders = [];
+
+    public function notify(Finished $event): void
+    {
+        if (
+            $event->testSuite()->name() !== 'integration test'
+            || empty($this->fixtureLoaders)
+        ) {
+            return;
+        }
+
+        printf("\nIntegration test ended.\n");
+
+        foreach ($this->fixtureLoaders as $fixtureLoader) {
+            $fixtureLoader->dropDatabase();
+        }
+    }
+}
diff --git a/test/integration/Extension/ListenerExtension.php b/test/integration/Extension/ListenerExtension.php
new file mode 100644
index 000000000..d70037460
--- /dev/null
+++ b/test/integration/Extension/ListenerExtension.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace LaminasIntegrationTest\Db\Extension;
+
+use PHPUnit\Runner\Extension\Extension;
+use PHPUnit\Runner\Extension\Facade;
+use PHPUnit\Runner\Extension\ParameterCollection;
+use PHPUnit\TextUI\Configuration\Configuration;
+
+final class ListenerExtension implements Extension
+{
+    public function bootstrap(
+        Configuration $configuration,
+        Facade $facade,
+        ParameterCollection $parameters
+    ): void {
+        $facade->registerSubscribers(
+            new IntegrationTestStartedListener(),
+            new IntegrationTestStoppedListener(),
+        );
+    }
+}