Refactor Mysqli related factories

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

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

Author: tyrsson

src/Container/ConnectionInterfaceFactory.php

@@ -5,6 +5,7 @@
 namespace PhpDb\Mysql\Container;
 
 use PhpDb\Adapter\Driver\ConnectionInterface;
+use PhpDb\Adapter\Exception\InvalidConnectionParametersException;
 use PhpDb\Mysql\Connection;
 use Psr\Container\ContainerInterface;
 
@@ -15,23 +16,13 @@ public function __invoke(
         string $requestedName,
         ?array $options = null
     ): ConnectionInterface&Connection {
-        /** @var array $config */
-        $config = $container->get('config');
-
-        /** @var array $dbConfig */
-        $dbConfig = $config['db'] ?? [];
-
-        /** @var array $connectionConfig */
-        $connectionConfig = $dbConfig['connection'] ?? [];
-
-        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'] ?? []);
+        if (! is_array($options['connection']) || $options['connection'] === []) {
+            throw new InvalidConnectionParametersException(
+                'Connection configuration must be an array of parameters passed via $options["connection"]',
+                $options['connection']
+            );
+        }
+
+        return new Connection($options['connection']);
     }
 }

src/Container/DriverInterfaceFactory.php

@@ -4,7 +4,10 @@
 
 namespace PhpDb\Mysql\Container;
 
+use Laminas\ServiceManager\ServiceManager;
 use PhpDb\Adapter\Driver\DriverInterface;
+use PhpDb\Adapter\Driver\ResultInterface;
+use PhpDb\Exception\ContainerException;
 use PhpDb\Mysql\Connection;
 use PhpDb\Mysql\Driver;
 use PhpDb\Mysql\Result;
@@ -13,24 +16,32 @@
 
 final class DriverInterfaceFactory
 {
-    public function __invoke(ContainerInterface $container): DriverInterface&Driver
-    {
-        /** @var array $config */
-        $config = $container->get('config');
-
-        /** @var array $dbConfig */
-        $dbConfig = $config['db'] ?? [];
-
-        /** @var array $options */
-        $options = $dbConfig['options'] ?? [];
+    public function __invoke(
+        ContainerInterface&ServiceManager $container,
+        string $requestedName,
+        ?array $options = null
+    ): DriverInterface&Driver {
+        if (! isset($options['connection'])) {
+            throw ContainerException::forService(
+                Driver::class,
+                self::class,
+                '$options["connection"] must containe an array of connection configuration.'
+            );
+        }
 
         /** @var Driver\ConnectionInterface&Connection $connectionInstance */
-        $connectionInstance = $container->get(Connection::class);
+        $connectionInstance = $container->build(Connection::class, $options);
 
         /** @var Driver\StatementInterface&Statement $statementInstance */
-        $statementInstance = $container->get(Statement::class);
+        $statementInstance = $container->build(
+            Statement::class,
+            $options['options'] ?? []
+        );
+
         /** @var Driver\ResultInterface&Result $resultInstance */
-        $resultInstance = $container->get(Result::class);
+        $resultInstance = $container->has(ResultInterface::class)
+            ? $container->get(ResultInterface::class)
+            : new Result();
 
         return new Driver(
             $connectionInstance,

src/Container/MetadataInterfaceFactory.php

@@ -11,9 +11,14 @@
 
 final class MetadataInterfaceFactory
 {
-    public function __invoke(ContainerInterface $container): MetadataInterface&Metadata\Source
-    {
-        $adapterInterface = $container->get(AdapterInterface::class);
-        return new Metadata\Source($adapterInterface);
+    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($container->get($adapterServiceName));
     }
 }

src/Container/PlatformInterfaceFactory.php

@@ -4,29 +4,28 @@
 
 namespace PhpDb\Mysql\Container;
 
-use mysqli;
-use PDO;
-use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Platform\PlatformInterface;
+use PhpDb\Exception\ContainerException;
 use PhpDb\Mysql\AdapterPlatform;
+use PhpDb\Mysql\Driver as MysqliDriver;
+use PhpDb\Mysql\Pdo\Driver as PdoDriver;
 use Psr\Container\ContainerInterface;
 
 final class PlatformInterfaceFactory
 {
-    public function __invoke(ContainerInterface $container): PlatformInterface&AdapterPlatform
-    {
-        /** @var array $config */
-        $config = $container->get('config');
-
-        /** @var array $dbConfig */
-        $dbConfig = $config['db'] ?? [];
-
-        /** @var string $driver */
-        $driver = $dbConfig['driver'];
-
-        /** @var DriverInterface|mysqli|PDO $driverInstance */
-        $driverInstance = $container->get($driver);
-
+    public function __invoke(
+        ContainerInterface $container,
+        string $requestedName,
+        ?array $options = null
+    ): PlatformInterface&AdapterPlatform {
+        $driverInstance = $options['driver'] ?? null;
+        if (! $driverInstance instanceof MysqliDriver && ! $driverInstance instanceof PdoDriver) {
+            throw ContainerException::forService(
+                AdapterPlatform::class,
+                self::class,
+                '$options["driver"] must be an instance of ' . MysqliDriver::class . ' or ' . PdoDriver::class . '.'
+            );
+        }
         return new AdapterPlatform($driverInstance);
     }
 }

src/Container/StatementInterfaceFactory.php

@@ -10,20 +10,11 @@
 
 final class StatementInterfaceFactory
 {
-    public function __invoke(ContainerInterface $container): StatementInterface&Statement
-    {
-        /** @var array $config */
-        $config = $container->get('config');
-
-        /** @var array $dbConfig */
-        $dbConfig = $config['db'] ?? [];
-
-        /** @var array $options */
-        $options = $dbConfig['options'] ?? [];
-
-        /** @var bool $bufferResults */
-        $bufferResults = $options['buffer_results'] ?? false;
-
-        return new Statement(bufferResults: $bufferResults);
+    public function __invoke(
+        ContainerInterface $container,
+        string $requestedName,
+        ?array $options = null
+    ): StatementInterface&Statement {
+        return new Statement(bufferResults: $options['buffer_results'] ?? false);
     }
 }