Merge branch '4.3' into 4.4

fabpot · fabpot · commit a0bbae751405 · 2019-09-25T17:04:11.000+02:00
* 4.3:
  ensure legacy event dispatcher compatibility
diff --git a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
@@ -14,6 +14,7 @@
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Symfony\Component\Mailer\Envelope;
+use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
 use Symfony\Component\Mailer\Event\MessageEvent;
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mime\Address;
@@ -32,7 +33,7 @@ abstract class AbstractTransport implements TransportInterface
 
     public function __construct(EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
-        $this->dispatcher = $dispatcher;
+        $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
         $this->logger = $logger ?: new NullLogger();
     }
 
diff --git a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php
@@ -13,6 +13,7 @@
 
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
+use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Event\SendMessageToTransportsEvent;
 use Symfony\Component\Messenger\Stamp\ReceivedStamp;
@@ -36,7 +37,7 @@ class SendMessageMiddleware implements MiddlewareInterface
     public function __construct(SendersLocatorInterface $sendersLocator, EventDispatcherInterface $eventDispatcher = null)
     {
         $this->sendersLocator = $sendersLocator;
-        $this->eventDispatcher = $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
@@ -13,6 +13,7 @@
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\ErrorRenderer\Exception\FlattenException;
+use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
 use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
 use Symfony\Component\Messenger\Event\WorkerMessageHandledEvent;
 use Symfony\Component\Messenger\Event\WorkerMessageReceivedEvent;
@@ -49,7 +50,7 @@ public function __construct(array $receivers, MessageBusInterface $bus, array $r
         $this->receivers = $receivers;
         $this->bus = $bus;
         $this->retryStrategies = $retryStrategies;
-        $this->eventDispatcher = $eventDispatcher;
+        $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
         $this->logger = $logger;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use Psr\Log\LoggerInterface;`
`15`	`15`	`use Psr\Log\NullLogger;`
`16`	`16`	`use Symfony\Component\Mailer\Envelope;`
	`17`	`+use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;`
`17`	`18`	`use Symfony\Component\Mailer\Event\MessageEvent;`
`18`	`19`	`use Symfony\Component\Mailer\SentMessage;`
`19`	`20`	`use Symfony\Component\Mime\Address;`
`@@ -32,7 +33,7 @@ abstract class AbstractTransport implements TransportInterface`
`32`	`33`
`33`	`34`	`public function __construct(EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
`34`	`35`	`{`
`35`		`- $this->dispatcher = $dispatcher;`
	`36`	`+ $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);`
`36`	`37`	`$this->logger = $logger ?: new NullLogger();`
`37`	`38`	`}`
`38`	`39`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use Psr\Log\LoggerAwareTrait;`
`15`	`15`	`use Psr\Log\NullLogger;`
	`16`	`+use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;`
`16`	`17`	`use Symfony\Component\Messenger\Envelope;`
`17`	`18`	`use Symfony\Component\Messenger\Event\SendMessageToTransportsEvent;`
`18`	`19`	`use Symfony\Component\Messenger\Stamp\ReceivedStamp;`
`@@ -36,7 +37,7 @@ class SendMessageMiddleware implements MiddlewareInterface`
`36`	`37`	`public function __construct(SendersLocatorInterface $sendersLocator, EventDispatcherInterface $eventDispatcher = null)`
`37`	`38`	`{`
`38`	`39`	`$this->sendersLocator = $sendersLocator;`
`39`		`- $this->eventDispatcher = $eventDispatcher;`
	`40`	`+ $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);`
`40`	`41`	`$this->logger = new NullLogger();`
`41`	`42`	`}`
`42`	`43`