Refactor

Aligning with laminas-db
Adds additional factories
Signed-off-by: Joey Smith <jsmith@webinertia.net>

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

Author: tyrsson

src/ConfigProvider.php

@@ -2,12 +2,7 @@
 
 namespace Laminas\Db\Adapter\Mysql;
 
-use Laminas\Db\Adapter\AdapterAbstractServiceFactory;
-use Laminas\Db\Adapter\AdapterInterface;
-use Laminas\Db\Adapter\AdapterServiceFactory;
 use Laminas\Db\Container\AdapterManager;
-use Laminas\Db\Container\MetadataFactory;
-use Laminas\Db\Metadata\MetadataInterface;
 
 readonly class ConfigProvider
 {
@@ -21,22 +16,11 @@ public function __invoke(): array
     public function getDependencies(): array
     {
         return [
-            // 'abstract_factories' => [
-            //     AdapterAbstractServiceFactory::class,
-            // ],
-            'aliases'            => [
-                AdapterInterface::class  => Adapter::class,
-                //MetadataInterface::class => Metadata\Source\MysqlMetadata::class,
-            ],
-            'delegators'         => [
+            'delegators' => [
                 AdapterManager::class => [
                     Container\AdapterManagerDelegator::class,
                 ],
             ],
-            'factories'          => [
-                Adapter::class => Container\AdapterFactory::class,
-                //Metadata\Source\MysqlMetadata::class => MetadataFactory::class,
-            ],
         ];
     }
 }

src/Container/AdapterFactory.php

@@ -4,8 +4,8 @@
 
 namespace Laminas\Db\Adapter\Mysql\Container;
 
-use Laminas\Db\Adapter\ConfigInterface;
 use Laminas\Db\Adapter\Driver\DriverInterface;
+use Laminas\Db\Adapter\Driver\ResultInterface;
 use Laminas\Db\Adapter\Mysql\Adapter;
 use Laminas\Db\Adapter\Platform\PlatformInterface;
 use Laminas\Db\Adapter\Profiler\ProfilerInterface;
@@ -16,16 +16,13 @@ final class AdapterFactory
 {
     public function __invoke(ContainerInterface $container): Adapter
     {
-        // $adapter = new Adapter($container->get('config')['db']);
-        // $adapter->setDriver($container->get('db_driver'));
-        // $adapter->setPlatform($container->get('db_platform'));
-        $manager = $container->get(AdapterManager::class);
-        $config  = $manager->get(ConfigInterface::class);
+        /** @var AdapterManager $adapterManager */
+        $adapterManager = $container->get(AdapterManager::class);
         return new Adapter(
-            $manager->get(DriverInterface::class),
-            $manager->get(PlatformInterface::class),
-            null, // needs added to AdapterManager allowed services
-            $manager->get(ProfilerInterface::class)
+            $adapterManager->get(DriverInterface::class),
+            $adapterManager->get(PlatformInterface::class),
+            $adapterManager->get(ResultInterface::class),
+            $adapterManager->get(ProfilerInterface::class)
         );
     }
 }

src/Container/AdapterManagerDelegator.php

@@ -7,9 +7,12 @@
 use Laminas\Db\Adapter\AdapterInterface;
 use Laminas\Db\Adapter\Driver\ConnectionInterface;
 use Laminas\Db\Adapter\Driver\DriverInterface;
+use Laminas\Db\Adapter\Driver\ResultInterface;
 use Laminas\Db\Adapter\Platform\PlatformInterface;
+use Laminas\Db\Adapter\Profiler;
 use Laminas\Db\Container\AdapterManager;
 use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
+use Laminas\ServiceManager\Factory\InvokableFactory;
 use Psr\Container\ContainerInterface;
 
 final class AdapterManagerDelegator implements DelegatorFactoryInterface
@@ -22,11 +25,16 @@ public function __invoke(
     ): AdapterManager {
         $adapterManager = $callback();
         $adapterManager->configure([
+            'aliases'   => [
+                Profiler\ProfilerInterface::class => Profiler\Profiler::class,
+            ],
             'factories' => [
                 AdapterInterface::class    => AdapterFactory::class,
                 ConnectionInterface::class => ConnectionInterfaceFactory::class,
                 DriverInterface::class     => DriverInterfaceFactory::class,
-                PlatformInterface::class   => PlatformFactory::class
+                PlatformInterface::class   => PlatformInterfaceFactory::class,
+                Profiler\Profiler::class   => InvokableFactory::class,
+                ResultInterface::class     => ResultInterfaceFactory::class,
             ],
         ]);
 

src/Container/ConnectionInterfaceFactory.php

@@ -5,35 +5,16 @@
 namespace Laminas\Db\Adapter\Mysql\Container;
 
 use Laminas\Db\Adapter\Driver\ConnectionInterface;
-use Laminas\Db\Adapter\Exception\RuntimeException;
 use Laminas\Db\Container\AdapterManager;
-use Laminas\Db\Adapter\Mysql\Driver;
-use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
 use Psr\Container\ContainerInterface;
 
-use function strtolower;
-
 final class ConnectionInterfaceFactory
 {
-    public function __invoke(
-        ContainerInterface $container
-    ): ConnectionInterface {
-        $manager    = $container->get(AdapterManager::class);
-        $connection = $this->getConnection($manager->get('db'));
-        return $connection;
-    }
+    use InterfaceFactoryTrait;
 
-    private function getConnection(array $config): ConnectionInterface
-    {
-        // Got to have this to determine the driver type
-        return match(strtolower($config['driver'])) {
-            'pdo_mysql',
-            'pdomysql',
-            'pdo'    => new Driver\Pdo\Connection($config),
-            'mysqli' => new Driver\Mysqli\Connection($config),
-            default  => throw new ServiceNotCreatedException(
-                'Connection type can not be determined from provided driver: ' . $config['driver']
-            ),
-        };
+    public function __invoke(ContainerInterface $container): ConnectionInterface {
+        /** @var AdapterManager $adapterManager */
+        $adapterManager = $container->get(AdapterManager::class);
+        return $this->getConnection($adapterManager);
     }
 }

src/Container/DriverInterfaceFactory.php

@@ -4,35 +4,18 @@
 
 namespace Laminas\Db\Adapter\Mysql\Container;
 
-use Laminas\Db\Adapter\Driver\ConnectionInterface;
 use Laminas\Db\Adapter\Driver\DriverInterface;
-use Laminas\Db\Adapter\Mysql\Driver;
 use Laminas\Db\Container\AdapterManager;
-use Laminas\Db\Adapter\Exception\RuntimeException;
-use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
 use Psr\Container\ContainerInterface;
 
 final class DriverInterfaceFactory
 {
-    public function __invoke(ContainerInterface $container): DriverInterface
-    {
-        $manager = $container->get(AdapterManager::class);
-        return $this->getDriver($manager);
-    }
+    use InterfaceFactoryTrait;
 
-    private function getDriver(AdapterManager $manager): DriverInterface
+    public function __invoke(ContainerInterface $container): DriverInterface
     {
-        $config = $manager->get('db');
-        // Got to have this to determine the driver type
-
-        return match (strtolower($config['driver'])) {
-            'pdo_mysql',
-            'pdomysql',
-            'pdo'    => new Driver\Pdo\Pdo($manager->get(ConnectionInterface::class)),
-            'mysqli' => new Driver\Mysqli\Mysqli($manager->get(ConnectionInterface::class)),
-            default  => throw new ServiceNotCreatedException(
-                'Driver type can not be determined from provided driver: ' . $config['driver']
-            ),
-        };
+        /** @var AdapterManager $adapterManager */
+        $adapterManager = $container->get(AdapterManager::class);
+        return $this->getDriver($adapterManager);
     }
 }

src/Container/InterfaceFactoryTrait.php

@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Laminas\Db\Adapter\Mysql\Container;
+
+use Laminas\Db\Adapter\Driver\ConnectionInterface;
+use Laminas\Db\Adapter\Driver\DriverInterface;
+use Laminas\Db\Adapter\Driver\ResultInterface;
+use Laminas\Db\Adapter\Driver\Pdo\Result;
+use Laminas\Db\Adapter\Mysql\Driver;
+use Laminas\Db\Container\AdapterManager;
+use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
+
+use function strtolower;
+
+trait InterfaceFactoryTrait
+{
+    private function getConnection(AdapterManager $adapterManager): ConnectionInterface
+    {
+        $config = $adapterManager->get('db');
+
+        if ($this->isPdo($config['driver'])) {
+            return new Driver\Pdo\Connection($config);
+        }
+        return new Driver\Mysqli\Connection($config);
+    }
+
+    private function getDriver(AdapterManager $adapterManager): DriverInterface
+    {
+        $config = $adapterManager->get('db');
+
+        if ($this->isPdo($config['driver'])) {
+            return new Driver\Pdo\Pdo($adapterManager->get(ConnectionInterface::class));
+        }
+        return new Driver\Mysqli\Mysqli($adapterManager->get(ConnectionInterface::class));
+    }
+
+    private function getResult(AdapterManager $adapterManager): ResultInterface
+    {
+        $config = $adapterManager->get('db');
+
+        if ($this->isPdo($config['driver'])) {
+            return new Result();
+        }
+        return new Driver\Mysqli\Result();
+    }
+
+    private function isPdo(string $driver): bool
+    {
+        return match (strtolower($driver)) {
+            'pdo_mysql',
+            'pdomysql',
+            'pdo'    => true,
+            'mysqli' => false,
+            default  => throw new ServiceNotCreatedException(
+                'Driver type can not be determined from provided driver: ' . $driver
+            ),
+        };
+    }
+}

src/Container/PlatformInterfaceFactory.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Laminas\Db\Adapter\Mysql\Container;
+
+use Laminas\Db\Adapter\Driver\DriverInterface;
+use Laminas\Db\Adapter\Platform\PlatformInterface;
+use Laminas\Db\Adapter\Mysql\Platform\Mysql;
+use Laminas\Db\Container\AdapterManager;
+use Psr\Container\ContainerInterface;
+
+final class PlatformInterfaceFactory
+{
+    public function __invoke(ContainerInterface $container): PlatformInterface
+    {
+        /** @var AdapterManager $manager */
+        $adapterManager = $container->get(AdapterManager::class);
+        return new Mysql($adapterManager->get(DriverInterface::class));
+    }
+}

src/Container/ResultInterfaceFactory.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Laminas\Db\Adapter\Mysql\Container;
+
+use Laminas\Db\Adapter\Driver\ResultInterface;
+use Laminas\Db\Container\AdapterManager;
+use Psr\Container\ContainerInterface;
+
+final class ResultInterfaceFactory
+{
+    use InterfaceFactoryTrait;
+
+    public function __invoke(ContainerInterface $container): ResultInterface
+    {
+        /** @var AdapterManager $adapterManager */
+        $adapterManager = $container->get(AdapterManager::class);
+        return $this->getResult($adapterManager);
+    }
+}