Merge pull request #18 from tyrsson/fix-abstract-adapter

Fixes the AdapterAbstractServiceFactory usage.

Author: tyrsson

src/ConfigProvider.php

@@ -17,7 +17,12 @@
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Adapter\Profiler\Profiler;
 use PhpDb\Adapter\Profiler\ProfilerInterface;
+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;
 
@@ -34,6 +39,9 @@ public function __invoke(): array
     public function getDependencies(): array
     {
         return [
+            'abstract_factories' => [
+                AdapterAbstractServiceFactory::class,
+            ],
             'aliases'    => [
                 MetadataInterface::class => Metadata\Source\SqliteMetadata::class,
             ],
@@ -68,6 +76,9 @@ public function getAdapterManagerConfig(): array
                 ResultInterface::class              => Result::class,
                 ResultSet\ResultSetInterface::class => ResultSet\ResultSet::class,
                 StatementInterface::class           => Statement::class,
+                ConnectionInterfaceFactoryFactoryInterface::class => Container\ConnectionInterfaceFactoryFactory::class,
+                DriverInterfaceFactoryFactoryInterface::class     => Container\DriverInterfaceFactoryFactory::class,
+                PlatformInterfaceFactoryFactoryInterface::class   => Container\PlatformInterfaceFactoryFactory::class,
             ],
             'factories' => [
                 AdapterInterface::class      => Container\AdapterFactory::class,
@@ -79,6 +90,14 @@ public function getAdapterManagerConfig(): array
                 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,
+            ],
         ];
     }
 }

src/Container/ConnectionInterfaceFactoryFactory.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Adapter\Sqlite\Container;
+
+use PhpDb\Adapter\Sqlite\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) {
+            Pdo::class    => new PdoConnectionFactory(),
+            default       => throw new RuntimeException(sprintf(
+                'No connection factory found for driver "%s"',
+                $configuredDriver
+            )),
+        };
+    }
+}

src/Container/DriverInterfaceFactoryFactory.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Adapter\Sqlite\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();
+    }
+}

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

src/Container/PdoDriverFactory.php

@@ -39,4 +39,31 @@ public function __invoke(ContainerInterface $container): PdoDriverInterface&PdoD
             [new SqliteRowCounter()],
         );
     }
+
+    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 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,
+            [new SqliteRowCounter()],
+        );
+    }
 }

src/Container/PlatformInterfaceFactory.php

@@ -32,4 +32,9 @@ public function __invoke(ContainerInterface $container): PlatformInterface&Sqlit
 
         return new Sqlite($driverInstance);
     }
+
+    public static function fromDriver(PdoDriverInterface $driverInstance): PlatformInterface&Sqlite
+    {
+        return new Sqlite($driverInstance);
+    }
 }

src/Container/PlatformInterfaceFactoryFactory.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Adapter\Sqlite\Container;
+
+use PhpDb\Adapter\Sqlite\Container\PlatformInterfaceFactory;
+use PhpDb\Container\PlatformInterfaceFactoryFactoryInterface as FactoryFactoryInterface;
+
+final class PlatformInterfaceFactoryFactory implements FactoryFactoryInterface
+{
+    public function __invoke(): callable
+    {
+        return new PlatformInterfaceFactory();
+    }
+}

src/Driver/Pdo/Connection.php

@@ -22,6 +22,7 @@
 class Connection extends AbstractPdoConnection
 {
     public final const CURRENT_SCHEMA = 'main';
+
     /**
      * {@inheritDoc}
      */