Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 117516c

Browse files
derrabusderrabus
committed
[EventDispatcher] Remove LegacyEventDispatcherProxy
1 parent 1bdc2a2 commit 117516c

File tree

13 files changed

+16
-61
lines changed

13 files changed

+16
-61
lines changed

‎src/Symfony/Component/EventDispatcher/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
6.0
5+
---
6+
7+
* Remove `LegacyEventDispatcherProxy`
8+
49
5.3
510
---
611

‎src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎src/Symfony/Component/Mailer/Mailer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Symfony\Component\Mailer;
1313

14-
use Symfony\Component\EventDispatcher\Event;
15-
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1614
use Symfony\Component\Mailer\Event\MessageEvent;
1715
use Symfony\Component\Mailer\Messenger\SendEmailMessage;
1816
use Symfony\Component\Mailer\Transport\TransportInterface;
@@ -33,7 +31,7 @@ public function __construct(TransportInterface $transport, MessageBusInterface $
3331
{
3432
$this->transport = $transport;
3533
$this->bus = $bus;
36-
$this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;
34+
$this->dispatcher = $dispatcher;
3735
}
3836

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

‎src/Symfony/Component/Mailer/Transport/AbstractTransport.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
use Psr\Log\LoggerInterface;
1515
use Psr\Log\NullLogger;
16-
use Symfony\Component\EventDispatcher\Event;
17-
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1816
use Symfony\Component\Mailer\Envelope;
1917
use Symfony\Component\Mailer\Event\MessageEvent;
2018
use Symfony\Component\Mailer\SentMessage;
@@ -34,7 +32,7 @@ abstract class AbstractTransport implements TransportInterface
3432

3533
public function __construct(EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
3634
{
37-
$this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;
35+
$this->dispatcher = $dispatcher;
3836
$this->logger = $logger ?? new NullLogger();
3937
}
4038

‎src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
use Psr\Log\LoggerAwareTrait;
1515
use Psr\Log\NullLogger;
16-
use Symfony\Component\EventDispatcher\Event;
17-
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1816
use Symfony\Component\Messenger\Envelope;
1917
use Symfony\Component\Messenger\Event\SendMessageToTransportsEvent;
2018
use Symfony\Component\Messenger\Stamp\ReceivedStamp;
@@ -36,7 +34,7 @@ class SendMessageMiddleware implements MiddlewareInterface
3634
public function __construct(SendersLocatorInterface $sendersLocator, EventDispatcherInterface $eventDispatcher = null)
3735
{
3836
$this->sendersLocator = $sendersLocator;
39-
$this->eventDispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($eventDispatcher) : $eventDispatcher;
37+
$this->eventDispatcher = $eventDispatcher;
4038
$this->logger = new NullLogger();
4139
}
4240

‎src/Symfony/Component/Messenger/Worker.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
namespace Symfony\Component\Messenger;
1313

1414
use Psr\Log\LoggerInterface;
15-
use Symfony\Component\EventDispatcher\Event;
16-
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1715
use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
1816
use Symfony\Component\Messenger\Event\WorkerMessageHandledEvent;
1917
use Symfony\Component\Messenger\Event\WorkerMessageReceivedEvent;
@@ -51,7 +49,7 @@ public function __construct(array $receivers, MessageBusInterface $bus, EventDis
5149
$this->receivers = $receivers;
5250
$this->bus = $bus;
5351
$this->logger = $logger;
54-
$this->eventDispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($eventDispatcher) : $eventDispatcher;
52+
$this->eventDispatcher = $eventDispatcher;
5553
}
5654

5755
/**

‎src/Symfony/Component/Notifier/Chatter.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Symfony\Component\Notifier;
1313

14-
use Symfony\Component\EventDispatcher\Event;
15-
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1614
use Symfony\Component\Messenger\MessageBusInterface;
1715
use Symfony\Component\Notifier\Event\MessageEvent;
1816
use Symfony\Component\Notifier\Message\MessageInterface;
@@ -33,7 +31,7 @@ public function __construct(TransportInterface $transport, MessageBusInterface $
3331
{
3432
$this->transport = $transport;
3533
$this->bus = $bus;
36-
$this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;
34+
$this->dispatcher = $dispatcher;
3735
}
3836

3937
public function __toString(): string

‎src/Symfony/Component/Notifier/Texter.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Symfony\Component\Notifier;
1313

14-
use Symfony\Component\EventDispatcher\Event;
15-
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1614
use Symfony\Component\Messenger\MessageBusInterface;
1715
use Symfony\Component\Notifier\Event\MessageEvent;
1816
use Symfony\Component\Notifier\Message\MessageInterface;
@@ -33,7 +31,7 @@ public function __construct(TransportInterface $transport, MessageBusInterface $
3331
{
3432
$this->transport = $transport;
3533
$this->bus = $bus;
36-
$this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;
34+
$this->dispatcher = $dispatcher;
3735
}
3836

3937
public function __toString(): string

‎src/Symfony/Component/Notifier/Transport/AbstractTransport.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Symfony\Component\Notifier\Transport;
1313

14-
use Symfony\Component\EventDispatcher\Event;
15-
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1614
use Symfony\Component\HttpClient\HttpClient;
1715
use Symfony\Component\Notifier\Event\MessageEvent;
1816
use Symfony\Component\Notifier\Exception\LogicException;
@@ -45,7 +43,7 @@ public function __construct(HttpClientInterface $client = null, EventDispatcherI
4543
$this->client = HttpClient::create();
4644
}
4745

48-
$this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;
46+
$this->dispatcher = $dispatcher;
4947
}
5048

5149
/**

‎src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Symfony\Component\Notifier\Transport;
1313

14-
use Symfony\Component\EventDispatcher\Event;
15-
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1614
use Symfony\Component\Notifier\Exception\IncompleteDsnException;
1715
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
1816
use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -28,7 +26,7 @@ abstract class AbstractTransportFactory implements TransportFactoryInterface
2826

2927
public function __construct(EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null)
3028
{
31-
$this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;
29+
$this->dispatcher = $dispatcher;
3230
$this->client = $client;
3331
}
3432

‎src/Symfony/Component/Notifier/Transport/NullTransport.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Symfony\Component\Notifier\Transport;
1313

14-
use Symfony\Component\EventDispatcher\Event;
15-
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1614
use Symfony\Component\Notifier\Event\MessageEvent;
1715
use Symfony\Component\Notifier\Message\MessageInterface;
1816
use Symfony\Component\Notifier\Message\NullMessage;
@@ -28,7 +26,7 @@ class NullTransport implements TransportInterface
2826

2927
public function __construct(EventDispatcherInterface $dispatcher = null)
3028
{
31-
$this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;
29+
$this->dispatcher = $dispatcher;
3230
}
3331

3432
public function send(MessageInterface $message): SentMessage

‎src/Symfony/Component/Notifier/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"symfony/http-kernel": "<5.4",
2929
"symfony/discord-notifier": "<5.4",
3030
"symfony/esendex-notifier": "<5.4",
31+
"symfony/event-dispatcher": "<5.4",
3132
"symfony/firebase-notifier": "<5.4",
3233
"symfony/free-mobile-notifier": "<5.4",
3334
"symfony/google-chat-notifier": "<5.4",

‎src/Symfony/Component/Security/Http/Firewall/ContextListener.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
namespace Symfony\Component\Security\Http\Firewall;
1313

1414
use Psr\Log\LoggerInterface;
15-
use Symfony\Component\EventDispatcher\Event;
16-
use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1715
use Symfony\Component\HttpFoundation\Request;
1816
use Symfony\Component\HttpFoundation\Session\Session;
1917
use Symfony\Component\HttpKernel\Event\RequestEvent;
@@ -68,7 +66,7 @@ public function __construct(TokenStorageInterface $tokenStorage, iterable $userP
6866
$this->userProviders = $userProviders;
6967
$this->sessionKey = '_security_'.$contextKey;
7068
$this->logger = $logger;
71-
$this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;
69+
$this->dispatcher = $dispatcher;
7270

7371
$this->trustResolver = $trustResolver ?? new AuthenticationTrustResolver(AnonymousToken::class, RememberMeToken::class);
7472
$this->sessionTrackerEnabler = $sessionTrackerEnabler;

0 commit comments

Comments
 (0)