Merge branch '0.2.x' into pr/tyrsson/33

tyrsson · tyrsson · commit 3d9a72ab0ab2 · 2025-09-25T00:38:24.000-05:00
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         }
     },
     "require": {
-        "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "php-db/phpdb": "^0.1.0"
     },
     "require-dev": {
diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -14,8 +14,12 @@
 use PhpDb\Adapter\Mysql\Metadata\Source\MysqlMetadata;
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Adapter\Profiler;
+use PhpDb\Container\AdapterAbstractServiceFactory;
 use PhpDb\Container\AdapterManager;
+use PhpDb\Container\ConnectionInterfaceFactoryFactoryInterface;
+use PhpDb\Container\DriverInterfaceFactoryFactoryInterface;
 use PhpDb\Container\MetadataFactory;
+use PhpDb\Container\PlatformInterfaceFactoryFactoryInterface;
 use PhpDb\Metadata\MetadataInterface;
 use PhpDb\ResultSet;
 
@@ -32,13 +36,16 @@ public function __invoke(): array
     public function getDependencies(): array
     {
         return [
-            'aliases'    => [
+            'abstract_factories' => [
+                AdapterAbstractServiceFactory::class,
+            ],
+            'aliases'            => [
                 MetadataInterface::class => MysqlMetadata::class,
             ],
-            'factories'  => [
+            'factories'          => [
                 MysqlMetadata::class => MetadataFactory::class,
             ],
-            'delegators' => [
+            'delegators'         => [
                 AdapterManager::class => [
                     Container\AdapterManagerDelegator::class,
                 ],
@@ -49,24 +56,27 @@ public function getDependencies(): array
     public function getAdapterManagerConfig(): array
     {
         return [
-            'aliases'   => [
-                'MySqli'                            => Driver\Mysqli\Mysqli::class,
-                'MySQLi'                            => Driver\Mysqli\Mysqli::class,
-                'Mysqli'                            => Driver\Mysqli\Mysqli::class,
-                'mysqli'                            => Driver\Mysqli\Mysqli::class,
-                'PDO_MySQL'                         => Driver\Pdo\Pdo::class,
-                'Pdo_MySQL'                         => Driver\Pdo\Pdo::class,
-                'Pdo_Mysql'                         => Driver\Pdo\Pdo::class,
-                'pdo_mysql'                         => Driver\Pdo\Pdo::class,
-                'pdomysql'                          => Driver\Pdo\Pdo::class,
-                'pdodriver'                         => Driver\Pdo\Pdo::class,
-                'pdo'                               => Driver\Pdo\Pdo::class,
-                DriverInterface::class              => Driver\Mysqli\Mysqli::class,
-                PdoDriverInterface::class           => Driver\Pdo\Pdo::class,
-                Profiler\ProfilerInterface::class   => Profiler\Profiler::class,
-                ResultSet\ResultSetInterface::class => ResultSet\ResultSet::class,
+            'aliases'    => [
+                'MySqli'                                          => Driver\Mysqli\Mysqli::class,
+                'MySQLi'                                          => Driver\Mysqli\Mysqli::class,
+                'Mysqli'                                          => Driver\Mysqli\Mysqli::class,
+                'mysqli'                                          => Driver\Mysqli\Mysqli::class,
+                'PDO_MySQL'                                       => Driver\Pdo\Pdo::class,
+                'Pdo_MySQL'                                       => Driver\Pdo\Pdo::class,
+                'Pdo_Mysql'                                       => Driver\Pdo\Pdo::class,
+                'pdo_mysql'                                       => Driver\Pdo\Pdo::class,
+                'pdomysql'                                        => Driver\Pdo\Pdo::class,
+                'pdodriver'                                       => Driver\Pdo\Pdo::class,
+                'pdo'                                             => Driver\Pdo\Pdo::class,
+                DriverInterface::class                            => Driver\Mysqli\Mysqli::class,
+                PdoDriverInterface::class                         => Driver\Pdo\Pdo::class,
+                Profiler\ProfilerInterface::class                 => Profiler\Profiler::class,
+                ResultSet\ResultSetInterface::class               => ResultSet\ResultSet::class,
+                ConnectionInterfaceFactoryFactoryInterface::class => Container\ConnectionInterfaceFactoryFactory::class,
+                DriverInterfaceFactoryFactoryInterface::class     => Container\DriverInterfaceFactoryFactory::class,
+                PlatformInterfaceFactoryFactoryInterface::class   => Container\PlatformInterfaceFactoryFactory::class,
             ],
-            'factories' => [
+            'factories'  => [
                 AdapterInterface::class         => Container\AdapterFactory::class,
                 Driver\Mysqli\Mysqli::class     => Container\MysqliDriverFactory::class,
                 Driver\Mysqli\Connection::class => Container\MysqliConnectionFactory::class,
@@ -80,6 +90,14 @@ public function getAdapterManagerConfig(): array
                 Profiler\Profiler::class        => InvokableFactory::class,
                 ResultSet\ResultSet::class      => InvokableFactory::class,
             ],
+            'invokables' => [
+                Container\ConnectionInterfaceFactoryFactory::class
+                    => Container\ConnectionInterfaceFactoryFactory::class,
+                Container\DriverInterfaceFactoryFactory::class
+                    => Container\DriverInterfaceFactoryFactory::class,
+                Container\PlatformInterfaceFactoryFactory::class
+                    => Container\PlatformInterfaceFactoryFactory::class,
+            ],
         ];
     }
 }
diff --git a/src/Container/AdapterManagerDelegator.php b/src/Container/AdapterManagerDelegator.php
@@ -5,7 +5,7 @@
 namespace PhpDb\Adapter\Mysql\Container;
 
 use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
-use PhpDB\Adapter\Mysql\ConfigProvider;
+use PhpDb\Adapter\Mysql\ConfigProvider;
 use PhpDb\Container\AdapterManager;
 use Psr\Container\ContainerInterface;
 
diff --git a/src/Container/ConnectionInterfaceFactoryFactory.php b/src/Container/ConnectionInterfaceFactoryFactory.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Adapter\Mysql\Container;
+
+use PhpDb\Adapter\Mysql\Container\MysqliConnectionFactory;
+use PhpDb\Adapter\Mysql\Container\PdoConnectionFactory;
+use PhpDb\Adapter\Mysql\Driver\Mysqli\Mysqli;
+use PhpDb\Adapter\Mysql\Driver\Pdo\Pdo;
+use PhpDb\Container\AdapterManager;
+use PhpDb\Container\ConnectionInterfaceFactoryFactoryInterface as FactoryFactoryInterface;
+use Psr\Container\ContainerInterface;
+use RuntimeException;
+
+use function array_key_exists;
+use function sprintf;
+
+final class ConnectionInterfaceFactoryFactory implements FactoryFactoryInterface
+{
+    public function __invoke(
+        ?ContainerInterface $container = null,
+        ?string $requestedName = null
+    ): callable {
+        $adapterConfig = $container->get('config')['db']['adapters'] ?? [];
+        if (! isset($adapterConfig[$requestedName]['driver'])) {
+            throw new RuntimeException(sprintf(
+                'Named adapter "%s" is not configured with a driver',
+                $requestedName
+            ));
+        }
+        $adapterServices  = $container->get('config')[AdapterManager::class];
+        $configuredDriver = $adapterConfig[$requestedName]['driver'];
+        if (array_key_exists($configuredDriver, $adapterServices['aliases'])) {
+            $aliasTo = $adapterServices['aliases'][$configuredDriver];
+        } else {
+            $aliasTo = $configuredDriver;
+        }
+        return match ($aliasTo) {
+            Mysqli::class => new MysqliConnectionFactory(),
+            Pdo::class    => new PdoConnectionFactory(),
+            default       => throw new RuntimeException(sprintf(
+                'No connection factory found for driver "%s"',
+                $configuredDriver
+            )),
+        };
+    }
+}
diff --git a/src/Container/DriverInterfaceFactoryFactory.php b/src/Container/DriverInterfaceFactoryFactory.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Adapter\Mysql\Container;
+
+use PhpDb\Container\AdapterManager;
+use PhpDb\Container\DriverInterfaceFactoryFactoryInterface as FactoryFactoryInterface;
+use Psr\Container\ContainerInterface;
+use RuntimeException;
+
+use function sprintf;
+
+final class DriverInterfaceFactoryFactory implements FactoryFactoryInterface
+{
+    public function __invoke(
+        ?ContainerInterface $container = null,
+        ?string $requestedName = null
+    ): callable {
+        $adapterConfig = $container->get('config')['db']['adapters'] ?? [];
+        if (! isset($adapterConfig[$requestedName]['driver'])) {
+            throw new RuntimeException(sprintf(
+                'Named adapter "%s" is not configured with a driver',
+                $requestedName
+            ));
+        }
+        $adapterServices = $container->get('config')[AdapterManager::class];
+
+        $configuredDriver = $adapterConfig[$requestedName]['driver'];
+        $aliasTo        ??= $adapterServices['aliases'][$configuredDriver] ?? $configuredDriver;
+        $driverFactory    = $adapterServices['factories'][$aliasTo];
+        return new $driverFactory();
+    }
+}
diff --git a/src/Container/MysqliConnectionFactory.php b/src/Container/MysqliConnectionFactory.php
@@ -4,14 +4,18 @@
 
 namespace PhpDb\Adapter\Mysql\Container;
 
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use PhpDb\Adapter\Driver\ConnectionInterface;
 use PhpDb\Adapter\Mysql\Driver\Mysqli\Connection;
 use Psr\Container\ContainerInterface;
 
-final class MysqliConnectionFactory
+final class MysqliConnectionFactory implements FactoryInterface
 {
-    public function __invoke(ContainerInterface $container): ConnectionInterface&Connection
-    {
+    public function __invoke(
+        ContainerInterface $container,
+        string $requestedName,
+        ?array $options = null
+    ): ConnectionInterface&Connection {
         /** @var array $config */
         $config = $container->get('config');
 
@@ -23,4 +27,12 @@ public function __invoke(ContainerInterface $container): ConnectionInterface&Con
 
         return new Connection($connectionConfig);
     }
+
+    public static function createFromConfig(
+        ContainerInterface $container,
+        string $requestedName
+    ): ConnectionInterface&Connection {
+        $adapterConfig = $container->get('config')['db']['adapters'][$requestedName] ?? [];
+        return new Connection($adapterConfig['connection'] ?? []);
+    }
 }
diff --git a/src/Container/MysqliDriverFactory.php b/src/Container/MysqliDriverFactory.php
@@ -41,4 +41,28 @@ public function __invoke(ContainerInterface $container): Driver\DriverInterface&
             $options
         );
     }
+
+    public static function createFromConfig(
+        ContainerInterface $container,
+        string $requestedName,
+    ): Driver\DriverInterface&Mysqli\Mysqli {
+        /** @var AdapterManager $adapterManager */
+        $adapterManager    = $container->get(AdapterManager::class);
+        $connectionFactory = (
+            $adapterManager->get(ConnectionInterfaceFactoryFactory::class)
+        )($container, $requestedName);
+        /** @var array $config */
+        $config = $container->get('config');
+        /** @var array $dbConfig */
+        $dbConfig = $config['db'] ?? [];
+        /** @var array $adapterConfig */
+        $adapterConfig = $dbConfig['adapters'][$requestedName] ?? [];
+
+        return new Mysqli\Mysqli(
+            $connectionFactory::createFromConfig($container, $requestedName),
+            $adapterManager->get(Mysqli\Statement::class),
+            $adapterManager->get(Mysqli\Result::class),
+            $adapterConfig['options'] ?? []
+        );
+    }
 }
diff --git a/src/Container/PdoConnectionFactory.php b/src/Container/PdoConnectionFactory.php
@@ -23,4 +23,12 @@ public function __invoke(ContainerInterface $container): ConnectionInterface&Con
 
         return new Connection($connectionConfig);
     }
+
+    public static function createFromConfig(
+        ContainerInterface $container,
+        string $requestedName
+    ): ConnectionInterface&Connection {
+        $adapterConfig = $container->get('config')['db']['adapters'][$requestedName] ?? [];
+        return new Connection($adapterConfig['connection'] ?? []);
+    }
 }
diff --git a/src/Container/PdoDriverFactory.php b/src/Container/PdoDriverFactory.php
@@ -37,4 +37,39 @@ public function __invoke(ContainerInterface $container): PdoDriverInterface&PdoD
             $resultInstance
         );
     }
+
+    public static function createFromConfig(
+        ContainerInterface $container,
+        string $requestedName,
+    ): PdoDriverInterface&PdoDriver {
+        /** @var AdapterManager $adapterManager */
+        $adapterManager    = $container->get(AdapterManager::class);
+        $connectionFactory = (
+            $adapterManager->get(ConnectionInterfaceFactoryFactory::class)
+        )($container, $requestedName);
+        /** @var array $config */
+        $config = $container->get('config');
+        /** @var array $dbConfig */
+        $dbConfig = $config['db'] ?? [];
+        /** @var array $adapterConfig */
+        $adapterConfig = $dbConfig['adapters'][$requestedName] ?? [];
+        /** @var array $options */
+        $options = $adapterConfig['options'] ?? [];
+
+        /** @var ConnectionInterface&Connection $connectionInstance */
+        $connectionInstance = $connectionFactory::createFromConfig($container, $requestedName);
+
+        /** @var StatementInterface&Statement $statementInstance */
+        $statementInstance = $adapterManager->get(Statement::class);
+
+        /** @var ResultInterface&Result $resultInstance */
+        $resultInstance = $adapterManager->get(Result::class);
+
+        return new PdoDriver(
+            $connectionInstance,
+            $statementInstance,
+            $resultInstance,
+            $options
+        );
+    }
 }
diff --git a/src/Container/PlatformInterfaceFactory.php b/src/Container/PlatformInterfaceFactory.php
@@ -33,4 +33,9 @@ public function __invoke(ContainerInterface $container): PlatformInterface&Mysql
 
         return new Mysql($driverInstance);
     }
