Merge pull request #90 from tyrsson/explore-adapter-manager-removal

This commit removes the adapter manager and rewires dependency mapping to target the service container directly.

Author: tyrsson

composer.json

@@ -30,7 +30,7 @@
     },
     "require": {
         "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
-        "laminas/laminas-servicemanager": "^4.0.0",
+        "laminas/laminas-servicemanager": "^3.0.0 || ^4.0.0",
         "laminas/laminas-stdlib": "^3.20.0"
     },
     "require-dev": {

src/ConfigProvider.php

@@ -15,11 +15,6 @@ public function __invoke(): array
 
     public function getDependencies(): array
     {
-        return [
-            'factories' => [
-                Adapter\AdapterInterface::class => Container\AdapterServiceFactory::class,
-                Container\AdapterManager::class => Container\AdapterManagerFactory::class,
-            ],
-        ];
+        return [];
     }
 }

src/Container/AdapterAbstractServiceFactory.php

@@ -45,16 +45,15 @@ public function __invoke(
         string $requestedName,
         ?array $options = null
     ): AdapterInterface {
-        $manager         = $container->get(AdapterManager::class);
-        $driverFactory   = ($manager->get(DriverInterfaceFactoryFactoryInterface::class))($container, $requestedName);
+        $driverFactory   = ($container->get(DriverInterfaceFactoryFactoryInterface::class))($container, $requestedName);
         $driverInstance  = $driverFactory::createFromConfig($container, $requestedName);
-        $platformFactory = ($manager->get(PlatformInterfaceFactoryFactoryInterface::class))();
+        $platformFactory = ($container->get(PlatformInterfaceFactoryFactoryInterface::class))();
 
         //$config = $this->getConfig($container);
         return new Adapter(
             $driverInstance,
             $platformFactory::fromDriver($driverInstance),
-            $manager->get(ResultSetInterface::class),
+            $container->get(ResultSetInterface::class),
         );
     }