Latest revisions to unit test

Fixes ALL phpunit deprecations
fixes all test except for one in Pdo\QueryTest
Signed-off-by: Joey Smith <jsmith@webinertia.net>

Signed-off-by: Joey Smith <jsmith@webinertia.net>

Author: tyrsson

test/integration/Driver/Mysqli/ConnectionTest.php

@@ -3,22 +3,25 @@
 namespace LaminasIntegrationTest\Db\Mysql\Driver\Mysqli;
 
 use Laminas\Db\Mysql\Driver\Mysqli\Connection;
+
+use PHPUnit\Framework\Attributes;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @group integration
- * @group integration-mysqli
- */
+#[Attributes\Group('integration')]
+#[Attributes\Group('integration-mysqli')]
+#[Attributes\CoversMethod(Connection::class, 'connect')]
+#[Attributes\CoversMethod(Connection::class, 'disconnect')]
 final class ConnectionTest extends TestCase
 {
     use TraitSetup;
 
-    public function testConnectionOk(): void
+    public function testConnection(): void
     {
         $connection = new Connection($this->variables);
         $connection->connect();
 
         self::assertTrue($connection->isConnected());
         $connection->disconnect();
+        self::assertFalse($connection->isConnected());
     }
 }

test/integration/Driver/Mysqli/TableGatewayTest.php

@@ -8,8 +8,13 @@
 use Laminas\Db\Mysql\Platform;
 use Laminas\Db\ResultSet\ResultSet;
 use Laminas\Db\TableGateway\TableGateway;
+use PHPUnit\Framework\Attributes;
 use PHPUnit\Framework\TestCase;
 
