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

Author: tyrsson

src/Container/AdapterFactory.php

@@ -5,11 +5,11 @@
 namespace Laminas\Db\Adapter\Mysql\Container;
 
 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;
 use Laminas\Db\Container\AdapterManager;
+use Laminas\Db\ResultSet\ResultSetInterface;
 use Psr\Container\ContainerInterface;
 
 final class AdapterFactory
@@ -21,7 +21,7 @@ public function __invoke(ContainerInterface $container): Adapter
         return new Adapter(
             $adapterManager->get(DriverInterface::class),
             $adapterManager->get(PlatformInterface::class),
-            $adapterManager->get(ResultInterface::class),
+            $adapterManager->get(ResultSetInterface::class),
             $adapterManager->get(ProfilerInterface::class)
         );
     }

src/Container/AdapterManagerDelegator.php

@@ -11,6 +11,7 @@
 use Laminas\Db\Adapter\Platform\PlatformInterface;
 use Laminas\Db\Adapter\Profiler;
 use Laminas\Db\Container\AdapterManager;
+use Laminas\Db\ResultSet\ResultSetInterface;
 use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
 use Laminas\ServiceManager\Factory\InvokableFactory;
 use Psr\Container\ContainerInterface;
@@ -35,6 +36,7 @@ public function __invoke(
                 PlatformInterface::class   => PlatformInterfaceFactory::class,
                 Profiler\Profiler::class   => InvokableFactory::class,
                 ResultInterface::class     => ResultInterfaceFactory::class,
+                ResultSetInterface::class  => InvokableFactory::class,
             ],
         ]);
 

src/Container/InterfaceFactoryTrait.php

@@ -26,14 +26,19 @@ private function getConnection(AdapterManager $adapterManager): ConnectionInterf
         return new Driver\Mysqli\Connection($config);
     }
 
+    // todo: pull the ResultInterface from the adapter manager and pass it to the driver
     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\Pdo\Pdo(
+                $adapterManager->get(ConnectionInterface::class)
+            );
         }
-        return new Driver\Mysqli\Mysqli($adapterManager->get(ConnectionInterface::class));
+        return new Driver\Mysqli\Mysqli(
+            $adapterManager->get(ConnectionInterface::class)
+        );
     }
 
     private function getResult(AdapterManager $adapterManager): ResultInterface