Align factories

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

Author: tyrsson

src/Container/MetadataInterfaceFactory.php

@@ -5,20 +5,20 @@
 namespace PhpDb\Sqlite\Container;
 
 use PhpDb\Adapter\AdapterInterface;
-use PhpDb\Adapter\SchemaAwareInterface;
 use PhpDb\Metadata\MetadataInterface;
 use PhpDb\Sqlite\Metadata;
 use Psr\Container\ContainerInterface;
 
 final class MetadataInterfaceFactory
 {
-    public function __invoke(ContainerInterface $container): MetadataInterface&Metadata\Source
-    {
-        /** @var AdapterInterface&SchemaAwareInterface $adapter */
-        $adapter = $container->get(AdapterInterface::class);
+    public const ADAPTER_SERVICE_NAME = 'adapter_service_name';
+    public function __invoke(
+        ContainerInterface $container,
+        string $requestedName,
+        ?array $options = null
+    ): MetadataInterface&Metadata\Source {
+        $adapterServiceName = $options[self::ADAPTER_SERVICE_NAME] ?? AdapterInterface::class;
 
-        return new Metadata\Source(
-            $adapter
-        );
+        return new Metadata\Source($container->get($adapterServiceName));
     }
 }

src/Container/PdoConnectionFactory.php

@@ -4,24 +4,26 @@
 
 namespace PhpDb\Sqlite\Container;
 
-use PhpDb\Adapter\AdapterInterface;
-use PhpDb\Adapter\Driver\ConnectionInterface;
+use PhpDb\Adapter\Driver\PdoConnectionInterface;
+use PhpDb\Adapter\Exception\InvalidConnectionParametersException;
 use PhpDb\Sqlite\Pdo\Connection;
 use Psr\Container\ContainerInterface;
 
 final class PdoConnectionFactory
 {
-    public function __invoke(ContainerInterface $container): ConnectionInterface&Connection
-    {
-        /** @var array $config */
-        $config = $container->get('config');
+    public function __invoke(
+        ContainerInterface $container,
+        string $requestedName,
+        ?array $options = null
+    ): PdoConnectionInterface&Connection {
+        $conn = $options['connection'] ?? [];
+        if (! is_array($conn) || $conn === []) {
+            throw new InvalidConnectionParametersException(
+                'Connection configuration must be an array of parameters passed via $options["connection"]',
+                $conn
+            );
+        }
 
-        /** @var array $dbConfig */
-        $dbConfig = $config[AdapterInterface::class] ?? [];
-
-        /** @var array $connectionConfig */
-        $connectionConfig = $dbConfig['connection'] ?? [];
-
-        return new Connection($connectionConfig);
+        return new Connection($conn);
     }
 }

src/Container/PdoDriverInterfaceFactory.php

@@ -19,18 +19,10 @@ public function __invoke(
         string $requestedName,
         ?array $options = null
     ): PdoDriverInterface&Pdo\Driver {
-        // if (! $container->has('config')) {
-        //     throw ContainerException::forService(
-        //         Pdo\Driver::class,
-        //         self::class,
-        //         'Container is missing config service'
-        //     );
-        // }
-
         /** @var Pdo\Connection $connectionInstance */
         $connectionInstance = $container->build(
             Pdo\Connection::class,
-            ['connection' => $options['connection'] ?? []]
+            $options
         );
 
         /** @var ResultInterface&Result $resultInstance */