bug #33707 [Mailer] ensure legacy event dispatcher compatibility (xabbuh)

fabpot · fabpot · commit 5d4f30204860 · 2019-09-25T16:56:38.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Mailer] ensure legacy event dispatcher compatibility | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- 860688f ensure legacy event dispatcher compatibility
diff --git a/src/Symfony/Component/Mailer/Mailer.php b/src/Symfony/Component/Mailer/Mailer.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Mailer;
 
+use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
 use Symfony\Component\Mailer\Event\MessageEvent;
 use Symfony\Component\Mailer\Messenger\SendEmailMessage;
 use Symfony\Component\Mailer\Transport\TransportInterface;
@@ -31,7 +32,7 @@ public function __construct(TransportInterface $transport, MessageBusInterface $
     {
         $this->transport = $transport;
         $this->bus = $bus;
-        $this->dispatcher = $dispatcher;
+        $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
     }
 
     public function send(RawMessage $message, Envelope $envelope = null): void

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Mailer;`
`13`	`13`
	`14`	`+use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;`
`14`	`15`	`use Symfony\Component\Mailer\Event\MessageEvent;`
`15`	`16`	`use Symfony\Component\Mailer\Messenger\SendEmailMessage;`
`16`	`17`	`use Symfony\Component\Mailer\Transport\TransportInterface;`
`@@ -31,7 +32,7 @@ public function __construct(TransportInterface $transport, MessageBusInterface $`
`31`	`32`	`{`
`32`	`33`	`$this->transport = $transport;`
`33`	`34`	`$this->bus = $bus;`
`34`		`- $this->dispatcher = $dispatcher;`
	`35`	`+ $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`public function send(RawMessage $message, Envelope $envelope = null): void`