make "use_savepoints = true" no-op with DBAL 4

doctrine · Mar 17, 2024 · 933b543 · 933b543
1 parent 0a230d3
commit 933b543
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/DependencyInjection/DoctrineExtension.php b/src/DependencyInjection/DoctrineExtension.php
@@ -300,8 +300,13 @@ protected function loadDbalConnection($name, array $connection, ContainerBuilder
             $def->setClass($options['wrapperClass']);
         }
 
-        if (! empty($connection['use_savepoints'])) {
-            $def->addMethodCall('setNestTransactionsWithSavepoints', [$connection['use_savepoints']]);
+        if (isset($connection['use_savepoints'])) {
+            // DBAL >= 4 always has savepoints enabled. So we only need to call "setNestTransactionsWithSavepoints" for DBAL < 4
+            if (method_exists(Connection::class, 'getEventManager') && $connection['use_savepoints']) {
+                $def->addMethodCall('setNestTransactionsWithSavepoints', [$connection['use_savepoints']]);
+            } elseif (! $connection['use_savepoints']) {
+                throw new LogicException('The "use_savepoints" option can only be set to "true" when using DBAL >= 4');
+            }
         }
 
         $container->setDefinition(

diff --git a/tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/tests/DependencyInjection/AbstractDoctrineExtensionTest.php
@@ -240,6 +240,10 @@ public function testDbalLoadSinglePrimaryReplicaConnection(): void
 
     public function testDbalLoadSavepointsForNestedTransactions(): void
     {
+        if (!method_exists(Connection::class, 'getEventManager')) {
+            self::markTestSkipped('This test requires DBAL < 4');
+        }
+
         $container = $this->loadContainer('dbal_savepoints');
 
         $calls = $container->getDefinition('doctrine.dbal.savepoints_connection')->getMethodCalls();

diff --git a/tests/DependencyInjection/DoctrineExtensionTest.php b/tests/DependencyInjection/DoctrineExtensionTest.php
@@ -554,10 +554,14 @@ public function testUseSavePointsAddMethodCallToAddSavepointsToTheConnection():
             ],
         ], $container);
 
+        $isUsingDBAL3 = method_exists(Connection::class, 'getEventManager');
+
         $calls = $container->getDefinition('doctrine.dbal.default_connection')->getMethodCalls();
-        $this->assertCount(1, $calls);
-        $this->assertEquals('setNestTransactionsWithSavepoints', $calls[0][0]);
-        $this->assertTrue($calls[0][1][0]);
+        $this->assertCount((int) $isUsingDBAL3, $calls);
+        if ($isUsingDBAL3) {
+            $this->assertEquals('setNestTransactionsWithSavepoints', $calls[0][0]);
+            $this->assertTrue($calls[0][1][0]);
+        }
     }
 
     public function testAutoGenerateProxyClasses(): void