php-db · tyrsson · Dec 1, 2025 · Dec 1, 2025 · Dec 1, 2025 · Dec 1, 2025
diff --git a/composer.json b/composer.json
@@ -32,8 +32,8 @@
         }
     },
     "require": {
-        "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
-        "php-db/phpdb": "^0.2.1"
+        "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
+        "php-db/phpdb": "^0.3.2"
     },
     "require-dev": {
         "ext-mysqli": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -6,18 +6,6 @@ parameters:
 			count: 1
 			path: src/Container/DriverInterfaceFactoryFactory.php
 
-		-
-			message: '#^Cannot call static method createFromConfig\(\) on callable\.$#'
-			identifier: staticMethod.nonObject
-			count: 1
-			path: src/Container/MysqliDriverFactory.php
-
-		-
-			message: '#^Cannot call static method createFromConfig\(\) on callable\.$#'
-			identifier: staticMethod.nonObject
-			count: 1
-			path: src/Container/PdoDriverFactory.php
-
 		-
 			message: '#^Method PhpDb\\Adapter\\Profiler\\ProfilerInterface\:\:profilerFinish\(\) invoked with 1 parameter, 0 required\.$#'
 			identifier: arguments.count

diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -15,10 +15,8 @@
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Adapter\Profiler;
 use PhpDb\Container\AdapterAbstractServiceFactory;
-use PhpDb\Container\AdapterManager;
 use PhpDb\Container\ConnectionInterfaceFactoryFactoryInterface;
 use PhpDb\Container\DriverInterfaceFactoryFactoryInterface;
-use PhpDb\Container\MetadataFactory;
 use PhpDb\Container\PlatformInterfaceFactoryFactoryInterface;
 use PhpDb\Metadata\MetadataInterface;
 use PhpDb\ResultSet;
@@ -28,8 +26,7 @@ final class ConfigProvider
     public function __invoke(): array
     {
         return [
-            'dependencies'        => $this->getDependencies(),
-            AdapterManager::class => $this->getAdapterManagerConfig(),
+            'dependencies' => $this->getDependencies(),
         ];
     }
 
@@ -40,23 +37,6 @@ public function getDependencies(): array
                 AdapterAbstractServiceFactory::class,
             ],
             '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,
@@ -74,29 +54,31 @@ public function getAdapterManagerConfig(): array
                 ResultSet\ResultSetInterface::class               => ResultSet\ResultSet::class,
                 ConnectionInterfaceFactoryFactoryInterface::class => Container\ConnectionInterfaceFactoryFactory::class,
                 DriverInterfaceFactoryFactoryInterface::class     => Container\DriverInterfaceFactoryFactory::class,
+                MetadataInterface::class                          => MysqlMetadata::class,
                 PlatformInterfaceFactoryFactoryInterface::class   => Container\PlatformInterfaceFactoryFactory::class,
             ],
-            'factories'  => [
+            '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,
+                MysqlMetadata::class            => Container\MetadataInterfaceFactory::class,
                 PdoStatement::class             => Container\PdoStatementFactory::class,
                 PlatformInterface::class        => Container\PlatformInterfaceFactory::class,
                 Profiler\Profiler::class        => InvokableFactory::class,
+                Result::class                   => Container\PdoResultFactory::class,
                 ResultSet\ResultSet::class      => InvokableFactory::class,
             ],
-            'invokables' => [
+            'invokables'         => [
                 Container\ConnectionInterfaceFactoryFactory::class
-                    => Container\ConnectionInterfaceFactoryFactory::class,
+                => Container\ConnectionInterfaceFactoryFactory::class,
                 Container\DriverInterfaceFactoryFactory::class
-                    => Container\DriverInterfaceFactoryFactory::class,
+                => Container\DriverInterfaceFactoryFactory::class,
                 Container\PlatformInterfaceFactoryFactory::class
-                    => Container\PlatformInterfaceFactoryFactory::class,
+                => Container\PlatformInterfaceFactoryFactory::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
@@ -8,7 +8,6 @@
 use PhpDb\Adapter\Mysql\Container\PdoConnectionFactory;
 use PhpDb\Adapter\Mysql\Driver\Mysqli\Mysqli;
 use PhpDb\Adapter\Mysql\Driver\Pdo\Pdo;
-use PhpDb\Container\AdapterManager;
 use PhpDb\Container\ConnectionInterfaceFactoryFactoryInterface as FactoryFactoryInterface;
 use Psr\Container\ContainerInterface;
 use RuntimeException;
@@ -29,7 +28,7 @@ public function __invoke(
                 $requestedName
             ));
         }
