QA fixes

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

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

Author: tyrsson

src/ConfigProvider.php

@@ -6,7 +6,7 @@
 
 final class ConfigProvider
 {
-    public final const NAMED_ADAPTER_KEY = 'adapters';
+    public const NAMED_ADAPTER_KEY = 'adapters';
     public function __invoke(): array
     {
         return [
@@ -33,7 +33,7 @@ public function getDependencies(): array
     {
         return [
             'abstract_factories' => [
-                Container\AdapterAbstractServiceFactory::class,
+                Container\AbstractAdapterInterfaceFactory::class,
             ],
             'aliases'            => [
                 Adapter\AdapterInterface::class => Adapter\Adapter::class,

src/Container/AbstractAdapterInterfaceFactory.php

@@ -15,7 +15,6 @@
 use PhpDb\ConfigProvider;
 use PhpDb\Exception\ContainerException;
 use PhpDb\ResultSet\ResultSetInterface;
-use PSpell\Config;
 use Psr\Container\ContainerInterface;
 
 use function is_array;
@@ -52,10 +51,11 @@ public function canCreate(ContainerInterface $container, $requestedName): bool
     /**
      * Create a DB adapter
      *
+     * @phpstan-param ContainerInterface&ServiceManager $container
      * @param string $requestedName
      */
     public function __invoke(
-        ContainerInterface&ServiceManager $container,
+        ContainerInterface|ServiceManager $container,
         $requestedName,
         ?array $options = null
     ): AdapterInterface&Adapter {
@@ -72,7 +72,7 @@ public function __invoke(
 
         /** @var DriverInterface|PdoDriverInterface $driver */
         $driver = $container->build($driverClass, $this->config[$requestedName]);
-        /** @var PlatformInterface&Pgsql\AdapterPlatform $platform */
+        /** @var PlatformInterface $platform */
         $platform = $container->build(PlatformInterface::class, ['driver' => $driver]);
         /** @var ResultSetInterface|null $resultSet */
         $resultSet = $container->has(ResultSetInterface::class)

src/Container/ConnectionInterfaceFactoryFactoryInterface.php

@@ -7,6 +7,8 @@
 use Psr\Container\ContainerExceptionInterface;
 use RuntimeException as SplRuntimeException;
 
+use function sprintf;
+
 final class ContainerException extends SplRuntimeException implements ContainerExceptionInterface
 {
     public static function forService(
@@ -17,9 +19,9 @@ public static function forService(
         return new self(
             sprintf(
                 'Failed to create service "%s" in factory %s Reason: %s',
-                 $serviceName,
-                 $factoryClass,
-                 $reason
+                $serviceName,
+                $factoryClass,
+                $reason
             ),
             0,
         );

src/Container/DriverInterfaceFactoryFactoryInterface.php

@@ -0,0 +1,102 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDbTest\Adapter\Container;
+
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\ServiceManager\ServiceManager;
+use Override;
+use PhpDb\Adapter\AdapterInterface;
+use PhpDb\Adapter\Driver\PdoDriverInterface;
+use PhpDb\Adapter\Platform\PlatformInterface;
+use PhpDb\Container\AbstractAdapterInterfaceFactory;
+use PhpDbTest\TestAsset\PdoStubDriver;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
+
+final class AbstractAdapterInterfaceFactoryTest extends TestCase
+{
+    private ContainerInterface|ServiceManager $serviceManager;
+
+    #[Override]
+    protected function setUp(): void
+    {
+        /** @var PdoDriverInterface&MockObject $pdoDriverInterfaceMock */
+        $pdoDriverInterfaceMock = $this->getMockBuilder(PdoDriverInterface::class)->getMock();
+        /** @var PlatformInterface&MockObject $platformMock */
+        $platformMock = $this->getMockBuilder(PlatformInterface::class)->getMock();
+
+        $config = [
+            'abstract_factories' => [AbstractAdapterInterfaceFactory::class],
+            'factories'          => [
+                PdoStubDriver::class     => static function (
+                    ContainerInterface $container
+                ) use ($pdoDriverInterfaceMock): PdoDriverInterface {
+                    return $pdoDriverInterfaceMock;
+                },
+                PlatformInterface::class => static function (
+                    ContainerInterface $container
+                ) use ($platformMock): PlatformInterface {
+                    return $platformMock;
+                },
+            ],
+        ];
+
+        $this->serviceManager = new ServiceManager($config);
+
+        $this->serviceManager->setService('config', [
+            AdapterInterface::class => [
+                'adapters' => [
+                    'PhpDb\Adapter\Writer' => [
+                        'driver' => PdoStubDriver::class,
+                    ],
+                    'PhpDb\Adapter\Reader' => [
+                        'driver' => PdoStubDriver::class,
+                    ],
+                ],
+            ],
+        ]);
+    }
+
+    public static function providerValidService(): array
+    {
+        return [
+            ['PhpDb\Adapter\Writer'],
+            ['PhpDb\Adapter\Reader'],
+        ];
+    }
+
+    public static function providerInvalidService(): array
+    {
+        return [
+            ['PhpDb\Adapter\Unknown'],
+        ];
+    }
+
+    /**
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    #[DataProvider('providerValidService')]
+    public function testValidService(string $service): void
+    {
+        $actual = $this->serviceManager->get($service);
+        self::assertInstanceOf(AdapterInterface::class, $actual);
+    }
+
+    /**
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    #[DataProvider('providerInvalidService')]
+    public function testInvalidService(string $service): void
+    {
+        $this->expectException(ServiceNotFoundException::class);
+        $this->serviceManager->get($service);
+    }
+}