Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 0c7ece5

Browse filesBrowse files
committed
[Messenger] ensure exception on rollback does not hide previous exception
1 parent 69b7675 commit 0c7ece5
Copy full SHA for 0c7ece5

File tree

2 files changed

+35
-8
lines changed
Filter options

2 files changed

+35
-8
lines changed

‎src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php
+10-2Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,30 @@ class DoctrineTransactionMiddleware extends AbstractDoctrineMiddleware
2727
protected function handleForManager(EntityManagerInterface $entityManager, Envelope $envelope, StackInterface $stack): Envelope
2828
{
2929
$entityManager->getConnection()->beginTransaction();
30+
31+
$success = false;
3032
try {
3133
$envelope = $stack->next()->handle($envelope, $stack);
3234
$entityManager->flush();
3335
$entityManager->getConnection()->commit();
3436

37+
$success = true;
38+
3539
return $envelope;
3640
} catch (\Throwable $exception) {
37-
$entityManager->getConnection()->rollBack();
38-
3941
if ($exception instanceof HandlerFailedException) {
4042
// Remove all HandledStamp from the envelope so the retry will execute all handlers again.
4143
// When a handler fails, the queries of allegedly successful previous handlers just got rolled back.
4244
throw new HandlerFailedException($exception->getEnvelope()->withoutAll(HandledStamp::class), $exception->getWrappedExceptions());
4345
}
4446

4547
throw $exception;
48+
} finally {
49+
$connection = $entityManager->getConnection();
50+
51+
if (!$success && $connection->isTransactionActive()) {
52+
$connection->rollBack();
53+
}
4654
}
4755
}
4856
}

‎src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php
+25-6Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\Doctrine\Tests\Messenger;
1313

1414
use Doctrine\DBAL\Connection;
15+
use Doctrine\DBAL\ConnectionException;
1516
use Doctrine\ORM\EntityManagerInterface;
1617
use Doctrine\Persistence\ManagerRegistry;
1718
use PHPUnit\Framework\MockObject\MockObject;
@@ -56,19 +57,37 @@ public function testMiddlewareWrapsInTransactionAndFlushes()
5657

5758
public function testTransactionIsRolledBackOnException()
5859
{
59-
$this->connection->expects($this->once())
60-
->method('beginTransaction')
61-
;
62-
$this->connection->expects($this->once())
63-
->method('rollBack')
64-
;
60+
$this->connection->expects($this->once())->method('beginTransaction');
61+
$this->connection->expects($this->once())->method('isTransactionActive')->willReturn(true);
62+
$this->connection->expects($this->once())->method('rollBack');
6563

6664
$this->expectException(\RuntimeException::class);
6765
$this->expectExceptionMessage('Thrown from next middleware.');
6866

6967
$this->middleware->handle(new Envelope(new \stdClass()), $this->getThrowingStackMock());
7068
}
7169

70+
public function testExceptionInRollBackDoesNotHidePreviousException()
71+
{
72+
$this->connection->expects($this->once())->method('beginTransaction');
73+
$this->connection->expects($this->once())->method('isTransactionActive')->willReturn(true);
74+
$this->connection->expects($this->once())->method('rollBack')->willThrowException(new \RuntimeException('Thrown from rollBack.'));
75+
76+
try {
77+
$this->middleware->handle(new Envelope(new \stdClass()), $this->getThrowingStackMock());
78+
} catch (\Throwable $exception) {
79+
}
80+
81+
self::assertNotNull($exception);
82+
self::assertInstanceOf(\RuntimeException::class, $exception);
83+
self::assertSame('Thrown from rollBack.', $exception->getMessage());
84+
85+
$previous = $exception->getPrevious();
86+
self::assertNotNull($previous);
87+
self::assertInstanceOf(\RuntimeException::class, $previous);
88+
self::assertSame('Thrown from next middleware.', $previous->getMessage());
89+
}
90+
7291
public function testInvalidEntityManagerThrowsException()
7392
{
7493
$managerRegistry = $this->createMock(ManagerRegistry::class);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.