+
+    public static function fromDriver(DriverInterface $driverInstance): PlatformInterface&Mysql
+    {
+        return new Mysql($driverInstance);
+    }
 }
diff --git a/src/Container/PlatformInterfaceFactoryFactory.php b/src/Container/PlatformInterfaceFactoryFactory.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Adapter\Mysql\Container;
+
+use PhpDb\Adapter\Mysql\Container\PlatformInterfaceFactory;
+use PhpDb\Container\PlatformInterfaceFactoryFactoryInterface as FactoryFactoryInterface;
+
+final class PlatformInterfaceFactoryFactory implements FactoryFactoryInterface
+{
+    public function __invoke(): callable
+    {
+        return new PlatformInterfaceFactory();
+    }
+}
diff --git a/src/Driver/Mysqli/Mysqli.php b/src/Driver/Mysqli/Mysqli.php
@@ -20,7 +20,7 @@
 use function extension_loaded;
 use function is_string;
 
-class Mysqli implements DriverInterface, ProfilerAwareInterface
+final class Mysqli implements DriverInterface, ProfilerAwareInterface
 {
     use DatabasePlatformNameTrait;
 
diff --git a/src/Driver/Mysqli/Result.php b/src/Driver/Mysqli/Result.php
@@ -18,7 +18,7 @@
 use function call_user_func_array;
 use function count;
 
-class Result implements Iterator, ResultInterface
+final class Result implements Iterator, ResultInterface
 {
     protected mysqli|mysqli_result|mysqli_stmt $resource;
 
diff --git a/src/Driver/Mysqli/Statement.php b/src/Driver/Mysqli/Statement.php
@@ -20,7 +20,7 @@
 use function call_user_func_array;
 use function is_array;
 
-class Statement implements StatementInterface, DriverAwareInterface, ProfilerAwareInterface
+final class Statement implements StatementInterface, DriverAwareInterface, ProfilerAwareInterface
 {
     protected \mysqli $mysqli;
 
diff --git a/src/Metadata/Source/MysqlMetadata.php b/src/Metadata/Source/MysqlMetadata.php
@@ -20,7 +20,7 @@
 use const CASE_LOWER;
 use const PREG_PATTERN_ORDER;
 
-class MysqlMetadata extends AbstractSource
+final class MysqlMetadata extends AbstractSource
 {
     /**
      * @throws Exception
diff --git a/src/Sql/Platform/Mysql/Ddl/AlterTableDecorator.php b/src/Sql/Platform/Mysql/Ddl/AlterTableDecorator.php
@@ -18,7 +18,7 @@
 use function substr_replace;
 use function uksort;
 
-class AlterTableDecorator extends AlterTable implements PlatformDecoratorInterface
+final class AlterTableDecorator extends AlterTable implements PlatformDecoratorInterface
 {
     /** @var AlterTable */
     protected $subject;
diff --git a/src/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php b/src/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
@@ -18,7 +18,7 @@
 use function substr_replace;
 use function uksort;
 
-class CreateTableDecorator extends CreateTable implements PlatformDecoratorInterface
+final class CreateTableDecorator extends CreateTable implements PlatformDecoratorInterface
 {
     /** @var CreateTable */
     protected $subject;
diff --git a/src/Sql/Platform/Mysql/Mysql.php b/src/Sql/Platform/Mysql/Mysql.php
diff --git a/src/Sql/Platform/Mysql/SelectDecorator.php b/src/Sql/Platform/Mysql/SelectDecorator.php
diff --git a/test/integration/Container/MysqliConnectionFactoryTest.php b/test/integration/Container/MysqliConnectionFactoryTest.php

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`}`
`33`	`33`	`},`
`34`	`34`	`"require": {`
`35`		`- "php": "~8.2.0 \|\| ~8.3.0 \|\| ~8.4.0",`
	`35`	`+ "php": "~8.1.0 \|\| ~8.2.0 \|\| ~8.3.0 \|\| ~8.4.0",`
`36`	`36`	`"php-db/phpdb": "^0.1.0"`
`37`	`37`	`},`
`38`	`38`	`"require-dev": {`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,12 @@ public function __invoke(ContainerInterface $container): ConnectionInterface&Con`
`23`	`23`
`24`	`24`	`return new Connection($connectionConfig);`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ public static function createFromConfig(`
	`28`	`+ ContainerInterface $container,`
	`29`	`+ string $requestedName`
	`30`	`+ ): ConnectionInterface&Connection {`
	`31`	`+ $adapterConfig = $container->get('config')['db']['adapters'][$requestedName] ?? [];`
	`32`	`+ return new Connection($adapterConfig['connection'] ?? []);`
	`33`	`+ }`
`26`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,9 @@ public function __invoke(ContainerInterface $container): PlatformInterface&Mysql`
`33`	`33`
`34`	`34`	`return new Mysql($driverInstance);`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ public static function fromDriver(DriverInterface $driverInstance): PlatformInterface&Mysql`
	`38`	`+ {`
	`39`	`+ return new Mysql($driverInstance);`
	`40`	`+ }`
`36`	`41`	`}`