From 626732250b3da17cd000b745ad052e7fb403a55e Mon Sep 17 00:00:00 2001
From: Matthew Setter <matthew@matthewsetter.com>
Date: Fri, 21 Mar 2025 20:51:11 +1000
Subject: [PATCH 1/2] 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.
---
 phpunit.xml.dist                              | 12 ++---
 .../IntegrationTestStartedListener.php        | 48 +++++++++++++++++++
 .../IntegrationTestStoppedListener.php        | 31 ++++++++++++
 .../Extension/ListenerExtension.php           | 22 +++++++++
 4 files changed, 105 insertions(+), 8 deletions(-)
 create mode 100644 test/integration/Extension/IntegrationTestStartedListener.php
 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/Extension/IntegrationTestStartedListener.php b/test/integration/Extension/IntegrationTestStartedListener.php
new file mode 100644
index 000000000..8e775e8d2
--- /dev/null
+++ b/test/integration/Extension/IntegrationTestStartedListener.php
@@ -0,0 +1,48 @@
+<?php
+
+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\Event\TestSuite\Started;
+use PHPUnit\Event\TestSuite\StartedSubscriber;
+
+use function getenv;
+use function printf;
+
+final class IntegrationTestStartedListener implements StartedSubscriber
+{
+    /** @var FixtureLoader[] */
+    private $fixtureLoaders = [];
+
+    public function notify(Started $event): void
+    {
+        if ($event->testSuite()->name() !== 'integration test') {
+            return;
+        }
+
+        if (getenv('TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL')) {
+            $this->fixtureLoaders[] = new MysqlFixtureLoader();
+        }
+
+        if (getenv('TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL')) {
+            $this->fixtureLoaders[] = new PgsqlFixtureLoader();
+        }
+
+        if (getenv('TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLSRV')) {
+            $this->fixtureLoaders[] = new SqlServerFixtureLoader();
+        }
+
+        if (empty($this->fixtureLoaders)) {
+            return;
+        }
+
+        printf("\nIntegration test started.\n");
+
+        foreach ($this->fixtureLoaders as $fixtureLoader) {
+            $fixtureLoader->createDatabase();
+        }
+    }
+}
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(),
+        );
+    }
+}

From 0121e2e89540e5581fbbdeef0bd793f59668fc5d Mon Sep 17 00:00:00 2001
From: Matthew Setter <matthew@matthewsetter.com>
Date: Fri, 21 Mar 2025 20:58:25 +1000
Subject: [PATCH 2/2] Clean up code with PHP CS_Fixer

A series of small fixes thanks to the wonderful PHP CS_Fixer

Signed-off-by: Matthew Setter <matthew@matthewsetter.com>
---
 src/Adapter/AdapterAbstractServiceFactory.php              | 1 -
 src/Adapter/AdapterServiceFactory.php                      | 1 -
 src/Adapter/Driver/AbstractConnection.php                  | 1 -
 src/Adapter/Driver/Mysqli/Mysqli.php                       | 1 -
 src/Adapter/Driver/Oci8/Oci8.php                           | 1 -
 src/Adapter/Driver/Oci8/Statement.php                      | 4 ++--
 src/Adapter/Driver/Pdo/Connection.php                      | 4 ++--
 src/Adapter/Driver/Sqlsrv/Statement.php                    | 7 -------
 src/Adapter/ParameterContainer.php                         | 3 ---
 src/Adapter/Platform/PlatformInterface.php                 | 1 -
 src/Metadata/Object/AbstractTableObject.php                | 2 --
 src/Metadata/Object/ColumnObject.php                       | 1 -
 src/RowGateway/AbstractRowGateway.php                      | 1 -
 src/RowGateway/Feature/FeatureSet.php                      | 4 ----
 src/Sql/Ddl/Column/Column.php                              | 1 -
 src/Sql/Ddl/Index/Index.php                                | 1 -
 src/Sql/Expression.php                                     | 1 -
 src/Sql/Insert.php                                         | 2 --
 src/Sql/Select.php                                         | 2 --
 src/TableGateway/Feature/FeatureSet.php                    | 1 -
 test/integration/Adapter/Driver/Pdo/Mysql/QueryTest.php    | 1 -
 .../Adapter/Driver/Pdo/Mysql/TableGatewayTest.php          | 1 +
 test/unit/Metadata/Source/OracleMetadataTest.php           | 1 -
 23 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/src/Adapter/AdapterAbstractServiceFactory.php b/src/Adapter/AdapterAbstractServiceFactory.php
