VERY ROUGH first draft. (just makes it work)

No psalm work
No code cleanup
No additional test
Signed-off-by: Joey Smith <jsmith@webinertia.net>

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

Author: tyrsson

src/ConfigProvider.php

@@ -14,6 +14,7 @@
 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\MetadataFactory;
 use PhpDb\Metadata\MetadataInterface;
@@ -32,6 +33,9 @@ public function __invoke(): array
     public function getDependencies(): array
     {
         return [
+            'abstract_factories' => [
+                AdapterAbstractServiceFactory::class,
+            ],
             'aliases'    => [
                 MetadataInterface::class => MysqlMetadata::class,
             ],
@@ -65,6 +69,9 @@ public function getAdapterManagerConfig(): array
                 PdoDriverInterface::class           => Driver\Pdo\Pdo::class,
                 Profiler\ProfilerInterface::class   => Profiler\Profiler::class,
                 ResultSet\ResultSetInterface::class => ResultSet\ResultSet::class,
+                'ConnectionFactoryFactory'          => Container\ConnectionFactoryFactory::class,
+                'DriverFactoryFactory'              => Container\DriverFactoryFactory::class,
+                'PlatformFactoryFactory'            => Container\PlatformFactoryFactory::class,
             ],
             'factories' => [
                 AdapterInterface::class         => Container\AdapterFactory::class,
@@ -80,6 +87,11 @@ public function getAdapterManagerConfig(): array
                 Profiler\Profiler::class        => InvokableFactory::class,
                 ResultSet\ResultSet::class      => InvokableFactory::class,
             ],
+            'invokables' => [
+                Container\ConnectionFactoryFactory::class => Container\ConnectionFactoryFactory::class,
+                Container\DriverFactoryFactory::class     => Container\DriverFactoryFactory::class,
+                Container\PlatformFactoryFactory::class   => Container\PlatformFactoryFactory::class,
+            ],
         ];
     }
 }

src/Container/ConnectionFactoryFactory.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Adapter\Mysql\Container;
+
+use PhpDb\Container\AdapterManager;
+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 Psr\Container\ContainerInterface;
+use RuntimeException;
+
+use function array_key_exists;
+use function sprintf;
+
+final class ConnectionFactoryFactory
+{
+    public function __invoke(
+        ContainerInterface $container,
+        string $requestedName
+    ): 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
+            )),
+        };
+    }
+}

src/Container/DriverFactoryFactory.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Adapter\Mysql\Container;
+
+use PhpDb\Container\AdapterManager;
+use Psr\Container\ContainerInterface;
+
+use function sprintf;
+
+final class DriverFactoryFactory
+{
+    public function __invoke(ContainerInterface $container, string $requestedName): 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();
+    }
+}

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,10 @@ 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'] ?? []);
+    }
 }

src/Container/MysqliDriverFactory.php

@@ -41,4 +41,27 @@ 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('ConnectionFactoryFactory'))($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'] ?? []
+        );
+    }
 }

src/Container/PlatformFactoryFactory.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Adapter\Mysql\Container;
+
+use PhpDb\Adapter\Mysql\Container\PlatformInterfaceFactory;
+
+final class PlatformFactoryFactory
+{
+    public function __invoke(): PlatformInterfaceFactory
+    {
+        return new PlatformInterfaceFactory();
+    }
+}

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);
+    }
 }