gracefully handle missing event dispatchers

xabbuh · xabbuh · commit 214b6bb6e482 · 2019-12-06T14:04:56.000+01:00
diff --git a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php
@@ -39,7 +39,11 @@ class SendMessageMiddleware implements MiddlewareInterface
     public function __construct(SendersLocatorInterface $sendersLocator, EventDispatcherInterface $eventDispatcher = null)
     {
         $this->sendersLocator = $sendersLocator;
-        $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+
+        if (null !== $eventDispatcher) {
+            $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+        }
+
         $this->logger = new NullLogger();
     }
 
diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php
@@ -52,7 +52,11 @@ public function __construct(array $receivers, MessageBusInterface $bus, array $r
         $this->receivers = $receivers;
         $this->bus = $bus;
         $this->retryStrategies = $retryStrategies;
-        $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+
+        if (null !== $eventDispatcher) {
+            $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+        }
+
         $this->logger = $logger;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,11 @@ class SendMessageMiddleware implements MiddlewareInterface`
`39`	`39`	`public function __construct(SendersLocatorInterface $sendersLocator, EventDispatcherInterface $eventDispatcher = null)`
`40`	`40`	`{`
`41`	`41`	`$this->sendersLocator = $sendersLocator;`
`42`		`- $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);`
	`42`	`+`
	`43`	`+ if (null !== $eventDispatcher) {`
	`44`	`+ $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);`
	`45`	`+ }`
	`46`	`+`
`43`	`47`	`$this->logger = new NullLogger();`
`44`	`48`	`}`
`45`	`49`