index 920613359..6b238f162 100644
--- a/src/Adapter/AdapterAbstractServiceFactory.php
+++ b/src/Adapter/AdapterAbstractServiceFactory.php
@@ -52,7 +52,6 @@ public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator
      * Create a DB adapter
      *
      * @param  string $requestedName
-     * @param  array $options
      * @return Adapter
      */
     public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
diff --git a/src/Adapter/AdapterServiceFactory.php b/src/Adapter/AdapterServiceFactory.php
index e57575ed3..470c23725 100644
--- a/src/Adapter/AdapterServiceFactory.php
+++ b/src/Adapter/AdapterServiceFactory.php
@@ -12,7 +12,6 @@ class AdapterServiceFactory implements FactoryInterface
      * Create db adapter service
      *
      * @param string $requestedName
-     * @param array $options
      * @return Adapter
      */
     public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
diff --git a/src/Adapter/Driver/AbstractConnection.php b/src/Adapter/Driver/AbstractConnection.php
index 0911758cf..bd5c0e393 100644
--- a/src/Adapter/Driver/AbstractConnection.php
+++ b/src/Adapter/Driver/AbstractConnection.php
@@ -94,7 +94,6 @@ public function inTransaction()
     }
 
     /**
-     * @param  array $connectionParameters
      * @return $this Provides a fluent interface
      */
     public function setConnectionParameters(array $connectionParameters)
diff --git a/src/Adapter/Driver/Mysqli/Mysqli.php b/src/Adapter/Driver/Mysqli/Mysqli.php
index 7cddb5db8..3221306ae 100644
--- a/src/Adapter/Driver/Mysqli/Mysqli.php
+++ b/src/Adapter/Driver/Mysqli/Mysqli.php
@@ -35,7 +35,6 @@ class Mysqli implements DriverInterface, Profiler\ProfilerAwareInterface
      * Constructor
      *
      * @param array|Connection|\mysqli $connection
