- Added testing for Container factories for correct option parameters

src/Container/PdoConnectionInterfaceFactory.php

@@ -18,13 +18,14 @@ public function __invoke(
         string $requestedName,
         ?array $options = null
     ): PdoConnectionInterface&Connection {
-        if (! is_array($options['connection']) || $options['connection'] === []) {
+        $conn = $options['connection'] ?? [];
+        if (! is_array($conn) || $conn === []) {
             throw new InvalidConnectionParametersException(
                 'Connection configuration must be an array of parameters passed via $options["connection"]',
-                $options['connection']
+                $conn
             );
         }
 
-        return new Connection($options['connection']);
+        return new Connection($conn);
     }
 }

test/integration/Container/ConnectionInterfaceFactoryTest.php

@@ -4,7 +4,9 @@
 
 namespace PhpDbIntegrationTest\Mysql\Container;
 
+use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\ConnectionInterface;
+use PhpDb\Adapter\Exception\InvalidConnectionParametersException;
 use PhpDb\Mysql\Connection;
 use PhpDb\Mysql\Container\ConnectionInterfaceFactory;
 use PHPUnit\Framework\Attributes;
@@ -21,16 +23,25 @@
 
     public function testInvokeReturnsMysqliConnection(): void
     {
-        $this->getAdapter([
-            'db' => [
-                'driver' => 'Mysqli',
-            ],
-        ]);
-
         $factory    = new ConnectionInterfaceFactory();
-        $connection = $factory($this->container, Connection::class);
+        $connection = $factory(
+            $this->container,
+            Connection::class,
+            $this->config[AdapterInterface::class]
+        );
 
         self::assertInstanceOf(ConnectionInterface::class, $connection);
         self::assertInstanceOf(Connection::class, $connection);
     }
+
+    public function testInvokeThrowsExceptionWithoutConnectionConfig(): void
+    {
+        $this->expectException(InvalidConnectionParametersException::class);
+
+        $factory    = new ConnectionInterfaceFactory();
+        $factory(
+            $this->container,
+            Connection::class
+        );
+    }
 }

test/integration/Container/DriverInterfaceFactoryTest.php

@@ -1,10 +1,15 @@
 <?php
 
 declare(strict_types=1);
 
 namespace PhpDbIntegrationTest\Mysql\Container;
 
+use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\DriverInterface;
+use PhpDb\Adapter\Exception\InvalidConnectionParametersException;
+use PhpDb\Exception\ContainerException;
+use PhpDb\Mysql\Connection;
+use PhpDb\Mysql\Container\ConnectionInterfaceFactory;
 use PhpDb\Mysql\Container\DriverInterfaceFactory;
 use PhpDb\Mysql\Driver;
 use PHPUnit\Framework\Attributes;
@@ -21,14 +26,24 @@
 
     public function testFactoryReturnsMysqliDriver(): void
     {
-        $this->getAdapter([
-            'db' => [
-                'driver' => 'Mysqli',
-            ],
-        ]);
         $factory = new DriverInterfaceFactory();
-        $driver  = $factory($this->container);
+        $driver  = $factory(
+            $this->container,
+            DriverInterface::class,
+            $this->config[AdapterInterface::class]
+        );
         self::assertInstanceOf(DriverInterface::class, $driver);
         $this->assertInstanceOf(Driver::class, $driver);
     }
+
+    public function testInvokeThrowsExceptionWithoutConnectionConfig(): void
+    {
+        $this->expectException(ContainerException::class);
+
+        $factory    = new DriverInterfaceFactory();
+        $factory(
+            $this->container,
+            Connection::class
+        );
+    }
 }

test/integration/Container/MetadataInterfaceFactoryTest.php

@@ -1,3 +1,3 @@
 <?php
 
 declare(strict_types=1);
@@ -21,7 +21,7 @@
     public function testFactoryReturnsMysqlMetadata(): void
     {
         $factory  = new MetadataInterfaceFactory();
-        $metadata = $factory($this->container);
+        $metadata = $factory($this->container, MetadataInterface::class);
         self::assertInstanceOf(MetadataInterface::class, $metadata);
         self::assertInstanceOf(Source::class, $metadata);
     }

test/integration/Container/PdoConnectionInterfaceFactoryTest.php

@@ -1,11 +1,13 @@
 <?php
 
 declare(strict_types=1);
 
 namespace PhpDbIntegrationTest\Mysql\Container;
 
+use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\ConnectionInterface;
 use PhpDb\Adapter\Driver\PdoConnectionInterface;
+use PhpDb\Adapter\Exception\InvalidConnectionParametersException;
 use PhpDb\Mysql\Container\PdoConnectionInterfaceFactory;
 use PhpDb\Mysql\Pdo\Connection;
 use PHPUnit\Framework\Attributes\CoversClass;
