[Notifier] Use LegacyEventDispatcherProxy in case the legacy event still exists

jschaedl · jschaedl · commit 278699301dd4 · 2020-02-24T14:59:37.000+01:00
diff --git a/src/Symfony/Component/Notifier/Transport/NullTransport.php b/src/Symfony/Component/Notifier/Transport/NullTransport.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Notifier\Transport;
 
+use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
 use Symfony\Component\Notifier\Event\MessageEvent;
 use Symfony\Component\Notifier\Message\MessageInterface;
@@ -27,7 +28,7 @@ class NullTransport implements TransportInterface
 
     public function __construct(EventDispatcherInterface $dispatcher = null)
     {
-        $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+        $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;
     }
 
     public function send(MessageInterface $message): void

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Notifier\Transport;`
`13`	`13`
	`14`	`+use Symfony\Component\EventDispatcher\Event;`
`14`	`15`	`use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;`
`15`	`16`	`use Symfony\Component\Notifier\Event\MessageEvent;`
`16`	`17`	`use Symfony\Component\Notifier\Message\MessageInterface;`
`@@ -27,7 +28,7 @@ class NullTransport implements TransportInterface`
`27`	`28`
`28`	`29`	`public function __construct(EventDispatcherInterface $dispatcher = null)`
`29`	`30`	`{`
`30`		`- $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);`
	`31`	`+ $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`public function send(MessageInterface $message): void`