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

Author: tyrsson

src/Adapter.php

@@ -4,14 +4,14 @@
 
 namespace Laminas\Db\Adapter\Mysql\Container;
 
+use Laminas\Db\Adapter\Adapter;
 use Laminas\Db\Adapter\AdapterInterface;
-use Laminas\Db\Adapter\Driver\DriverInterface;
 use Laminas\Db\Adapter\Exception\RuntimeException;
-use Laminas\Db\Adapter\Mysql\Adapter;
 use Laminas\Db\Adapter\Platform\PlatformInterface;
 use Laminas\Db\Adapter\Profiler\ProfilerInterface;
 use Laminas\Db\Container\AdapterManager;
 use Laminas\Db\ResultSet\ResultSetInterface;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 use Psr\Container\ContainerInterface;
 
 final class AdapterFactory
@@ -20,22 +20,28 @@ public function __invoke(ContainerInterface $container): AdapterInterface
     {
         /** @var AdapterManager $adapterManager */
         $adapterManager = $container->get(AdapterManager::class);
+
         /** @var array $config */
-        $config         = $container->get('config');
+        $config = $container->get('config');
+
         if (! isset($config['db']['driver'])) {
             throw new RuntimeException('Database driver configuration is missing.');
         }
+
         if (! $adapterManager->has($config['db']['driver'])) {
-            throw new RuntimeException(sprintf(
+            throw new ServiceNotFoundException(sprintf(
                 'Database driver "%s" is not registered in the adapter manager.',
                 $config['db']['driver']
             ));
         }
+
         return new Adapter(
             $adapterManager->get($config['db']['driver']),
             $adapterManager->get(PlatformInterface::class),
             $adapterManager->get(ResultSetInterface::class),
-            $adapterManager->get(ProfilerInterface::class)
+            $adapterManager->has(ProfilerInterface::class)
+                ? $adapterManager->get(ProfilerInterface::class)
+                : null
         );
     }
 }

src/Container/AdapterFactory.php

@@ -12,10 +12,12 @@
 
 final class PlatformInterfaceFactory
 {
-    public function __invoke(ContainerInterface $container): PlatformInterface
+    public function __invoke(ContainerInterface $container): PlatformInterface&Mysql
     {
         /** @var AdapterManager $manager */
         $adapterManager = $container->get(AdapterManager::class);
-        return new Mysql($adapterManager->get(DriverInterface::class));
+        /** @var DriverInterface $driver */
+        $driver = $container->get('config')['db']['driver'];
+        return new Mysql($adapterManager->get($driver));
     }
 }

src/Container/PlatformInterfaceFactory.php

@@ -18,6 +18,8 @@
 
 class Mysql extends AbstractPlatform
 {
+    public final const PLATFORM_NAME = 'MySQL';
+
     /**
      * {@inheritDoc}
      */
@@ -28,9 +30,6 @@ class Mysql extends AbstractPlatform
      */
     protected $quoteIdentifierTo = '``';
 
-    /** @var \mysqli|\PDO|Pdo\Pdo|Mysqli\Mysqli */
-    protected $driver;
-
     /**
      * NOTE: Include dashes for MySQL only, need tests for others platforms
      *
@@ -42,42 +41,15 @@ class Mysql extends AbstractPlatform
      * todo: track down if this still needs to accept null
      */
     public function __construct(
-        DriverInterface|\mysqli|\PDO|null $driver = null
-    ) {
-        if ($driver) {
-            $this->setDriver($driver);
-        }
-    }
-
-    /**
-     * @param \Laminas\Db\Adapter\Driver\Mysqli\Mysqli|\Laminas\Db\Adapter\Driver\Pdo\Pdo|\mysqli|\PDO $driver
-     * @return $this Provides a fluent interface
-     * @throws InvalidArgumentException
-     */
-    public function setDriver($driver)
-    {
-        // handle Laminas\Db drivers
-        if (
-            $driver instanceof Mysqli\Mysqli
-            || ($driver instanceof Pdo\Pdo && $driver->getDatabasePlatformName() === 'Mysql')
-            || $driver instanceof \mysqli
-            || ($driver instanceof \PDO && $driver->getAttribute(\PDO::ATTR_DRIVER_NAME) === 'mysql')
-        ) {
-            $this->driver = $driver;
-            return $this;
-        }
-
-        throw new Exception\InvalidArgumentException(
-            '$driver must be a Laminas\Db\Adapter\Mysql\Driver\*, Mysqli\Mysqli or Pdo\Pdo instance'
-        );
-    }
+        protected readonly DriverInterface|\mysqli|\PDO $driver
+    ) {}
 
     /**
      * {@inheritDoc}
      */
     public function getName()
     {
-        return 'MySQL';
+        return self::PLATFORM_NAME;
     }
 
     public function getSqlPlatformDecorator(): PlatformDecoratorInterface
@@ -113,11 +85,7 @@ public function quoteTrustedValue($value)
         return $quotedViaDriverValue ?? parent::quoteTrustedValue($value);
     }
 
-    /**
-     * @param  string $value
-     * @return string|null
-     */
-    protected function quoteViaDriver($value)
+    protected function quoteViaDriver(string $value): ?string
     {
         if ($this->driver instanceof DriverInterface) {
             // todo: verify this can not return a PDOStatement instance