Skip to content

Commit 5006342

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: ensure legacy event dispatcher compatibility
2 parents ed3f457 + b73756e commit 5006342

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Middleware/SendMessageMiddleware.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Psr\Log\LoggerAwareTrait;
1515
use Psr\Log\NullLogger;
16+
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1617
use Symfony\Component\Messenger\Envelope;
1718
use Symfony\Component\Messenger\Event\SendMessageToTransportsEvent;
1819
use Symfony\Component\Messenger\Stamp\ReceivedStamp;
@@ -36,7 +37,7 @@ class SendMessageMiddleware implements MiddlewareInterface
3637
public function __construct(SendersLocatorInterface $sendersLocator, EventDispatcherInterface $eventDispatcher = null)
3738
{
3839
$this->sendersLocator = $sendersLocator;
39-
$this->eventDispatcher = $eventDispatcher;
40+
$this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
4041
$this->logger = new NullLogger();
4142
}
4243

Worker.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Psr\Log\LoggerInterface;
1515
use Symfony\Component\ErrorRenderer\Exception\FlattenException;
16+
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1617
use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
1718
use Symfony\Component\Messenger\Event\WorkerMessageHandledEvent;
1819
use Symfony\Component\Messenger\Event\WorkerMessageReceivedEvent;
@@ -49,7 +50,7 @@ public function __construct(array $receivers, MessageBusInterface $bus, array $r
4950
$this->receivers = $receivers;
5051
$this->bus = $bus;
5152
$this->retryStrategies = $retryStrategies;
52-
$this->eventDispatcher = $eventDispatcher;
53+
$this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
5354
$this->logger = $logger;
5455
}
5556

0 commit comments

Comments
 (0)