Merge pull request #127 from tyrsson/fix-ambigious-factory-exception-message

tweaks to factory exception message

Author: tyrsson

composer.lock

@@ -7,25 +7,11 @@
 final class ConfigProvider
 {
     public const NAMED_ADAPTER_KEY = 'adapters';
-    public function __invoke(): array
-    {
-        return [
-            'dependencies'                  => $this->getDependencies(),
-            Adapter\AdapterInterface::class => $this->getConfig(),
-        ];
-    }
 
-    public function getConfig(): array
+    public function __invoke(): array
     {
-        // supported configuration structure
         return [
-            // Adapter\Adapter::class          => [],
-            // Adapter\AdapterInterface::class => [],
-            // self::NAMED_ADAPTER_KEY         => [
-            //     Adapter\Adapter::class          => [],
-            //     Adapter\AdapterInterface::class => [],
-            //     'Custom\Name'                   => [],
-            // ],
+            'dependencies' => $this->getDependencies(),
         ];
     }
 

src/ConfigProvider.php

@@ -29,6 +29,7 @@ public function __invoke(
                 'Container is missing a config service'
             );
         }
+
         $config        = $container->get('config') ?? [];
         $adapterConfig = $config[AdapterInterface::class] ?? $config[Adapter::class] ?? [];
 
@@ -43,14 +44,6 @@ public function __invoke(
         /** @var class-string<DriverInterface>|class-string<PdoDriverInterface>|null $driverClass */
         $driverClass = $adapterConfig['driver'] ?? null;
 
-        if ($driverClass === null || ! $container->has($driverClass)) {
-            throw ContainerException::forService(
-                AdapterInterface::class,
-                self::class,
-                'Invalid or missing driver provided for ' . $requestedName
-            );
-        }
-
         /** @var DriverInterface|PdoDriverInterface $driver */
         $driver = $container->build($driverClass, $adapterConfig);
 

src/Container/AdapterInterfaceFactory.php

@@ -21,8 +21,7 @@ class ConfigProviderTest extends TestCase
      * }
      * */
     private array $config = [
-        Adapter\AdapterInterface::class => [],
-        'dependencies'                  => [
+        'dependencies' => [
             'abstract_factories' => [
                 Container\AbstractAdapterInterfaceFactory::class,
             ],