Fixes Unit and Integration test

Integration test still needs to move to mocked usage
Unit test still includes several skipped and incomplete test
Signed-off-by: Joey Smith <jsmith@webinertia.net>

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

Author: tyrsson

src/Platform/Mysql.php

@@ -88,6 +88,7 @@ protected function quoteViaDriver(string $value): ?string
         if ($resource instanceof \mysqli) {
             return '\'' . $resource->real_escape_string($value) . '\'';
         }
+
         if ($resource instanceof \PDO) {
             return $resource->quote($value);
         }

test/unit/Driver/Pdo/ConnectionTest.php

@@ -6,6 +6,7 @@
 
 use Exception;
 use Laminas\Db\Adapter\Exception\InvalidConnectionParametersException;
+use Laminas\Db\Adapter\Exception\RuntimeException;
 use Laminas\Db\Adapter\Mysql\Driver\Pdo\Connection;
 use Override;
 use PHPUnit\Framework\Attributes\CoversMethod;
@@ -33,7 +34,7 @@ protected function setUp(): void
      */
     public function testResource(): void
     {
-        $this->expectException(InvalidConnectionParametersException::class);
+        $this->expectException(RuntimeException::class);
         $this->connection->getResource();
     }
 
@@ -92,26 +93,4 @@ public function testHostnameAndUnixSocketThrowsInvalidConnectionParametersExcept
         ]);
         $this->connection->connect();
     }
-
-    public function testDblibArrayOfConnectionParametersCreatesCorrectDsn(): void
-    {
-        $this->connection->setConnectionParameters([
-            'driver'  => 'pdo_dblib',
-            'charset' => 'UTF-8',
-            'dbname'  => 'foo',
-            'port'    => '1433',
-            'version' => '7.3',
-        ]);
-        try {
-            $this->connection->connect();
-        } catch (Exception) {
-        }
-        $responseString = $this->connection->getDsn();
-
-        $this->assertStringStartsWith('dblib:', $responseString);
-        $this->assertStringContainsString('charset=UTF-8', $responseString);
-        $this->assertStringContainsString('dbname=foo', $responseString);
-        $this->assertStringContainsString('port=1433', $responseString);
-        $this->assertStringContainsString('version=7.3', $responseString);
-    }
 }

test/unit/Driver/Pdo/PdoTest.php

@@ -6,18 +6,19 @@
 
 use Laminas\Db\Adapter\Driver\DriverInterface;
 use Laminas\Db\Adapter\Driver\Pdo\Result;
-use Laminas\Db\Adapter\Mysql\Driver\Pdo\Pdo;
+use Laminas\Db\Adapter\Driver\Pdo\Statement;
+use Laminas\Db\Adapter\Mysql\Driver\Pdo;
 use Laminas\Db\Exception\RuntimeException;
 use Override;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
-#[CoversMethod(Pdo::class, 'getDatabasePlatformName')]
-#[CoversMethod(Pdo::class, 'getResultPrototype')]
+#[CoversMethod(Pdo\Pdo::class, 'getDatabasePlatformName')]
+#[CoversMethod(Pdo\Pdo::class, 'getResultPrototype')]
 final class PdoTest extends TestCase
 {
-    protected Pdo $pdo;
+    protected Pdo\Pdo $pdo;
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -26,13 +27,20 @@ final class PdoTest extends TestCase
     #[Override]
     protected function setUp(): void
     {
-        $this->pdo = new Pdo([]);
+        $connection = $this->createMock(Pdo\Connection::class);
+        $statement  = $this->createMock(Statement::class);
+        $result     = $this->createMock(Result::class);
+        $this->pdo = new Pdo\Pdo(
+            $connection,
+            $statement,
+            $result
+        );
     }
 
     public function testGetDatabasePlatformName(): void
     {
         // Test platform name for SqlServer
-        $this->pdo->getConnection()->setConnectionParameters(['pdodriver' => 'pdo_mysql']);
+        //$this->pdo->getConnection()->setConnectionParameters(['driver' => 'pdo_mysql']);
         self::assertEquals('Mysql', $this->pdo->getDatabasePlatformName());
         self::assertEquals('MySQL', $this->pdo->getDatabasePlatformName(DriverInterface::NAME_FORMAT_NATURAL));
     }

test/unit/Driver/Pdo/StatementIntegrationTest.php

@@ -10,9 +10,11 @@
 use Override;
 use PDO;
 use PDOStatement;
+use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+#[CoversMethod(Statement::class, 'execute')]
 final class StatementIntegrationTest extends TestCase
 {
     protected Statement $statement;

test/unit/Driver/Pdo/StatementTest.php

@@ -24,6 +24,7 @@
 #[CoversMethod(Statement::class, 'execute')]
 final class StatementTest extends TestCase
 {
+    protected ?Pdo $pdo = null;
     protected Statement $statement;
 
     /**
@@ -34,6 +35,11 @@ final class StatementTest extends TestCase
     protected function setUp(): void
     {
         $this->statement = new Statement();
+        $this->pdo       = new Pdo(
+            $this->createMock(Connection::class),
+            $this->statement,
+            $this->createMock(Result::class),
+        );
     }
 
     /**
@@ -46,7 +52,7 @@ protected function tearDown(): void
 
     public function testSetDriver(): void
     {
-        self::assertEquals($this->statement, $this->statement->setDriver(new Pdo([])));
+        self::assertEquals($this->statement, $this->statement->setDriver($this->pdo));
     }
 
     public function testSetParameterContainer(): void

test/unit/Platform/MysqlTest.php

@@ -4,6 +4,9 @@
 
 namespace LaminasTest\Db\Adapter\Mysql\Platform;
 
+use Laminas\Db\Adapter\Driver\Pdo\Result;
+use Laminas\Db\Adapter\Driver\Pdo\Statement;
+use Laminas\Db\Adapter\Mysql\Driver\Pdo;
 use Laminas\Db\Adapter\Mysql\Platform\Mysql;
 use Override;
 use PHPUnit\Framework\Attributes\CoversMethod;
@@ -30,7 +33,12 @@ final class MysqlTest extends TestCase
     #[Override]
     protected function setUp(): void
     {
-        $this->platform = new Mysql();
+        $pdo = new Pdo\Pdo(
+            $this->createMock(Pdo\Connection::class),
+            $this->createMock(Statement::class),
+            $this->createMock(Result::class),
+        );
+        $this->platform = new Mysql($pdo);
     }
 
     public function testGetName(): void
@@ -73,6 +81,10 @@ public function testQuoteValueRaisesNoticeWithoutPlatformSupport(): void
     {
         /**
          * @todo Determine if vulnerability warning is required during unit testing
+         *
+         * @todo This testing needs expanded to cover all possible driver types
+         * since using \PDO currently causes a TypeError to be raised due to the
+         * underlying quoteViaDriver method returning false instead of ?string
          */
         //$this->expectNotice();
         //$this->expectExceptionMessage(