+#[Attributes\Group('integration')]
+#[Attributes\Group('integration-mysqli')]
+#[Attributes\CoversClass(TableGateway::class)]
+#[Attributes\CoversMethod(TableGateway::class, '__construct')]
 final class TableGatewayTest extends TestCase
 {
     use TraitSetup;

test/integration/Driver/Pdo/AbstractAdapterTestCase.php

@@ -4,21 +4,27 @@
 
 use Laminas\Db\Adapter\AdapterInterface;
 use Laminas\Db\Mysql\Adapter;
+use Laminas\Db\Mysql\Driver\Pdo\Connection;
+use PHPUnit\Framework\Attributes;
 use PHPUnit\Framework\TestCase;
 
 use function getmypid;
 use function shell_exec;
 
+#[Attributes\Group('integration')]
+#[Attributes\Group('integration-pdo')]
+#[Attributes\CoversClass(Adapter::class)]
+#[Attributes\CoversMethod(Adapter::class, '__construct')]
+#[Attributes\CoversClass(Connection::class)]
+#[Attributes\CoversMethod(Connection::class, 'connect')]
+#[Attributes\CoversMethod(Connection::class, 'disconnect')]
 abstract class AbstractAdapterTestCase extends TestCase
 {
     /** @var ?int */
     public const DB_SERVER_PORT = null;
 
     protected AdapterInterface&Adapter $adapter;
 
-    /**
-     * @covers \Laminas\Db\Adapter\Adapter::__construct()
-     */
     public function testConnection(): void
     {
         $this->assertInstanceOf(Adapter::class, $this->adapter);

test/integration/Driver/Pdo/AdapterTest.php

@@ -2,6 +2,11 @@
 
 namespace LaminasIntegrationTest\Db\Mysql\Driver\Pdo;
 
+use PHPUnit\Framework\Attributes;
+
+#[Attributes\Group('integration')]
+#[Attributes\Group('integration-pdo')]
+#[Attributes\CoversNothing()]
 final class AdapterTest extends AbstractAdapterTestCase
 {
     use AdapterTrait;

test/integration/Driver/Pdo/QueryTest.php

@@ -2,13 +2,19 @@
 
 namespace LaminasIntegrationTest\Db\Mysql\Driver\Pdo;
 
-use Laminas\Db\Mysql\Driver\Pdo\Result as PdoResult;
 use Laminas\Db\Adapter\Exception\RuntimeException;
+use Laminas\Db\Mysql\Adapter;
+use Laminas\Db\Mysql\Driver\Pdo\Result as PdoResult;
 use Laminas\Db\ResultSet\ResultSet;
 use Laminas\Db\Sql\Sql;
 use Laminas\Stdlib\ArrayObject;
+use PHPUnit\Framework\Attributes;
 use PHPUnit\Framework\TestCase;
 
+#[Attributes\Group('integration')]
+#[Attributes\Group('integration-pdo')]
+#[Attributes\CoversMethod(Adapter::class, 'query')]
+#[Attributes\CoversMethod(ResultSet::class, 'current')]
 final class QueryTest extends TestCase
 {
     use AdapterTrait;
@@ -36,11 +42,7 @@ public static function getQueriesWithRowResult(): array
         ];
     }
 
-    /**
-     * @dataProvider getQueriesWithRowResult
-     * @covers \Laminas\Db\Adapter\Adapter::query
-     * @covers \Laminas\Db\ResultSet\ResultSet::current
-     */
+    #[Attributes\DataProvider('getQueriesWithRowResult')]
     public function testQuery(string $query, array $params, array $expected): void
     {
         $result = $this->adapter->query($query, $params);

test/integration/Driver/Pdo/TableGatewayAndAdapterTest.php

@@ -5,6 +5,7 @@
 use Laminas\Db\ResultSet\ResultSet;
 use Laminas\Db\Sql\Select;
 use Laminas\Db\TableGateway\TableGateway;
+use PHPUnit\Framework\Attributes;
 use PHPUnit\Framework\TestCase;
 
 use function array_fill;
@@ -15,24 +16,30 @@
  * On tear down disconnected from the database and set the driver adapter on null
  * Running many tests ended up in consuming all mysql connections and not releasing them
  */
+#[Attributes\Group('integration')]
+#[Attributes\Group('integration-pdo')]
+#[Attributes\CoversClass(TableGateway::class)]
+#[Attributes\CoversMethod(TableGateway::class, '__construct')]
+#[Attributes\CoversMethod(TableGateway::class, 'getSql')]
+#[Attributes\CoversMethod(TableGateway::class, 'selectWith')]
 final class TableGatewayAndAdapterTest extends TestCase
 {
     use AdapterTrait;
 
-    /**
-     * @dataProvider connections
-     */
+    #[Attributes\DataProvider('connections')]
     public function testGetOutOfConnections(): void
     {
         $this->adapter->query('SELECT VERSION();');
-        $table  = new TableGateway(
+        $table = new TableGateway(
             'test',
             $this->adapter
         );
         /** @var Select */
         $select = $table->getSql()->select()->where(['name' => 'foo']);
+        self::assertInstanceOf(Select::class, $select);
         /** @var ResultSet */
         $result = $table->selectWith($select);
+        self::assertInstanceOf(ResultSet::class, $result);
         /** @psalm-suppress PossiblyNullArgument */
         self::assertCount(3, $result->current());
     }

test/integration/Driver/Pdo/TableGatewayTest.php

@@ -8,27 +8,29 @@
 use Laminas\Db\TableGateway\Feature\MetadataFeature;
 use Laminas\Db\TableGateway\TableGateway;
 use Laminas\Stdlib\ArrayObject;
+use PHPUnit\Framework\Attributes;
 use PHPUnit\Framework\TestCase;
 use Webmozart\Assert\Assert;
 
 use function count;
 
+#[Attributes\Group('integration')]
+#[Attributes\Group('integration-pdo')]
+#[Attributes\CoversClass(TableGateway::class)]
+#[Attributes\CoversMethod(TableGateway::class, '__construct')]
+#[Attributes\CoversMethod(TableGateway::class, 'select')]
+#[Attributes\CoversMethod(TableGateway::class, 'insert')]
+#[Attributes\CoversMethod(TableGateway::class, 'update')]
 final class TableGatewayTest extends TestCase
 {
     use AdapterTrait;
 
-    /**
-     * @covers \Laminas\Db\TableGateway\TableGateway::__construct
-     */
     public function testConstructor(): void
     {
         $tableGateway = new TableGateway('test', $this->adapter);
         $this->assertInstanceOf(TableGateway::class, $tableGateway);
     }
 
-    /**
-     * @covers \Laminas\Db\TableGateway\TableGateway::select
-     */
     public function testSelect(): void
     {
         $tableGateway = new TableGateway('test', $this->adapter);
@@ -44,10 +46,6 @@ public function testSelect(): void
         }
     }
 
-    /**
-     * @covers \Laminas\Db\TableGateway\TableGateway::insert
-     * @covers \Laminas\Db\TableGateway\TableGateway::select
-     */
     public function testInsert(): void
     {
         $tableGateway = new TableGateway('test', $this->adapter);
@@ -90,9 +88,9 @@ public function testInsertWithExtendedCharsetFieldName(): int
     }
 
     /**
-     * @depends testInsertWithExtendedCharsetFieldName
      * @param mixed $id
      */
+    #[Attributes\Depends('testInsertWithExtendedCharsetFieldName')]
     public function testUpdateWithExtendedCharsetFieldName($id): void
     {
         Assert::isInstanceOf($this->adapter, AdapterInterface::class);
@@ -116,9 +114,9 @@ public function testUpdateWithExtendedCharsetFieldName($id): void
     }
 
     /**
-     * @dataProvider tableProvider
      * @param string|TableIdentifier|array $table
      */
+    #[Attributes\DataProvider('tableProvider')]
     public function testTableGatewayWithMetadataFeature($table): void
     {
         Assert::isInstanceOf($this->adapter, AdapterInterface::class);
@@ -130,7 +128,6 @@ public function testTableGatewayWithMetadataFeature($table): void
 
     /**
      * @psalm-return array<array-key, array{0: string|TableIdentifier|array}>
-     *
      * */
     public static function tableProvider(): array
     {