Merge branch '3.9.x' into 4.2.x

* 3.9.x: Run risky code in finally block (doctrine#6543)
derrabus · Oct 11, 2024 · 220aec4 · 220aec4
2 parents dadd353 + c204fe1
commit 220aec4
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/src/Connection.php b/src/Connection.php
@@ -926,15 +926,20 @@ public function lastInsertId(): int|string
     public function transactional(Closure $func): mixed
     {
         $this->beginTransaction();
+
+        $successful = false;
+
         try {
             $res = $func($this);
             $this->commit();
 
-            return $res;
-        } catch (Throwable $e) {
-            $this->rollBack();
+            $successful = true;
 
-            throw $e;
+            return $res;
+        } finally {
+            if (! $successful) {
+                $this->rollBack();
+            }
         }
     }
 

diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -623,4 +623,25 @@ public function testDefaultSchemaManagerFactory(): void
         $connection = DriverManager::getConnection(['driver' => 'sqlite3', 'memory' => true]);
         self::assertInstanceOf(SQLiteSchemaManager::class, $connection->createSchemaManager());
     }
+
+    public function testItPreservesTheOriginalExceptionOnRollbackFailure(): void
+    {
+        $connection = new class (['memory' => true], new Driver\SQLite3\Driver()) extends Connection {
+            public function rollBack(): void
+            {
+                throw new ConnectionException('Rollback exception');
+            }
+        };
+
+        try {
+            $connection->transactional(static function (): void {
+                throw new ConnectionException('Original exception');
+            });
+            self::fail('Exception expected'); // @phpstan-ignore deadCode.unreachable
+        } catch (ConnectionException $e) {
+            self::assertSame('Rollback exception', $e->getMessage());
+            self::assertNotNull($e->getPrevious());
+            self::assertSame('Original exception', $e->getPrevious()->getMessage());
+        }
+    }
 }