@@ -24,9 +26,24 @@
     public function testInvokeReturnsPdoConnection(): void
     {
         $factory  = new PdoConnectionInterfaceFactory();
-        $instance = $factory($this->container);
+        $instance = $factory(
+            $this->container,
+            PdoConnectionInterface::class,
+            $this->config[AdapterInterface::class]
+        );
         self::assertInstanceOf(ConnectionInterface::class, $instance);
         self::assertInstanceOf(PdoConnectionInterface::class, $instance);
         self::assertInstanceOf(Connection::class, $instance);
     }
+
+    public function testInvokeThrowsExceptionWithoutConnectionConfig(): void
+    {
+        $this->expectException(InvalidConnectionParametersException::class);
+
+        $factory = new PdoConnectionInterfaceFactory();
+        $factory(
+            $this->container,
+            PdoConnectionInterface::class
+        );
+    }
 }

test/integration/Container/PdoDriverInterfaceFactoryTest.php

@@ -1,9 +1,11 @@
 <?php
 
 declare(strict_types=1);
 
 namespace PhpDbIntegrationTest\Mysql\Container;
 
+use PhpDb\Adapter\AdapterInterface;
+use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Driver\PdoDriverInterface;
 use PhpDb\Mysql\Container\PdoDriverInterfaceFactory;
 use PhpDb\Mysql\Pdo\Driver;
@@ -23,7 +25,11 @@
     public function testInvokeReturnsPdoDriver(): void
     {
         $factory  = new PdoDriverInterfaceFactory();
-        $instance = $factory($this->container);
+        $instance = $factory(
+            $this->container,
+            PdoDriverInterface::class,
+            $this->config[AdapterInterface::class]
+        );
 
         self::assertInstanceOf(PdoDriverInterface::class, $instance);
         self::assertInstanceOf(Driver::class, $instance);

test/integration/Container/PdoStatementFactoryTest.php

@@ -1,9 +1,10 @@
 <?php
 
 declare(strict_types=1);
 
 namespace PhpDbIntegrationTest\Mysql\Container;
 
+use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\Pdo\Statement;
 use PhpDb\Adapter\Driver\StatementInterface;
 use PhpDb\Mysql\Container\PdoStatementFactory;
@@ -23,7 +24,11 @@
     public function testInvokeReturnsPdoStatement(): void
     {
         $factory   = new PdoStatementFactory();
-        $statement = $factory($this->container);
+        $statement = $factory(
+            $this->container,
+            StatementInterface::class,
+            $this->config[AdapterInterface::class]
+        );
         self::assertInstanceOf(StatementInterface::class, $statement);
         self::assertInstanceOf(Statement::class, $statement);
     }

test/integration/Container/PlatformInterfaceFactoryTest.php

@@ -1,12 +1,16 @@
 <?php
 
 declare(strict_types=1);
 
 namespace PhpDbIntegrationTest\Mysql\Container;
 
+use PhpDb\Adapter\AdapterInterface;
+use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Mysql\AdapterPlatform;
+use PhpDb\Mysql\Container\DriverInterfaceFactory;
 use PhpDb\Mysql\Container\PlatformInterfaceFactory;
+use PhpDb\Mysql\Pdo\Driver as PdoDriver;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\Attributes\Group;
@@ -22,8 +26,17 @@
 
     public function testInvokeReturnsPlatformInterfaceWhenDbDriverIsPdo(): void
     {
+        $adapter = $this->getAdapter(['driver' => PdoDriver::class]);
+
+        $this->config[AdapterInterface::class]['driver'] = $adapter->getDriver();
+
         $factory  = new PlatformInterfaceFactory();
-        $instance = $factory($this->container);
+        $instance = $factory(
+            $this->container,
+            PlatformInterface::class,
+            $this->config[AdapterInterface::class]
+        );
+
         self::assertInstanceOf(PlatformInterface::class, $instance);
         self::assertInstanceOf(AdapterPlatform::class, $instance);
     }

test/integration/Container/StatementInterfaceFactoryTest.php

@@ -1,9 +1,10 @@
 <?php
 
 declare(strict_types=1);
 
 namespace PhpDbIntegrationTest\Mysql\Container;
 
+use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\StatementInterface;
 use PhpDb\Mysql\Container\StatementInterfaceFactory;
 use PhpDb\Mysql\Statement;
@@ -31,7 +32,11 @@
         ]);
 
         $factory   = new StatementInterfaceFactory();
-        $statement = $factory($this->container);
+        $statement = $factory(
+            $this->container,
+            StatementInterface::class,
+            $this->config[AdapterInterface::class]
+        );
 
         self::assertInstanceOf(StatementInterface::class, $statement);
         self::assertInstanceOf(Statement::class, $statement);

test/integration/Pdo/ConnectionTest.php

