[Doctrine] Doctrine Dbal 3.0 support

Author: samsonasik

README.md

@@ -89,7 +89,7 @@ return [
     'doctrine' => [
         'connection' => [
             'orm_default' => [
-                'driverClass' =>'Doctrine\DBAL\Driver\PDOMySql\Driver',
+                'driverClass' => 'Doctrine\DBAL\Driver\PDO\MySql\Driver,
                 'params' => [
                     'user'     => 'mysqluser',
                     'password' => 'mysqlpassword',

composer.json

@@ -51,6 +51,7 @@
         "webmozart/assert": "^1.9.1"
     },
     "conflict": {
+        "doctrine/dbal": "<3.0",
         "doctrine/doctrine-orm-module": "<4.0",
         "laminas/laminas-mvc": "<3.2 >=4.0",
         "laminas/laminas-servicemanager": "<3.6",

config/module.config.php

@@ -2,6 +2,7 @@
 
 namespace ErrorHeroModule;
 
+use DoctrineModule\ServiceFactory\AbstractDoctrineServiceFactory;
 use ErrorHeroModule\Controller\ErrorPreviewController;
 use ErrorHeroModule\Controller\ErrorPreviewConsoleController;
 use Laminas\Log\LoggerAbstractServiceFactory;
@@ -57,6 +58,7 @@
     'service_manager' => [
         'abstract_factories' => [
             LoggerAbstractServiceFactory::class,
+            AbstractDoctrineServiceFactory::class,
         ],
         'factories' => [
             Mvc::class    => MvcFactory::class,

spec/Fixture/config/autoload-with-doctrine/error-hero-module.local.php

@@ -1,14 +1,14 @@
 <?php
 
-use Doctrine\DBAL\Driver\PDOMySql\Driver;
+use Doctrine\DBAL\Driver\PDO\MySql\Driver;
 use Laminas\Db\Adapter\AdapterInterface;
 
 return [
 
     'doctrine' => [
         'connection' => [
             'orm_default' => [
-                'driverClass' =>Driver::class,
+                'driverClass' => Driver::class,
                 'params' => [
                     'user'     => 'root',
                     'password' => '',

spec/Middleware/MezzioFactorySpec.php

@@ -7,7 +7,7 @@
 use Aura\Di\ContainerBuilder as AuraContainerBuilder;
 use Auryn\Injector;
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver\PDOMySql\Driver;
+use Doctrine\DBAL\Driver\PDO\MySql\Driver;
 use Doctrine\ORM\EntityManager;
 use ErrorHeroModule\Handler\Logging;
 use ErrorHeroModule\Middleware\Mezzio;
@@ -157,15 +157,16 @@
 
             $connection    = Double::instance(['extends' => Connection::class, 'methods' => '__construct']);
             $driver = Double::instance(['extends' => Driver::class, 'methods' => '__construct']);
-            allow($driver)->toReceive('getName')->andReturn('pdo_mysql');
 
-            allow($connection)->toReceive('getParams')->andReturn([]);
-            allow($connection)->toReceive('getUsername')->andReturn('root');
-            allow($connection)->toReceive('getPassword')->andReturn('');
+            allow($connection)->toReceive('getParams')->andReturn([
+                'user'     => 'mysqluser',
+                'password' => 'mysqlpassword',
+                'dbname'   => 'mysqldbname',
+                'host'     => 'mysqlhost',
+                'port'     => '3306',
+                'driverClass' => 'Doctrine\DBAL\Driver\PDO\MySql\Driver'
+            ]);
             allow($connection)->toReceive('getDriver')->andReturn($driver);
-            allow($connection)->toReceive('getDatabase')->andReturn('mydb');
-            allow($connection)->toReceive('getHost')->andReturn('localhost');
-            allow($connection)->toReceive('getPort')->andReturn('3306');
 
             allow($entityManager)->toReceive('getConnection')->andReturn($connection);
             allow($container)->toReceive('get')->with(EntityManager::class)->andReturn(

spec/ModuleSpec.php

@@ -3,7 +3,7 @@
 namespace ErrorHeroModule\Spec;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver\PDOMySql\Driver;
+use Doctrine\DBAL\Driver\PDO\MySql\Driver;
 use Doctrine\ORM\EntityManager;
 use ErrorHeroModule\Module;
 use Kahlan\Plugin\Double;

src/Transformer/Doctrine.php

@@ -9,6 +9,11 @@
 use Psr\Container\ContainerInterface;
 use Webmozart\Assert\Assert;
 
+use function explode;
+use function implode;
+use function rtrim;
+use function strtolower;
+
 class Doctrine extends TransformerAbstract implements TransformerInterface
 {
     public static function transform(ContainerInterface $container, array $configuration): ContainerInterface
@@ -21,13 +26,21 @@ public static function transform(ContainerInterface $container, array $configura
         $params        = $doctrineDBALConnection->getParams();
         $driverOptions = $params['driverOptions'] ?? [];
 
+        $driverClass               = $params['driverClass'];
+        $driverNamespaces          = explode('\\', $driverClass);
+        $fullUnderscoredDriverName = strtolower(implode('_', $driverNamespaces));
+        $driverName                = rtrim($fullUnderscoredDriverName, '_driver');
+        [, $driverName]            = explode('driver_', $driverName);
+
+        Assert::startsWithLetter($driverName, 'pdo_');
+
         $dbAdapterConfig = [
-            'username'       => $doctrineDBALConnection->getUsername(),
-            'password'       => $doctrineDBALConnection->getPassword(),
-            'driver'         => $doctrineDBALConnection->getDriver()->getName(),
-            'database'       => $doctrineDBALConnection->getDatabase(),
-            'host'           => $doctrineDBALConnection->getHost(),
-            'port'           => $doctrineDBALConnection->getPort(),
+            'username'       => $params['user'],
+            'password'       => $params['password'],
+            'driver'         => $driverName,
+            'database'       => $params['dbname'],
+            'host'           => $params['host'],
+            'port'           => $params['port'],
             'driver_options' => $driverOptions,
         ];