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

Author: tyrsson

composer.json

@@ -33,7 +33,7 @@
     },
     "require": {
         "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
-        "php-db/phpdb": "^0.3.3"
+        "php-db/phpdb": "^0.3.4"
     },
     "require-dev": {
         "ext-mysqli": "*",

composer.lock

@@ -6,6 +6,7 @@
 
 use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\DriverInterface;
+use PhpDb\Adapter\Driver\Pdo\Statement as PdoStatement;
 use PhpDb\Adapter\Driver\PdoDriverInterface;
 use PhpDb\Adapter\Mysql\Driver;
 use PhpDb\Adapter\Mysql\Metadata\Source\MysqlMetadata;
@@ -58,13 +59,12 @@ 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\Statement::class  => Container\StatementInterfaceFactory::class,
                 Driver\Pdo\Pdo::class           => Container\PdoDriverFactory::class,
                 Driver\Pdo\Connection::class    => Container\PdoConnectionFactory::class,
+                PdoStatement::class             => Container\StatementInterfaceFactory::class,
                 MysqlMetadata::class            => Container\MetadataInterfaceFactory::class,
                 PlatformInterface::class        => Container\PlatformInterfaceFactory::class,
-                // Uncomment to override the default implementations
-                //Driver\Mysqli\Statement::class  => Container\MysqliStatementFactory::class,
-                //PdoStatement::class             => Container\PdoStatementFactory::class,
             ],
             'invokables'         => [
                 Container\ConnectionInterfaceFactoryFactory::class

src/ConfigProvider.php

@@ -12,6 +12,7 @@
 use PhpDb\Adapter\Exception\RuntimeException;
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Adapter\Profiler\ProfilerInterface;
+use PhpDb\ResultSet\ResultSet;
 use PhpDb\ResultSet\ResultSetInterface;
 use Psr\Container\ContainerInterface;
 
@@ -55,26 +56,21 @@ public function __invoke(ContainerInterface $container): AdapterInterface
         /** @var PlatformInterface $platformInstance */
         $platformInstance = $container->get(PlatformInterface::class);
 
-        if (! $container->has(ResultSetInterface::class)) {
-            throw new ServiceNotFoundException(sprintf(
-                'ResultSet "%s" is not registered in the adapter manager.',
-                ResultSetInterface::class
-            ));
-        }
-
         /** @var ResultSetInterface $resultSetInstance */
-        $resultSetInstance = $container->get(ResultSetInterface::class);
+        $resultSetInstance = $container->has(ResultSetInterface::class)
+                ? $container->get(ResultSetInterface::class)
+                : null;
 
         /** @var ProfilerInterface|null $profilerInstanceOrNull */
         $profilerInstanceOrNull = $container->has(ProfilerInterface::class)
                 ? $container->get(ProfilerInterface::class)
                 : null;
 
         return new Adapter(
-            $driverInstance,
-            $platformInstance,
-            $resultSetInstance,
-            $profilerInstanceOrNull
+            driver: $driverInstance,
+            platform: $platformInstance,
+            queryResultSetPrototype: $resultSetInstance ?? new ResultSet(),
+            profiler: $profilerInstanceOrNull
         );
     }
 }

src/Container/AdapterFactory.php

@@ -29,13 +29,13 @@ public function __invoke(ContainerInterface $container): Driver\DriverInterface&
         $statementInstance = $container->get(Mysqli\Statement::class);
 
         /** @var Driver\ResultInterface&Mysqli\Result $resultInstance */
-        $resultInstance = $container->get(Mysqli\Result::class);
+        $resultInstance = $container->has(Mysqli\Result::class) ? $container->get(Mysqli\Result::class) : null;
 
         return new Mysqli\Mysqli(
-            $connectionInstance,
-            $statementInstance,
-            $resultInstance,
-            $options
+            connection: $connectionInstance,
+            statementPrototype: $statementInstance,
+            resultPrototype: $resultInstance ?? new Mysqli\Result(),
+            options: $options
         );
     }
 

src/Container/MysqliDriverFactory.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Adapter\Mysql\Container;
+
+use PhpDb\Adapter\Driver\Pdo\Statement as PdoStatement;
+use PhpDb\Adapter\Driver\StatementInterface;
+use PhpDb\Adapter\Mysql\Driver\Mysqli\Statement as MysqliStatement;
+use Psr\Container\ContainerInterface;
+
+/** @internal */
+final class StatementInterfaceFactory
+{
+    /**
+     * @param string $requestedName
+     * @phpstan-param class-string $requestedName
+     */
+    public function __invoke(
+        ContainerInterface $container,
+        $requestedName
+    ): (StatementInterface&PdoStatement)|(StatementInterface&MysqliStatement) {
+        /** @var array $config */
+        $config = $container->get('config');
+
+        /** @var array $dbConfig */
+        $dbConfig = $config['db'] ?? [];
+
+        /** @var array $options */
+        $options = $dbConfig['options'] ?? [];
+
+        return new $requestedName(options: $options);
+    }
+}

src/Container/MysqliStatementFactory.php

@@ -22,11 +22,12 @@
 
 final class Statement implements StatementInterface, DriverAwareInterface, ProfilerAwareInterface
 {
+    protected bool $bufferResults;
     protected \mysqli $mysqli;
 
     protected Mysqli $driver;
 
-    protected ?ProfilerInterface $profiler;
+    protected ?ProfilerInterface $profiler = null;
 
     protected string $sql = '';
 
@@ -36,8 +37,14 @@ final class Statement implements StatementInterface, DriverAwareInterface, Profi
 
     public function __construct(
         protected ParameterContainer $parameterContainer = new ParameterContainer(),
-        protected bool $bufferResults = false
+        array|bool $options = false
     ) {
+        if (is_array($options)) {
+            $this->bufferResults = $options['buffer_results'] ?? false;
+        } else {
+            // Provide backward compatibility for boolean parameter
+            $this->bufferResults = $options;
+        }
     }
 
     #[Override]

src/Container/PdoStatementFactory.php

@@ -10,7 +10,6 @@
 use PhpDb\Sql\Platform\PlatformDecoratorInterface;
 use PhpDb\Sql\Select;
 
-
 /** @internal */
 final class SelectDecorator extends Select implements PlatformDecoratorInterface
 {