-        $adapterServices  = $container->get('config')[AdapterManager::class];
+        $adapterServices  = $container->get('config');
         $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\Mysql\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');
 
         $configuredDriver = $adapterConfig[$requestedName]['driver'];
         $aliasTo        ??= $adapterServices['aliases'][$configuredDriver] ?? $configuredDriver;

diff --git a/src/Container/MetadataInterfaceFactory.php b/src/Container/MetadataInterfaceFactory.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Adapter\Mysql\Container;
+
+use PhpDb\Adapter\AdapterInterface;
+use PhpDb\Adapter\Mysql\Metadata\Source\MysqlMetadata;
+use PhpDb\Metadata\MetadataInterface;
+use Psr\Container\ContainerInterface;
+
+final class MetadataInterfaceFactory
+{
+    public function __invoke(ContainerInterface $container): MetadataInterface
+    {
+        $adapterInterface = $container->get(AdapterInterface::class);
+        return new MysqlMetadata($adapterInterface);
+    }
+}
diff --git a/src/Container/MysqliConnectionFactory.php b/src/Container/MysqliConnectionFactory.php
@@ -4,12 +4,11 @@
 
 namespace PhpDb\Adapter\Mysql\Container;
 
-use Laminas\ServiceManager\Factory\FactoryInterface;
 use PhpDb\Adapter\Driver\ConnectionInterface;
 use PhpDb\Adapter\Mysql\Driver\Mysqli\Connection;
 use Psr\Container\ContainerInterface;
 
-final class MysqliConnectionFactory implements FactoryInterface
+final class MysqliConnectionFactory
 {
     public function __invoke(
         ContainerInterface $container,

diff --git a/src/Container/MysqliDriverFactory.php b/src/Container/MysqliDriverFactory.php
@@ -6,16 +6,12 @@
 
 use PhpDb\Adapter\Driver;
 use PhpDb\Adapter\Mysql\Driver\Mysqli;
-use PhpDb\Container\AdapterManager;
 use Psr\Container\ContainerInterface;
 
 final class MysqliDriverFactory
 {
     public function __invoke(ContainerInterface $container): Driver\DriverInterface&Mysqli\Mysqli
     {
-        /** @var AdapterManager $adapterManager */
-        $adapterManager = $container->get(AdapterManager::class);
-
         /** @var array $config */
         $config = $container->get('config');
 
@@ -26,13 +22,13 @@ public function __invoke(ContainerInterface $container): Driver\DriverInterface&
         $options = $dbConfig['options'] ?? [];
 
         /** @var Driver\ConnectionInterface&Mysqli\Connection $connectionInstance */
-        $connectionInstance = $adapterManager->get(Mysqli\Connection::class);
+        $connectionInstance = $container->get(Mysqli\Connection::class);
 
         /** @var Driver\StatementInterface&Mysqli\Statement $statementInstance */
-        $statementInstance = $adapterManager->get(Mysqli\Statement::class);
+        $statementInstance = $container->get(Mysqli\Statement::class);
 
         /** @var Driver\ResultInterface&Mysqli\Result $resultInstance */
-        $resultInstance = $adapterManager->get(Mysqli\Result::class);
+        $resultInstance = $container->get(Mysqli\Result::class);
 
         return new Mysqli\Mysqli(
             $connectionInstance,
@@ -46,10 +42,8 @@ public static function createFromConfig(
         ContainerInterface $container,
         string $requestedName,
     ): Driver\DriverInterface&Mysqli\Mysqli {
-        /** @var AdapterManager $adapterManager */
-        $adapterManager    = $container->get(AdapterManager::class);
         $connectionFactory = (
-            $adapterManager->get(ConnectionInterfaceFactoryFactory::class)
+            $container->get(ConnectionInterfaceFactoryFactory::class)
         )($container, $requestedName);
         /** @var array $config */
         $config = $container->get('config');
@@ -60,8 +54,8 @@ public static function createFromConfig(
 
         return new Mysqli\Mysqli(
             $connectionFactory::createFromConfig($container, $requestedName),
-            $adapterManager->get(Mysqli\Statement::class),
-            $adapterManager->get(Mysqli\Result::class),
+            $container->get(Mysqli\Statement::class),
+            $container->get(Mysqli\Result::class),
             $adapterConfig['options'] ?? []
         );
     }

diff --git a/src/Container/PdoDriverFactory.php b/src/Container/PdoDriverFactory.php
@@ -12,25 +12,20 @@
 use PhpDb\Adapter\Driver\StatementInterface;
 use PhpDb\Adapter\Mysql\Driver\Pdo\Connection;
 use PhpDb\Adapter\Mysql\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,
             $statementInstance,
@@ -42,10 +37,8 @@ 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 array $config */
         $config = $container->get('config');
@@ -60,10 +53,10 @@ public static function createFromConfig(
         $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,