Removes all usage of adapter manager and removes unused use statements.

tyrsson · tyrsson · commit 49f13c6bf4a8 · 2025-11-23T10:29:08.000-06:00
Signed-off-by: Joey Smith &lt;jsmith@webinertia.net&gt;

Signed-off-by: Joey Smith &lt;jsmith@webinertia.net&gt;
diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -18,7 +18,6 @@
 use PhpDb\Adapter\Profiler\Profiler;
 use PhpDb\Adapter\Profiler\ProfilerInterface;
 use PhpDb\Container\AdapterAbstractServiceFactory;
-use PhpDb\Container\AdapterManager;
 use PhpDb\Container\ConnectionInterfaceFactoryFactoryInterface;
 use PhpDb\Container\DriverInterfaceFactoryFactoryInterface;
 use PhpDb\Container\PlatformInterfaceFactoryFactoryInterface;
@@ -30,8 +29,7 @@ final class ConfigProvider
     public function __invoke(): array
     {
         return [
-            'dependencies'        => $this->getDependencies(),
-            AdapterManager::class => $this->getAdapterManagerConfig(),
+            'dependencies' => $this->getDependencies(),
         ];
     }
 
@@ -42,23 +40,6 @@ public function getDependencies(): array
                 AdapterAbstractServiceFactory::class,
             ],
             'aliases'            => [
-                MetadataInterface::class => Metadata\Source\SqliteMetadata::class,
-            ],
-            'factories'          => [
-                Metadata\Source\SqliteMetadata::class => Container\MetadataInterfaceFactory::class,
-            ],
-            'delegators'         => [
-                AdapterManager::class => [
-                    Container\AdapterManagerDelegator::class,
-                ],
-            ],
-        ];
-    }
-
-    public function getAdapterManagerConfig(): array
-    {
-        return [
-            'aliases'    => [
                 'SQLite'                                          => Driver\Pdo\Pdo::class,
                 'Sqlite'                                          => Driver\Pdo\Pdo::class,
                 'sqlite'                                          => Driver\Pdo\Pdo::class,
@@ -78,8 +59,9 @@ public function getAdapterManagerConfig(): array
                 ConnectionInterfaceFactoryFactoryInterface::class => Container\ConnectionInterfaceFactoryFactory::class,
                 DriverInterfaceFactoryFactoryInterface::class     => Container\DriverInterfaceFactoryFactory::class,
                 PlatformInterfaceFactoryFactoryInterface::class   => Container\PlatformInterfaceFactoryFactory::class,
+                MetadataInterface::class => Metadata\Source\SqliteMetadata::class,
             ],
-            'factories'  => [
+            'factories'          => [
                 AdapterInterface::class      => Container\AdapterFactory::class,
                 Driver\Pdo\Connection::class => Container\PdoConnectionFactory::class,
                 Driver\Pdo\Pdo::class        => Container\PdoDriverFactory::class,
@@ -88,8 +70,9 @@ public function getAdapterManagerConfig(): array
                 Platform\Sqlite::class       => Container\PlatformInterfaceFactory::class,
                 Profiler::class              => InvokableFactory::class,
                 ResultSet\ResultSet::class   => InvokableFactory::class,
+                Metadata\Source\SqliteMetadata::class => Container\MetadataInterfaceFactory::class,
             ],
-            'invokables' => [
+            'invokables'         => [
                 Container\ConnectionInterfaceFactoryFactory::class
                     => Container\ConnectionInterfaceFactoryFactory::class,
                 Container\DriverInterfaceFactoryFactory::class
diff --git a/src/Container/AdapterFactory.php b/src/Container/AdapterFactory.php
@@ -12,7 +12,6 @@
 use PhpDb\Adapter\Exception\RuntimeException;
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Adapter\Profiler\ProfilerInterface;
-use PhpDb\Container\AdapterManager;
 use PhpDb\ResultSet\ResultSetInterface;
 use Psr\Container\ContainerInterface;
 
@@ -22,9 +21,6 @@ final class AdapterFactory
 {
     public function __invoke(ContainerInterface $container): AdapterInterface
     {
-        /** @var AdapterManager $adapterManager */
-        $adapterManager = $container->get(AdapterManager::class);
-
         /** @var array $config */
         $config = $container->get('config');
 
@@ -38,39 +34,39 @@ public function __invoke(ContainerInterface $container): AdapterInterface
         /** @var string $driver */
         $driver = $dbConfig['driver'];
 
-        if (! $adapterManager->has($driver)) {
+        if (! $container->has($driver)) {
             throw new ServiceNotFoundException(sprintf(
                 'Database driver "%s" is not registered in the adapter manager.',
                 $driver
             ));
         }
 
         /** @var DriverInterface|PdoDriverInterface $driverInstance */
-        $driverInstance = $adapterManager->get($driver);
+        $driverInstance = $container->get($driver);
 
-        if (! $adapterManager->has(PlatformInterface::class)) {
+        if (! $container->has(PlatformInterface::class)) {
             throw new ServiceNotFoundException(sprintf(
                 'Database platform "%s" is not registered in the adapter manager.',
                 PlatformInterface::class
             ));
         }
 
         /** @var PlatformInterface $platformInstance */
-        $platformInstance = $adapterManager->get(PlatformInterface::class);
+        $platformInstance = $container->get(PlatformInterface::class);
 
-        if (! $adapterManager->has(ResultSetInterface::class)) {
+        if (! $container->has(ResultSetInterface::class)) {
             throw new ServiceNotFoundException(sprintf(
                 'ResultSet "%s" is not registered in the adapter manager.',
                 ResultSetInterface::class
             ));
         }
 
         /** @var ResultSetInterface $resultSetInstance */
-        $resultSetInstance = $adapterManager->get(ResultSetInterface::class);
+        $resultSetInstance = $container->get(ResultSetInterface::class);
 
         /** @var ProfilerInterface|null $profilerInstanceOrNull */
-        $profilerInstanceOrNull = $adapterManager->has(ProfilerInterface::class)
-                ? $adapterManager->get(ProfilerInterface::class)
+        $profilerInstanceOrNull = $container->has(ProfilerInterface::class)
+                ? $container->get(ProfilerInterface::class)
                 : null;
 
         return new Adapter(
diff --git a/src/Container/AdapterManagerDelegator.php b/src/Container/AdapterManagerDelegator.php
diff --git a/src/Container/ConnectionInterfaceFactoryFactory.php b/src/Container/ConnectionInterfaceFactoryFactory.php
@@ -5,7 +5,6 @@
 namespace PhpDb\Adapter\Sqlite\Container;
 
 use PhpDb\Adapter\Sqlite\Driver\Pdo\Pdo;
-use PhpDb\Container\AdapterManager;
 use PhpDb\Container\ConnectionInterfaceFactoryFactoryInterface as FactoryFactoryInterface;
 use Psr\Container\ContainerInterface;
 use RuntimeException;
@@ -26,7 +25,7 @@ public function __invoke(
                 $requestedName
             ));
         }
-        $adapterServices  = $container->get('config')[AdapterManager::class];
+        $adapterServices  = $container->get('config')['dependencies'];
         $configuredDriver = $adapterConfig[$requestedName]['driver'];
         if (array_key_exists($configuredDriver, $adapterServices['aliases'])) {
             $aliasTo = $adapterServices['aliases'][$configuredDriver];
diff --git a/src/Container/DriverInterfaceFactoryFactory.php b/src/Container/DriverInterfaceFactoryFactory.php
@@ -4,7 +4,6 @@
 
 namespace PhpDb\Adapter\Sqlite\Container;
 
-use PhpDb\Container\AdapterManager;
 use PhpDb\Container\DriverInterfaceFactoryFactoryInterface as FactoryFactoryInterface;
 use Psr\Container\ContainerInterface;
 use RuntimeException;
@@ -24,7 +23,7 @@ public function __invoke(
                 $requestedName
             ));
         }
-        $adapterServices = $container->get('config')[AdapterManager::class];
+        $adapterServices = $container->get('config')['dependencies'];
 
         $configuredDriver = $adapterConfig[$requestedName]['driver'];
         $aliasTo        ??= $adapterServices['aliases'][$configuredDriver] ?? $configuredDriver;
diff --git a/src/Container/PdoDriverFactory.php b/src/Container/PdoDriverFactory.php
@@ -13,24 +13,21 @@
 use PhpDb\Adapter\Sqlite\Driver\Pdo\Connection;
 use PhpDb\Adapter\Sqlite\Driver\Pdo\Feature\SqliteRowCounter;
 use PhpDb\Adapter\Sqlite\Driver\Pdo\Pdo as PdoDriver;
-use PhpDb\Container\AdapterManager;
 use Psr\Container\ContainerInterface;
 
 final class PdoDriverFactory
 {
     public function __invoke(ContainerInterface $container): PdoDriverInterface&PdoDriver
     {
-        /** @var AdapterManager $adapterManager */
-        $adapterManager = $container->get(AdapterManager::class);
 
         /** @var ConnectionInterface&Connection $connectionInstance */
-        $connectionInstance = $adapterManager->get(Connection::class);
+        $connectionInstance = $container->get(Connection::class);
 
         /** @var StatementInterface&Statement $statementInstance */
-        $statementInstance = $adapterManager->get(Statement::class);
+        $statementInstance = $container->get(Statement::class);
 
         /** @var ResultInterface&Result $resultInstance */
-        $resultInstance = $adapterManager->get(Result::class);
+        $resultInstance = $container->get(Result::class);
 
         return new PdoDriver(
             $connectionInstance,
@@ -44,20 +41,19 @@ public static function createFromConfig(
         ContainerInterface $container,
         string $requestedName,
     ): PdoDriverInterface&PdoDriver {
-        /** @var AdapterManager $adapterManager */
-        $adapterManager    = $container->get(AdapterManager::class);
+
         $connectionFactory = (
-            $adapterManager->get(ConnectionInterfaceFactoryFactory::class)
+            $container->get(ConnectionInterfaceFactoryFactory::class)
         )($container, $requestedName);
 
         /** @var ConnectionInterface&Connection $connectionInstance */
         $connectionInstance = $connectionFactory::createFromConfig($container, $requestedName);
 
         /** @var StatementInterface&Statement $statementInstance */
-        $statementInstance = $adapterManager->get(Statement::class);
+        $statementInstance = $container->get(Statement::class);
 
         /** @var ResultInterface&Result $resultInstance */
-        $resultInstance = $adapterManager->get(Result::class);
+        $resultInstance = $container->get(Result::class);
 
         return new PdoDriver(
             $connectionInstance,
diff --git a/src/Container/PlatformInterfaceFactory.php b/src/Container/PlatformInterfaceFactory.php
@@ -8,16 +8,12 @@
 use PhpDb\Adapter\Driver\PdoDriverInterface;
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Adapter\Sqlite\Platform\Sqlite;
-use PhpDb\Container\AdapterManager;
 use Psr\Container\ContainerInterface;
 
 final class PlatformInterfaceFactory
 {
     public function __invoke(ContainerInterface $container): PlatformInterface&Sqlite
     {
-        /** @var AdapterManager $adapterManager */
-        $adapterManager = $container->get(AdapterManager::class);
-
         /** @var array $config */
         $config = $container->get('config');
 
@@ -28,7 +24,7 @@ public function __invoke(ContainerInterface $container): PlatformInterface&Sqlit
         $driver = $dbConfig['driver'];
 
         /** @var PdoDriverInterface|PDO $driverInstance */
-        $driverInstance = $adapterManager->get($driver);
+        $driverInstance = $container->get($driver);
 
         return new Sqlite($driverInstance);
     }
