Provide default instances where possible for Driver constructor parameters.

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

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

Author: tyrsson

src/ConfigProvider.php

@@ -4,7 +4,6 @@
 
 namespace PhpDb\Adapter\Mysql;
 
-use Laminas\ServiceManager\Factory\InvokableFactory;
 use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Driver\Pdo\Result;
@@ -61,24 +60,28 @@ public function getDependencies(): array
                 AdapterInterface::class         => Container\AdapterFactory::class,
                 Driver\Mysqli\Mysqli::class     => Container\MysqliDriverFactory::class,
                 Driver\Mysqli\Connection::class => Container\MysqliConnectionFactory::class,
-                Driver\Mysqli\Result::class     => Container\MysqliResultFactory::class,
                 Driver\Mysqli\Statement::class  => Container\MysqliStatementFactory::class,
                 Driver\Pdo\Pdo::class           => Container\PdoDriverFactory::class,
                 Driver\Pdo\Connection::class    => Container\PdoConnectionFactory::class,
                 MysqlMetadata::class            => Container\MetadataInterfaceFactory::class,
                 PdoStatement::class             => Container\PdoStatementFactory::class,
                 PlatformInterface::class        => Container\PlatformInterfaceFactory::class,
-                Profiler\Profiler::class        => InvokableFactory::class,
-                Result::class                   => Container\PdoResultFactory::class,
-                ResultSet\ResultSet::class      => InvokableFactory::class,
             ],
             'invokables'         => [
                 Container\ConnectionInterfaceFactoryFactory::class
-                => Container\ConnectionInterfaceFactoryFactory::class,
+                    => Container\ConnectionInterfaceFactoryFactory::class,
                 Container\DriverInterfaceFactoryFactory::class
-                => Container\DriverInterfaceFactoryFactory::class,
+                    => Container\DriverInterfaceFactoryFactory::class,
                 Container\PlatformInterfaceFactoryFactory::class
-                => Container\PlatformInterfaceFactoryFactory::class,
+                    => Container\PlatformInterfaceFactoryFactory::class,
+                Driver\Mysqli\Result::class
+                    => Driver\Mysqli\Result::class,
+                Profiler\Profiler::class
+                    => Profiler\Profiler::class,
+                Result::class
+                    => Result::class,
+                ResultSet\ResultSet::class
+                    => ResultSet\ResultSet::class,
             ],
         ];
     }

src/Container/MysqliResultFactory.php

@@ -32,9 +32,9 @@ final class Mysqli implements DriverInterface, ProfilerAwareInterface
     ];
 
     public function __construct(
-        protected readonly ConnectionInterface&Connection $connection,
-        protected readonly StatementInterface&Statement $statementPrototype,
-        protected readonly ResultInterface $resultPrototype,
+        protected ConnectionInterface&Connection $connection,
+        protected StatementInterface&Statement $statementPrototype = new Statement(),
+        protected ResultInterface $resultPrototype = new Result(),
         array $options = []
     ) {
         $this->checkEnvironment();

src/Container/PdoResultFactory.php

@@ -7,14 +7,32 @@
 use Override;
 use PDOStatement;
 use PhpDb\Adapter\Driver\Pdo\AbstractPdo;
+use PhpDb\Adapter\Driver\Pdo\AbstractPdoConnection;
 use PhpDb\Adapter\Driver\Pdo\Result;
+use PhpDb\Adapter\Driver\Pdo\Statement;
+use PhpDb\Adapter\Driver\PdoDriverAwareInterface;
 use PhpDb\Adapter\Driver\ResultInterface;
+use PhpDb\Adapter\Driver\StatementInterface;
 use PhpDb\Adapter\Mysql\DatabasePlatformNameTrait;
 
 class Pdo extends AbstractPdo
 {
     use DatabasePlatformNameTrait;
 
+    public function __construct(
+        protected AbstractPdoConnection|\PDO $connection,
+        protected StatementInterface&PdoDriverAwareInterface $statementPrototype = new Statement(),
+        protected ResultInterface $resultPrototype = new Result(),
+        array $features = [],
+    ) {
+        parent::__construct(
+            $connection,
+            $statementPrototype,
+            $resultPrototype,
+            $features
+        );
+    }
+
     /**
      * @param PDOStatement $resource
      */