make it work with DBAL 4

dmaicher · Oct 22, 2023 · c3b0db0 · c3b0db0
1 parent 093ecbd
commit c3b0db0
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -20,8 +20,8 @@
     "require": {
         "php": "^7.3 || ^8.0",
         "ext-json": "*",
-        "doctrine/dbal": "4.0.x-dev as 3.999",
-        "doctrine/doctrine-bundle": "^2.2.2",
+        "doctrine/dbal": "^3.3 || ^4.0",
+        "doctrine/doctrine-bundle": "dev-dbal_4",
         "psr/cache": "^1.0 || ^2.0 || ^3.0",
         "symfony/cache": "^5.4 || ^6.2 || ^7.0",
         "symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0"
@@ -53,5 +53,12 @@
     },
     "config": {
         "sort-packages": true
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/dmaicher/DoctrineBundle"
+        }
+    ],
+    "minimum-stability": "dev"
 }
diff --git a/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticDriver.php b/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticDriver.php
@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Connection\StaticServerVersionProvider;
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Driver\Connection;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 
 class StaticDriver extends Driver\Middleware\AbstractDriverMiddleware
 {
@@ -36,9 +37,7 @@ public function connect(array $params): Connection
 
         $connection = self::$connections[$key];
 
-        $platform = $params['platform'] ?? (isset($params['serverVersion'])
-            ? $this->createDatabasePlatformForVersion($params['serverVersion'])
-            : $this->getDatabasePlatform());
+        $platform = $this->getPlatform($connection, $params);
 
         if (!$platform->supportsSavepoints()) {
             throw new \RuntimeException('This bundle only works for database platforms that support savepoints.');
@@ -77,4 +76,29 @@ public static function commit(): void
             $connection->commit();
         }
     }
+
+    private function getPlatform(Connection $connection, array $params): AbstractPlatform
+    {
+        if (isset($params['platform'])) {
+            return $params['platform'];
+        }
+
+        // DBAL 3
+        if (method_exists($this, 'createDatabasePlatformForVersion')) {
+            if (isset($params['serverVersion'])) {
+                return $this->createDatabasePlatformForVersion($params['serverVersion']);
+            }
+
+            return $this->getDatabasePlatform();
+        }
+
+        // DBAL 4
+        if (isset($params['serverVersion'])) {
+            $versionProvider = new StaticServerVersionProvider($params['serverVersion']);
+        } else {
+            $versionProvider = new StaticServerVersionProvider($connection->getServerVersion());
+        }
+
+        return $this->getDatabasePlatform($versionProvider);
+    }
 }
diff --git a/tests/Functional/FunctionalTestTrait.php b/tests/Functional/FunctionalTestTrait.php
@@ -96,7 +96,7 @@ public function rollbackSavepoint(string $name): void
 
     private function init(): void
     {
-        $this->kernel = new AppKernel('test', false);
+        $this->kernel = new AppKernel('test', true);
         $this->kernel->boot();
         $this->connection = $this->kernel->getContainer()->get('doctrine.dbal.default_connection');
     }