-     * @param array $options
      */
     public function __construct(
         $connection,
diff --git a/src/Adapter/Driver/Oci8/Oci8.php b/src/Adapter/Driver/Oci8/Oci8.php
index cf2d10fd4..b36693093 100644
--- a/src/Adapter/Driver/Oci8/Oci8.php
+++ b/src/Adapter/Driver/Oci8/Oci8.php
@@ -39,7 +39,6 @@ class Oci8 implements DriverInterface, Profiler\ProfilerAwareInterface
 
     /**
      * @param array|Connection|\oci8 $connection
-     * @param array $options
      * @param string $features
      */
     public function __construct(
diff --git a/src/Adapter/Driver/Oci8/Statement.php b/src/Adapter/Driver/Oci8/Statement.php
index 288ab6a22..6427d3ed3 100644
--- a/src/Adapter/Driver/Oci8/Statement.php
+++ b/src/Adapter/Driver/Oci8/Statement.php
@@ -314,8 +314,8 @@ protected function bindParametersFromContainer()
      */
     public function __clone()
     {
-        $this->isPrepared      = false;
-        $this->resource        = null;
+        $this->isPrepared = false;
+        $this->resource   = null;
         if ($this->parameterContainer) {
             $this->parameterContainer = clone $this->parameterContainer;
         }
diff --git a/src/Adapter/Driver/Pdo/Connection.php b/src/Adapter/Driver/Pdo/Connection.php
index bcf5c5b5e..26e1baa83 100644
--- a/src/Adapter/Driver/Pdo/Connection.php
+++ b/src/Adapter/Driver/Pdo/Connection.php
@@ -4,7 +4,7 @@
 
 use Laminas\Db\Adapter\Driver\AbstractConnection;
 use Laminas\Db\Adapter\Exception;
-use Laminas\Db\Adapter\Exception\RunTimeException;
+use Laminas\Db\Adapter\Exception\RuntimeException;
 use PDOException;
 use PDOStatement;
 
@@ -84,7 +84,7 @@ public function setConnectionParameters(array $connectionParameters)
     /**
      * Get the dsn string for this connection
      *
-     * @throws RunTimeException
+     * @throws RuntimeException
      * @return string
      */
     public function getDsn()
diff --git a/src/Adapter/Driver/Sqlsrv/Statement.php b/src/Adapter/Driver/Sqlsrv/Statement.php
index 6511cd09a..a98d2edb8 100644
--- a/src/Adapter/Driver/Sqlsrv/Statement.php
+++ b/src/Adapter/Driver/Sqlsrv/Statement.php
@@ -169,7 +169,6 @@ public function getSql()
 
     /**
      * @param string $sql
-     * @param array $options
      * @return $this Provides a fluent interface
      * @throws Exception\RuntimeException
      */
@@ -270,17 +269,11 @@ protected function bindParametersFromContainer()
         }
     }
 
-    /**
-     * @param array $prepareParams
-     */
     public function setPrepareParams(array $prepareParams)
     {
         $this->prepareParams = $prepareParams;
     }
 
-    /**
-     * @param array $prepareOptions
-     */
     public function setPrepareOptions(array $prepareOptions)
     {
         $this->prepareOptions = $prepareOptions;
diff --git a/src/Adapter/ParameterContainer.php b/src/Adapter/ParameterContainer.php
index 3a8e3e06f..479f3b77c 100644
--- a/src/Adapter/ParameterContainer.php
+++ b/src/Adapter/ParameterContainer.php
@@ -61,8 +61,6 @@ class ParameterContainer implements Iterator, ArrayAccess, Countable
 
     /**
      * Constructor
-     *
-     * @param array $data
      */
     public function __construct(array $data = [])
     {
@@ -194,7 +192,6 @@ public function offsetUnset($name)
     /**
      * Set from array
      *
-     * @param  array $data
      * @return $this Provides a fluent interface
      */
     public function setFromArray(array $data)
diff --git a/src/Adapter/Platform/PlatformInterface.php b/src/Adapter/Platform/PlatformInterface.php
index d06f69f17..fdc193b28 100644
--- a/src/Adapter/Platform/PlatformInterface.php
+++ b/src/Adapter/Platform/PlatformInterface.php
@@ -80,7 +80,6 @@ public function getIdentifierSeparator();
      * Quote identifier in fragment
      *
      * @param  string $identifier
-     * @param  array $additionalSafeWords
      * @return string
      */
     public function quoteIdentifierInFragment($identifier, array $additionalSafeWords = []);
diff --git a/src/Metadata/Object/AbstractTableObject.php b/src/Metadata/Object/AbstractTableObject.php
index 5c7e01409..59c69265e 100644
--- a/src/Metadata/Object/AbstractTableObject.php
+++ b/src/Metadata/Object/AbstractTableObject.php
@@ -35,8 +35,6 @@ public function __construct($name)
 
     /**
      * Set columns
-     *
-     * @param array $columns
      */
     public function setColumns(array $columns)
     {
diff --git a/src/Metadata/Object/ColumnObject.php b/src/Metadata/Object/ColumnObject.php
index 8632e83e5..058f03e87 100644
--- a/src/Metadata/Object/ColumnObject.php
+++ b/src/Metadata/Object/ColumnObject.php
@@ -308,7 +308,6 @@ public function getErratas()
     }
 
     /**
-     * @param array $erratas
      * @return $this Provides a fluent interface
      */
     public function setErratas(array $erratas)
diff --git a/src/RowGateway/AbstractRowGateway.php b/src/RowGateway/AbstractRowGateway.php
index 32cec8826..cffea4ab5 100644
--- a/src/RowGateway/AbstractRowGateway.php
+++ b/src/RowGateway/AbstractRowGateway.php
@@ -74,7 +74,6 @@ public function initialize()
     /**
      * Populate Data
      *
-     * @param  array $rowData
      * @param  bool  $rowExistsInDatabase
      * @return $this Provides a fluent interface
      */
diff --git a/src/RowGateway/Feature/FeatureSet.php b/src/RowGateway/Feature/FeatureSet.php
index bd3eebe25..67ff7d58a 100644
--- a/src/RowGateway/Feature/FeatureSet.php
+++ b/src/RowGateway/Feature/FeatureSet.php
@@ -20,9 +20,6 @@ class FeatureSet
     /** @var array */
     protected $magicSpecifications = [];
 
-    /**
-     * @param array $features
-     */
     public function __construct(array $features = [])
     {
         if ($features) {
@@ -59,7 +56,6 @@ public function getFeatureByClassName($featureClassName)
     }
 
     /**
-     * @param array $features
      * @return $this Provides a fluent interface
      */
     public function addFeatures(array $features)
diff --git a/src/Sql/Ddl/Column/Column.php b/src/Sql/Ddl/Column/Column.php
index ed77bd9de..fbfb595e4 100644
--- a/src/Sql/Ddl/Column/Column.php
+++ b/src/Sql/Ddl/Column/Column.php
@@ -98,7 +98,6 @@ public function getDefault()
     }
 
     /**
-     * @param  array $options
      * @return $this Provides a fluent interface
      */
     public function setOptions(array $options)
diff --git a/src/Sql/Ddl/Index/Index.php b/src/Sql/Ddl/Index/Index.php
index ce99a3a2b..1f00663b9 100644
--- a/src/Sql/Ddl/Index/Index.php
+++ b/src/Sql/Ddl/Index/Index.php
@@ -18,7 +18,6 @@ class Index extends AbstractIndex
     /**
      * @param  string|array|null $columns
      * @param  null|string $name
-     * @param array $lengths
      */
     public function __construct($columns, $name = null, array $lengths = [])
     {
diff --git a/src/Sql/Expression.php b/src/Sql/Expression.php
index 9a167366a..b76dcacdd 100644
--- a/src/Sql/Expression.php
+++ b/src/Sql/Expression.php
@@ -70,7 +70,6 @@ public function getParameters(): float|array|int|string|bool
     }
 
     /**
-     * @return array
      * @throws Exception\RuntimeException
      */
     public function getExpressionData(): array
diff --git a/src/Sql/Insert.php b/src/Sql/Insert.php
index b565ebfcb..fe134f37c 100644
--- a/src/Sql/Insert.php
+++ b/src/Sql/Insert.php
@@ -75,7 +75,6 @@ public function into($table)
     /**
      * Specify columns
      *
-     * @param  array $columns
      * @return $this Provides a fluent interface
      */
     public function columns(array $columns)
@@ -134,7 +133,6 @@ public function values($values, $flag = self::VALUES_SET)
      *
      * @link http://stackoverflow.com/questions/173400/how-to-check-if-php-array-is-associative-or-sequential
      *
-     * @param array $array
      * @return bool
      */
     private function isAssocativeArray(array $array)
diff --git a/src/Sql/Select.php b/src/Sql/Select.php
index 828652103..41905702f 100644
--- a/src/Sql/Select.php
+++ b/src/Sql/Select.php
@@ -120,7 +120,6 @@ class Select extends AbstractPreparableSql
     /** @var null|string|Expression */
     protected $quantifier;
 
-    /** @var array */
     protected array $columns = [self::SQL_STAR];
 
     /** @var Join[] */
@@ -226,7 +225,6 @@ public function quantifier($quantifier)
      *     key string will be use as alias,
      *     value can be string or Expression objects
      *
-     * @param  array $columns
      * @param  bool  $prefixColumnsWithTable
      * @return $this Provides a fluent interface
      */
diff --git a/src/TableGateway/Feature/FeatureSet.php b/src/TableGateway/Feature/FeatureSet.php
index 27fdcf323..557e96595 100644
--- a/src/TableGateway/Feature/FeatureSet.php
+++ b/src/TableGateway/Feature/FeatureSet.php
@@ -57,7 +57,6 @@ public function getFeatureByClassName($featureClassName)
     }
 
     /**
-     * @param array $features
      * @return $this Provides a fluent interface
      */
     public function addFeatures(array $features)
diff --git a/test/integration/Adapter/Driver/Pdo/Mysql/QueryTest.php b/test/integration/Adapter/Driver/Pdo/Mysql/QueryTest.php
index 98f24691f..a1f0d47fd 100644
--- a/test/integration/Adapter/Driver/Pdo/Mysql/QueryTest.php
+++ b/test/integration/Adapter/Driver/Pdo/Mysql/QueryTest.php
@@ -2,7 +2,6 @@
 
 namespace LaminasIntegrationTest\Db\Adapter\Driver\Pdo\Mysql;
 
-use Laminas\Db\Adapter\Adapter;
 use Laminas\Db\Adapter\Driver\Pdo\Result as PdoResult;
 use Laminas\Db\Adapter\Exception\RuntimeException;
 use Laminas\Db\ResultSet\ResultSet;
diff --git a/test/integration/Adapter/Driver/Pdo/Mysql/TableGatewayTest.php b/test/integration/Adapter/Driver/Pdo/Mysql/TableGatewayTest.php
index 795e78152..c761cc6e1 100644
--- a/test/integration/Adapter/Driver/Pdo/Mysql/TableGatewayTest.php
+++ b/test/integration/Adapter/Driver/Pdo/Mysql/TableGatewayTest.php
@@ -65,6 +65,7 @@ public function testInsert()
     /**
      * @see https://github.com/zendframework/zend-db/issues/35
      * @see https://github.com/zendframework/zend-db/pull/178
+     *
      * @return mixed
      */
     public function testInsertWithExtendedCharsetFieldName()
diff --git a/test/unit/Metadata/Source/OracleMetadataTest.php b/test/unit/Metadata/Source/OracleMetadataTest.php
index 6f1488b1e..138a935ec 100644
--- a/test/unit/Metadata/Source/OracleMetadataTest.php
+++ b/test/unit/Metadata/Source/OracleMetadataTest.php
@@ -40,7 +40,6 @@ protected function setUp(): void
 
     /**
      * @dataProvider constraintDataProvider
-     * @param array $constraintData
      */
     public function testGetConstraints(array $constraintData)
     {