Throws UnrecoverableMessageHandlingException when passed invalid entity manager name for Doctrine middlewares

Koc · Koc · commit 8c03f5f75ef1 · 2019-05-10T11:19:51.000+03:00
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerMiddleware.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bridge\Doctrine\Messenger;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
@@ -44,7 +43,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
         try {
             $entityManager = $this->managerRegistry->getManager($this->entityManagerName);
         } catch (\InvalidArgumentException $e) {
-            throw new UnrecoverableMessageHandlingException(sprintf('The ObjectManager with name "%s" must be an instance of EntityManagerInterface', $this->entityManagerName), 0, $e);
+            throw new UnrecoverableMessageHandlingException($e->getMessage(), 0, $e);
         }
 
         try {
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineClearEntityManagerMiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineClearEntityManagerMiddlewareTest.php
@@ -59,8 +59,8 @@ public function testInvalidEntityManagerThrowsException()
 
         $middleware = new DoctrineClearEntityManagerMiddleware($managerRegistry, 'unknown_manager');
 
-        $this->expectsException(UnrecoverableMessageHandlingException::class);
+        $this->expectException(UnrecoverableMessageHandlingException::class);
 
-        $middleware->handle(new Envelope(new \stdClass()), $this->getStackMock());
+        $middleware->handle(new Envelope(new \stdClass()), $this->getStackMock(false));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,8 @@ public function testInvalidEntityManagerThrowsException()`
`59`	`59`
`60`	`60`	`$middleware = new DoctrineClearEntityManagerMiddleware($managerRegistry, 'unknown_manager');`
`61`	`61`
`62`		`- $this->expectsException(UnrecoverableMessageHandlingException::class);`
	`62`	`+ $this->expectException(UnrecoverableMessageHandlingException::class);`
`63`	`63`
`64`		`- $middleware->handle(new Envelope(new \stdClass()), $this->getStackMock());`
	`64`	`+ $middleware->handle(new Envelope(new \stdClass()), $this->getStackMock(false));`
`65`	`65`	`}`
`66`	`66`	`}`