@@ -75,36 +75,112 @@ public function testConnectMethodReturnsConnectionInterface(): void
         $connection->disconnect();
     }
 
-    /**
-     * @todo   Implement testBeginTransaction().
-     */
-    public function testBeginTransaction(): never
+    public function testBeginTransaction(): void
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $connection = $this->getAdapter()->getDriver()->getConnection();
+        $connection->connect();
+
+        self::assertTrue($connection->isConnected());
+        self::assertFalse($connection->inTransaction());
+
+        $result = $connection->beginTransaction();
+
+        self::assertInstanceOf(Connection::class, $result);
+        self::assertTrue($connection->inTransaction());
+
+        $connection->rollback();
+        self::assertFalse($connection->inTransaction());
+        $connection->disconnect();
     }
 
-    /**
-     * @todo   Implement testCommit().
-     */
-    public function testCommit(): never
+    public function testCommit(): void
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $connection = $this->getAdapter()->getDriver()->getConnection();
+        $connection->connect();
+        self::assertTrue($connection->isConnected());
+
+        $connection->beginTransaction();
+        self::assertTrue($connection->inTransaction());
+
+        $connection->execute("INSERT INTO test (name, value) VALUES ('tx_commit', 'test')");
+
+        $result = $connection->commit();
+        self::assertInstanceOf(Connection::class, $result);
+        self::assertFalse($connection->inTransaction());
+
+        $result = $connection->execute("SELECT COUNT(*) AS cnt FROM test WHERE name = 'tx_commit'");
+        self::assertSame(1, $result->getResource()->fetchColumn());
+
+        $connection->execute("DELETE FROM test WHERE name = 'tx_commit'");
+        $connection->disconnect();
     }
 
-    /**
-     * @todo   Implement testRollback().
-     */
-    public function testRollback(): never
+    public function testRollback(): void
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $connection = $this->getAdapter()->getDriver()->getConnection();
+        $connection->connect();
+        self::assertTrue($connection->isConnected());
+
+        $connection->beginTransaction();
+        self::assertTrue($connection->inTransaction());
+
+        $connection->execute("INSERT INTO test (name, value) VALUES ('tx_rollback', 'test')");
+
+        $result = $connection->rollback();
+        self::assertInstanceOf(Connection::class, $result);
+        self::assertFalse($connection->inTransaction());
+
+        $result = $connection->execute("SELECT COUNT(*) AS cnt FROM test WHERE name = 'tx_rollback'");
+        self::assertSame(0, $result->getResource()->fetchColumn());
+
+        $connection->disconnect();
+    }
+
+    public function testAutocommitRestoredAfterCommit(): void
+    {
+        /** @var Connection $connection */
+        $connection = $this->getAdapter()->getDriver()->getConnection();
+        $connection->connect();
+        self::assertTrue($connection->isConnected());
+
+        $connection->beginTransaction();
+        self::assertTrue($connection->inTransaction());
+        $connection->commit();
+        self::assertFalse($connection->inTransaction());
+
+        $connection->execute("INSERT INTO test (name, value) VALUES ('tx_autocommit', 'test')");
+
+        $connection->disconnect();
+
+        $connection->connect();
+        $result = $connection->execute("SELECT COUNT(*) AS cnt FROM test WHERE name = 'tx_autocommit'");
+        self::assertSame(1, $result->getResource()->fetchColumn());
+
+        $connection->execute("DELETE FROM test WHERE name = 'tx_autocommit'");
+        $connection->disconnect();
+    }
+
+    public function testAutocommitRestoredAfterRollback(): void
+    {
+        /** @var Connection $connection */
+        $connection = $this->getAdapter()->getDriver()->getConnection();
+        $connection->connect();
+        self::assertTrue($connection->isConnected());
+
+        $connection->beginTransaction();
+        self::assertTrue($connection->inTransaction());
+        $connection->rollback();
+        self::assertFalse($connection->inTransaction());
+
+        $connection->execute("INSERT INTO test (name, value) VALUES ('tx_autocommit_rb', 'test')");
+
+        $connection->disconnect();
+
+        $connection->connect();
+        $result = $connection->execute("SELECT COUNT(*) AS cnt FROM test WHERE name = 'tx_autocommit_rb'");
+        self::assertSame(1, $result->getResource()->fetchColumn());
+
+        $connection->execute("DELETE FROM test WHERE name = 'tx_autocommit_rb'");
+        $connection->disconnect();
     }
 }

test/integration/Pdo/QueryTest.php

@@ -80,7 +80,9 @@
      */
     public function testSelectWithNotPermittedBindParamName(): void
     {
+        $this->markTestIncomplete('Incorrect bound param name characters are not caught in a raw query.');
+
         $this->expectException(RuntimeException::class);
         $this->getAdapter()->query('SET @@session.time_zone = :tz$', [':tz$' => 'SYSTEM']);
     }