Mar 20, 2024 · Mar 20, 2024
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php

            return $envelope;
        } catch (\Throwable $exception) {
            $entityManager->getConnection()->rollBack();
            try {
                $entityManager->getConnection()->rollBack();
            } catch (\Throwable $e) {
            }

            if ($exception instanceof HandlerFailedException) {
                // Remove all HandledStamp from the envelope so the retry will execute all handlers again.
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php
        $this->middleware->handle(new Envelope(new \stdClass()), $this->getThrowingStackMock());
    }

    public function testExceptionRollingBackTransactionSwallowed()
    {
        $this->connection->expects($this->once())
            ->method('beginTransaction')
        ;
        $this->connection->expects($this->once())
            ->method('rollBack')
            ->will($this->throwException(new \Exception('Could not roll back transaction.')))
        ;

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

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

    public function testInvalidEntityManagerThrowsException()
    {
        $managerRegistry = $this->createMock(ManagerRegistry::class);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -69,6 +69,22 @@ public function testTransactionIsRolledBackOnException()
		$this->middleware->handle(new Envelope(new \stdClass()), $this->getThrowingStackMock());
		}

		public function testExceptionRollingBackTransactionSwallowed()
		{
		$this->connection->expects($this->once())
		->method('beginTransaction')
		;
		$this->connection->expects($this->once())
		->method('rollBack')
		->will($this->throwException(new \Exception('Could not roll back transaction.')))
		;

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

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

		public function testInvalidEntityManagerThrowsException()
		{
		$managerRegistry = $this->createMock(ManagerRegistry::class);
Expand Down