X.x.2 adaptermanager delegator refactor

composer.json

@@ -33,7 +33,7 @@
     },
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
-        "php-db/phpdb": "0.0.x-dev"
+        "php-db/phpdb": "dev-x.x.2"
     },
     "require-dev": {
         "ext-mysqli": "*",

psalm-baseline.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="6.12.0@cf420941d061a57050b6c468ef2c778faf40aee2">
-  <file src="src/ConfigProvider.php">
-    <ClassMustBeFinal>
-      <code><![CDATA[ConfigProvider]]></code>
-    </ClassMustBeFinal>
-  </file>
+<files psalm-version="6.12.1@e71404b0465be25cf7f8a631b298c01c5ddd864f">
   <file src="src/Container/AdapterFactory.php">
     <UnnecessaryVarAnnotation>
       <code><![CDATA[PlatformInterface]]></code>
       <code><![CDATA[ProfilerInterface|null]]></code>
       <code><![CDATA[ResultSetInterface]]></code>
     </UnnecessaryVarAnnotation>
   </file>
+  <file src="src/Container/AdapterManagerDelegator.php">
+    <InvalidClass>
+      <code><![CDATA[ConfigProvider]]></code>
+    </InvalidClass>
+  </file>
   <file src="src/Container/MysqliResultFactory.php">
     <UnusedParam>
       <code><![CDATA[$container]]></code>

src/ConfigProvider.php

@@ -4,25 +4,82 @@
 
 namespace PhpDb\Adapter\Mysql;
 
+use Laminas\ServiceManager\Factory\InvokableFactory;
+use PhpDb\Adapter\AdapterInterface;
+use PhpDb\Adapter\Driver\DriverInterface;
+use PhpDb\Adapter\Driver\Pdo\Result;
+use PhpDb\Adapter\Driver\Pdo\Statement as PdoStatement;
+use PhpDb\Adapter\Driver\PdoDriverInterface;
+use PhpDb\Adapter\Mysql\Driver;
+use PhpDb\Adapter\Mysql\Metadata\Source\MysqlMetadata;
+use PhpDb\Adapter\Platform\PlatformInterface;
+use PhpDb\Adapter\Profiler;
 use PhpDb\Container\AdapterManager;
+use PhpDb\Container\MetadataFactory;
+use PhpDb\Metadata\MetadataInterface;
+use PhpDb\ResultSet;
 
-readonly class ConfigProvider
+final class ConfigProvider
 {
     public function __invoke(): array
     {
         return [
-            'dependencies' => $this->getDependencies(),
+            'dependencies'        => $this->getDependencies(),
+            AdapterManager::class => $this->getAdapterManagerConfig(),
         ];
     }
 
     public function getDependencies(): array
     {
         return [
+            'aliases'    => [
+                MetadataInterface::class => MysqlMetadata::class,
+            ],
+            'factories'  => [
+                MysqlMetadata::class => MetadataFactory::class,
+            ],
             'delegators' => [
                 AdapterManager::class => [
                     Container\AdapterManagerDelegator::class,
                 ],
             ],
         ];
     }
+
+    public function getAdapterManagerConfig(): array
+    {
+        return [
+            'aliases'   => [
+                'MySqli'                            => Driver\Mysqli\Mysqli::class,
+                'MySQLi'                            => Driver\Mysqli\Mysqli::class,
+                'Mysqli'                            => Driver\Mysqli\Mysqli::class,
+                'mysqli'                            => Driver\Mysqli\Mysqli::class,
+                'PDO_MySQL'                         => Driver\Pdo\Pdo::class,
+                'Pdo_MySQL'                         => Driver\Pdo\Pdo::class,
+                'Pdo_Mysql'                         => Driver\Pdo\Pdo::class,
+                'pdo_mysql'                         => Driver\Pdo\Pdo::class,
+                'pdomysql'                          => Driver\Pdo\Pdo::class,
+                'pdodriver'                         => Driver\Pdo\Pdo::class,
+                'pdo'                               => Driver\Pdo\Pdo::class,
+                DriverInterface::class              => Driver\Mysqli\Mysqli::class,
+                PdoDriverInterface::class           => Driver\Pdo\Pdo::class,
+                Profiler\ProfilerInterface::class   => Profiler\Profiler::class,
+                ResultSet\ResultSetInterface::class => ResultSet\ResultSet::class,
+            ],
+            'factories' => [
+                AdapterInterface::class         => Container\AdapterFactory::class,
+                Driver\Mysqli\Mysqli::class     => Container\MysqliDriverFactory::class,
+                Driver\Mysqli\Connection::class => Container\MysqliConnectionFactory::class,
+                Driver\Mysqli\Result::class     => Container\MysqliResultFactory::class,
+                Driver\Mysqli\Statement::class  => Container\MysqliStatementFactory::class,
+                Driver\Pdo\Pdo::class           => Container\PdoDriverFactory::class,
+                Driver\Pdo\Connection::class    => Container\PdoConnectionFactory::class,
+                Result::class                   => Container\PdoResultFactory::class,
+                PdoStatement::class             => Container\PdoStatementFactory::class,
+                PlatformInterface::class        => Container\PlatformInterfaceFactory::class,
+                Profiler\Profiler::class        => InvokableFactory::class,
+                ResultSet\ResultSet::class      => InvokableFactory::class,
+            ],
+        ];
+    }
 }

src/Container/AdapterManagerDelegator.php

@@ -5,17 +5,8 @@
 namespace PhpDb\Adapter\Mysql\Container;
 
 use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
-use Laminas\ServiceManager\Factory\InvokableFactory;
-use PhpDb\Adapter\AdapterInterface;
-use PhpDb\Adapter\Driver\DriverInterface;
-use PhpDb\Adapter\Driver\Pdo\Result;
-use PhpDb\Adapter\Driver\Pdo\Statement as PdoStatement;
-use PhpDb\Adapter\Driver\PdoDriverInterface;
-use PhpDb\Adapter\Mysql\Driver;
-use PhpDb\Adapter\Platform\PlatformInterface;
-use PhpDb\Adapter\Profiler;
+use PhpDB\Adapter\Mysql\ConfigProvider;
 use PhpDb\Container\AdapterManager;
-use PhpDb\ResultSet;
 use Psr\Container\ContainerInterface;
 
 final class AdapterManagerDelegator implements DelegatorFactoryInterface
@@ -28,39 +19,9 @@ public function __invoke(
     ): AdapterManager {
         /** @var AdapterManager $adapterManager */
         $adapterManager = $callback();
-        $adapterManager->configure([
-            'aliases'   => [
-                'MySqli'                            => Driver\Mysqli\Mysqli::class,
-                'MySQLi'                            => Driver\Mysqli\Mysqli::class,
-                'Mysqli'                            => Driver\Mysqli\Mysqli::class,
-                'mysqli'                            => Driver\Mysqli\Mysqli::class,
-                'PDO_MySQL'                         => Driver\Pdo\Pdo::class,
-                'Pdo_MySQL'                         => Driver\Pdo\Pdo::class,
-                'Pdo_Mysql'                         => Driver\Pdo\Pdo::class,
-                'pdo_mysql'                         => Driver\Pdo\Pdo::class,
-                'pdomysql'                          => Driver\Pdo\Pdo::class,
-                'pdodriver'                         => Driver\Pdo\Pdo::class,
-                'pdo'                               => Driver\Pdo\Pdo::class,
-                DriverInterface::class              => Driver\Mysqli\Mysqli::class,
-                PdoDriverInterface::class           => Driver\Pdo\Pdo::class,
-                Profiler\ProfilerInterface::class   => Profiler\Profiler::class,
-                ResultSet\ResultSetInterface::class => ResultSet\ResultSet::class,
-            ],
-            'factories' => [
-                AdapterInterface::class         => AdapterFactory::class,
-                Driver\Mysqli\Mysqli::class     => MysqliDriverFactory::class,
-                Driver\Mysqli\Connection::class => MysqliConnectionFactory::class,
-                Driver\Mysqli\Result::class     => MysqliResultFactory::class,
-                Driver\Mysqli\Statement::class  => MysqliStatementFactory::class,
-                Driver\Pdo\Pdo::class           => PdoDriverFactory::class,
-                Driver\Pdo\Connection::class    => PdoConnectionFactory::class,
-                Result::class                   => PdoResultFactory::class,
-                PdoStatement::class             => PdoStatementFactory::class,
-                PlatformInterface::class        => PlatformInterfaceFactory::class,
-                Profiler\Profiler::class        => InvokableFactory::class,
-                ResultSet\ResultSet::class      => InvokableFactory::class,
-            ],
-        ]);
+        $adapterManager->configure(
+            (new ConfigProvider())->getAdapterManagerConfig()
+        );
 
         return $adapterManager;
     }

src/Container/MysqlMetadataFactory.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Adapter\Mysql\Container;
+
+use PhpDb\Adapter\AdapterInterface;
+use PhpDb\Adapter\Mysql\Metadata\Source\MysqlMetadata;
+use PhpDb\Adapter\SchemaAwareInterface;
+use PhpDb\Metadata\MetadataInterface;
+use Psr\Container\ContainerInterface;
+
+final class MysqlMetadataFactory
+{
+    public function __invoke(ContainerInterface $container): MetadataInterface&MysqlMetadata
+    {
+        /** @var AdapterInterface&SchemaAwareInterface $adapter */
+        $adapter = $container->get(AdapterInterface::class);
+
+        return new MysqlMetadata(
+            $adapter
+        );
+    }
+}

test/integration/Container/MysqlMetadataFactoryTest.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDbIntegrationTest\Adapter\Mysql\Container;
+
+use PhpDb\Adapter\Mysql\Container\MysqlMetadataFactory;
+use PhpDb\Adapter\Mysql\Metadata\Source\MysqlMetadata;
+use PhpDb\Metadata\MetadataInterface;
+use PhpDbIntegrationTest\Adapter\Mysql\Container\TestAsset\SetupTrait;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\CoversMethod;
+use PHPUnit\Framework\TestCase;
+
+#[CoversClass(MysqlMetadataFactory::class)]
+#[CoversMethod(MysqlMetadataFactory::class, '__invoke')]
+final class MysqlMetadataFactoryTest extends TestCase
+{
+    use SetupTrait;
+
+    public function testFactoryReturnsMysqlMetadata(): void
+    {
+        $factory  = new MysqlMetadataFactory();
+        $metadata = $factory($this->container);
+        self::assertInstanceOf(MetadataInterface::class, $metadata);
+        self::assertInstanceOf(MysqlMetadata::class, $metadata);
+    }
+}