Unit test are running. With following results:

Tests: 83, Assertions: 173, Notices: 1, Skipped: 4, Incomplete: 13, Risky: 4.
Signed-off-by: Joey Smith <jsmith@webinertia.net>

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

Author: tyrsson

composer.lock

@@ -7,6 +7,7 @@
 use Laminas\Db\Adapter\Driver\DriverInterface;
 use Laminas\Db\Adapter\Exception;
 use Laminas\Db\Adapter\Profiler;
+use Laminas\Db\Adapter\Mysql\DatabasePlatformNameTrait;
 use mysqli_stmt;
 
 use function array_intersect_key;
@@ -16,6 +17,8 @@
 
 class Mysqli implements DriverInterface, Profiler\ProfilerAwareInterface
 {
+    use DatabasePlatformNameTrait;
+
     /** @var Connection */
     protected $connection;
 
@@ -125,21 +128,6 @@ public function getResultPrototype()
         return $this->resultPrototype;
     }
 
-    /**
-     * Get database platform name
-     *
-     * @param  string $nameFormat
-     * @return string
-     */
-    public function getDatabasePlatformName($nameFormat = self::NAME_FORMAT_CAMELCASE)
-    {
-        if ($nameFormat === self::NAME_FORMAT_CAMELCASE) {
-            return 'Mysql';
-        }
-
-        return 'MySQL';
-    }
-
     /**
      * Check environment
      *

src/Driver/Mysqli/Mysqli.php

@@ -116,38 +116,23 @@ public function connect(): static
 
         if (! isset($dsn) && isset($pdoDriver)) {
             $dsn = [];
-            switch ($pdoDriver) {
-                case 'sqlite':
-                    $dsn[] = $database;
-                    break;
-                case 'sqlsrv':
-                    if (isset($database)) {
-                        $dsn[] = "database={$database}";
-                    }
-                    if (isset($hostname)) {
-                        $dsn[] = "server={$hostname}";
-                    }
-                    break;
-                default:
-                    if (isset($database)) {
-                        $dsn[] = "dbname={$database}";
-                    }
-                    if (isset($hostname)) {
-                        $dsn[] = "host={$hostname}";
-                    }
-                    if (isset($port)) {
-                        $dsn[] = "port={$port}";
-                    }
-                    if (isset($charset) && $pdoDriver !== 'pgsql') {
-                        $dsn[] = "charset={$charset}";
-                    }
-                    if (isset($unixSocket)) {
-                        $dsn[] = "unix_socket={$unixSocket}";
-                    }
-                    if (isset($version)) {
-                        $dsn[] = "version={$version}";
-                    }
-                    break;
+            if (isset($database)) {
+                $dsn[] = "dbname={$database}";
+            }
+            if (isset($hostname)) {
+                $dsn[] = "host={$hostname}";
+            }
+            if (isset($port)) {
+                $dsn[] = "port={$port}";
+            }
+            if (isset($charset) && $pdoDriver !== 'pgsql') {
+                $dsn[] = "charset={$charset}";
+            }
+            if (isset($unixSocket)) {
+                $dsn[] = "unix_socket={$unixSocket}";
+            }
+            if (isset($version)) {
+                $dsn[] = "version={$version}";
             }
             $dsn = $pdoDriver . ':' . implode(';', $dsn);
         } elseif (! isset($dsn)) {

src/Driver/Pdo/Connection.php

@@ -64,6 +64,7 @@ public function testGetConnectionParameters(): void
     public function testNonSecureConnection(): void
     {
         $mysqli     = $this->createMockMysqli(0);
+        /** @var Connection */
         $connection = $this->createMockConnection(
             $mysqli,
             [
@@ -81,6 +82,7 @@ public function testNonSecureConnection(): void
     public function testSslConnection(): void
     {
         $mysqli     = $this->createMockMysqli(MYSQLI_CLIENT_SSL);
+        /** @var Connection */
         $connection = $this->createMockConnection(
             $mysqli,
             [
@@ -99,6 +101,7 @@ public function testSslConnection(): void
     public function testSslConnectionNoVerify(): void
     {
         $mysqli     = $this->createMockMysqli(MYSQLI_CLIENT_SSL | MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT);
+        /** @var Connection */
         $connection = $this->createMockConnection(
             $mysqli,
             [

test/unit/Adapter/Driver/Pdo/TestAsset/SqliteMemoryPdo.php

@@ -29,16 +29,22 @@
 final class ConnectionIntegrationTest extends TestCase
 {
     /** @var array<string, string> */
-    protected array $variables = ['pdodriver' => 'sqlite', 'database' => ':memory:'];
+    protected array $variables = ['driver' => 'pdo_mysql', 'database' => 'laminas_test'];
 
     public function testGetCurrentSchema(): void
     {
+        $this->markTestIncomplete(
+            'Already covered by integration group'
+        );
         $connection = new Connection($this->variables);
         self::assertIsString($connection->getCurrentSchema());
     }
 
     public function testSetResource(): void
     {
+        $this->markTestIncomplete(
+            'Needs refactored since no Sqlite testing should occur here'
+        );
         $resource   = new TestAsset\SqliteMemoryPdo();
         $connection = new Connection([]);
         self::assertSame($connection, $connection->setResource($resource));
@@ -50,6 +56,9 @@ public function testSetResource(): void
 
     public function testGetResource(): void
     {
+        $this->markTestIncomplete(
+            'Possibly covered by integration group'
+        );
         $connection = new Connection($this->variables);
         $connection->connect();
         self::assertInstanceOf('PDO', $connection->getResource());
@@ -60,6 +69,9 @@ public function testGetResource(): void
 
     public function testConnect(): void
     {
+        $this->markTestIncomplete(
+            'Already covered by integration group'
+        );
         $connection = new Connection($this->variables);
         self::assertSame($connection, $connection->connect());
         self::assertTrue($connection->isConnected());
@@ -70,6 +82,9 @@ public function testConnect(): void
 
     public function testIsConnected(): void
     {
+        $this->markTestIncomplete(
+            'Already covered by integration group'
+        );
         $connection = new Connection($this->variables);
         self::assertFalse($connection->isConnected());
         self::assertSame($connection, $connection->connect());
@@ -81,6 +96,9 @@ public function testIsConnected(): void
 
     public function testDisconnect(): void
     {
+        $this->markTestIncomplete(
+            'Already covered by integration group'
+        );
         $connection = new Connection($this->variables);
         $connection->connect();
         self::assertTrue($connection->isConnected());
@@ -123,6 +141,9 @@ public function testRollback(): never
 
     public function testExecute(): void
     {
+        $this->markTestIncomplete(
+            'Needs refactored or removed since sqlsrv testing should not occur here'
+        );
         $sqlsrv     = new Pdo($this->variables);
         $connection = $sqlsrv->getConnection();
 
@@ -132,6 +153,9 @@ public function testExecute(): void
 
     public function testPrepare(): void
     {
+        $this->markTestIncomplete(
+            'Needs refactored or removed since we do not have a valid connection in Unit test'
+        );
         $sqlsrv     = new Pdo($this->variables);
         $connection = $sqlsrv->getConnection();
 
@@ -149,6 +173,9 @@ public function testGetLastGeneratedValue(): never
     #[Group('laminas3469')]
     public function testConnectReturnsConnectionWhenResourceSet(): void
     {
+        $this->markTestIncomplete(
+            'Needs refactored or removed since we do not have a valid connection in Unit test'
+        );
         $resource   = new TestAsset\SqliteMemoryPdo();
         $connection = new Connection([]);
         $connection->setResource($resource);

…Adapter/Driver/Mysqli/ConnectionTest.php …st/unit/Driver/Mysqli/ConnectionTest.phptest/unit/Adapter/Driver/Mysqli/ConnectionTest.php renamed to test/unit/Driver/Mysqli/ConnectionTest.php test/unit/Adapter/Driver/Mysqli/ConnectionTest.php renamed to test/unit/Driver/Mysqli/ConnectionTest.php

@@ -7,7 +7,7 @@
 use Laminas\Db\Adapter\Driver\AbstractConnection;
 use Laminas\Db\Adapter\Exception\RuntimeException;
 use Laminas\Db\Adapter\Mysql\Driver\Pdo\Connection;
-use LaminasTest\Db\TestAsset\ConnectionWrapper;
+use LaminasTest\Db\Adapter\Mysql\TestAsset\ConnectionWrapper;
 use Override;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\CoversMethod;
@@ -24,8 +24,7 @@
 #[CoversMethod(Connection::class, 'rollback()')]
 final class ConnectionTransactionsTest extends TestCase
 {
-    /** @var Wrapper */
-    protected Wrapper|ConnectionWrapper $wrapper;
+    protected ConnectionWrapper $wrapper;
 
     /**
      * {@inheritDoc}