Skip to content

Commit cf02f71

Browse files
committed
[EventDispatcher] Deprecate LegacyEventDispatcherProxy.
1 parent 8741c39 commit cf02f71

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Mailer.php

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

1212
namespace Symfony\Component\Mailer;
1313

14+
use Symfony\Component\EventDispatcher\Event;
1415
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1516
use Symfony\Component\Mailer\Event\MessageEvent;
1617
use Symfony\Component\Mailer\Messenger\SendEmailMessage;
@@ -32,7 +33,7 @@ public function __construct(TransportInterface $transport, MessageBusInterface $
3233
{
3334
$this->transport = $transport;
3435
$this->bus = $bus;
35-
$this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
36+
$this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;
3637
}
3738

3839
public function send(RawMessage $message, Envelope $envelope = null): void

Transport/AbstractTransport.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 Psr\Log\NullLogger;
16+
use Symfony\Component\EventDispatcher\Event;
1617
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1718
use Symfony\Component\Mailer\Envelope;
1819
use Symfony\Component\Mailer\Event\MessageEvent;
@@ -33,7 +34,7 @@ abstract class AbstractTransport implements TransportInterface
3334

3435
public function __construct(EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
3536
{
36-
$this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
37+
$this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;
3738
$this->logger = $logger ?: new NullLogger();
3839
}
3940

0 commit comments

Comments
 (0)