From 5054709707fa5318c7e1e5e4b032fd7a1e5f24f0 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 20 May 2021 02:33:18 +0200 Subject: [PATCH] [EventDispatcher] Remove LegacyEventDispatcherProxy --- .../Component/EventDispatcher/CHANGELOG.md | 5 +++ .../LegacyEventDispatcherProxy.php | 31 ------------------- .../Component/EventDispatcher/composer.json | 1 - src/Symfony/Component/Mailer/Mailer.php | 4 +-- .../Mailer/Transport/AbstractTransport.php | 4 +-- .../Middleware/SendMessageMiddleware.php | 4 +-- src/Symfony/Component/Messenger/Worker.php | 4 +-- src/Symfony/Component/Notifier/Chatter.php | 4 +-- src/Symfony/Component/Notifier/Texter.php | 4 +-- .../Notifier/Transport/AbstractTransport.php | 4 +-- .../Transport/AbstractTransportFactory.php | 4 +-- .../Notifier/Transport/NullTransport.php | 4 +-- src/Symfony/Component/Notifier/composer.json | 1 + .../Http/Firewall/ContextListener.php | 4 +-- 14 files changed, 16 insertions(+), 62 deletions(-) delete mode 100644 src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php diff --git a/src/Symfony/Component/EventDispatcher/CHANGELOG.md b/src/Symfony/Component/EventDispatcher/CHANGELOG.md index 82ce274be577c..d4609dc62f228 100644 --- a/src/Symfony/Component/EventDispatcher/CHANGELOG.md +++ b/src/Symfony/Component/EventDispatcher/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +6.0 +--- + + * Remove `LegacyEventDispatcherProxy` + 5.3 --- diff --git a/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php b/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php deleted file mode 100644 index 6e17c8fcc9c24..0000000000000 --- a/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php +++ /dev/null @@ -1,31 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\EventDispatcher; - -use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; - -trigger_deprecation('symfony/event-dispatcher', '5.1', '%s is deprecated, use the event dispatcher without the proxy.', LegacyEventDispatcherProxy::class); - -/** - * A helper class to provide BC/FC with the legacy signature of EventDispatcherInterface::dispatch(). - * - * @author Nicolas Grekas - * - * @deprecated since Symfony 5.1 - */ -final class LegacyEventDispatcherProxy -{ - public static function decorate(?EventDispatcherInterface $dispatcher): ?EventDispatcherInterface - { - return $dispatcher; - } -} diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json index d086a35a58576..b7bdaccc89fe3 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -17,7 +17,6 @@ ], "require": { "php": ">=8.0.2", - "symfony/deprecation-contracts": "^2.1", "symfony/event-dispatcher-contracts": "^2" }, "require-dev": { diff --git a/src/Symfony/Component/Mailer/Mailer.php b/src/Symfony/Component/Mailer/Mailer.php index d15aa558f7075..56cba3f7aa203 100644 --- a/src/Symfony/Component/Mailer/Mailer.php +++ b/src/Symfony/Component/Mailer/Mailer.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Mailer; -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy; use Symfony\Component\Mailer\Event\MessageEvent; use Symfony\Component\Mailer\Messenger\SendEmailMessage; use Symfony\Component\Mailer\Transport\TransportInterface; @@ -33,7 +31,7 @@ public function __construct(TransportInterface $transport, MessageBusInterface $ { $this->transport = $transport; $this->bus = $bus; - $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher; + $this->dispatcher = $dispatcher; } public function send(RawMessage $message, Envelope $envelope = null): void diff --git a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php index 73f23b27b3731..790167bcb5bbe 100644 --- a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php +++ b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php @@ -13,8 +13,6 @@ use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy; use Symfony\Component\Mailer\Envelope; use Symfony\Component\Mailer\Event\MessageEvent; use Symfony\Component\Mailer\SentMessage; @@ -34,7 +32,7 @@ abstract class AbstractTransport implements TransportInterface public function __construct(EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) { - $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher; + $this->dispatcher = $dispatcher; $this->logger = $logger ?? new NullLogger(); } diff --git a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php index 792eaa95f1063..23ec1723c59e3 100644 --- a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php @@ -13,8 +13,6 @@ use Psr\Log\LoggerAwareTrait; use Psr\Log\NullLogger; -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy; use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Event\SendMessageToTransportsEvent; use Symfony\Component\Messenger\Stamp\ReceivedStamp; @@ -36,7 +34,7 @@ class SendMessageMiddleware implements MiddlewareInterface public function __construct(SendersLocatorInterface $sendersLocator, EventDispatcherInterface $eventDispatcher = null) { $this->sendersLocator = $sendersLocator; - $this->eventDispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($eventDispatcher) : $eventDispatcher; + $this->eventDispatcher = $eventDispatcher; $this->logger = new NullLogger(); } diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php index f13edcc2f5a05..0c09224adc66c 100644 --- a/src/Symfony/Component/Messenger/Worker.php +++ b/src/Symfony/Component/Messenger/Worker.php @@ -12,8 +12,6 @@ namespace Symfony\Component\Messenger; use Psr\Log\LoggerInterface; -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy; use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent; use Symfony\Component\Messenger\Event\WorkerMessageHandledEvent; use Symfony\Component\Messenger\Event\WorkerMessageReceivedEvent; @@ -51,7 +49,7 @@ public function __construct(array $receivers, MessageBusInterface $bus, EventDis $this->receivers = $receivers; $this->bus = $bus; $this->logger = $logger; - $this->eventDispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($eventDispatcher) : $eventDispatcher; + $this->eventDispatcher = $eventDispatcher; } /** diff --git a/src/Symfony/Component/Notifier/Chatter.php b/src/Symfony/Component/Notifier/Chatter.php index 2949e19ec987e..b016a421c2a58 100644 --- a/src/Symfony/Component/Notifier/Chatter.php +++ b/src/Symfony/Component/Notifier/Chatter.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Notifier; -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy; use Symfony\Component\Messenger\MessageBusInterface; use Symfony\Component\Notifier\Event\MessageEvent; use Symfony\Component\Notifier\Message\MessageInterface; @@ -33,7 +31,7 @@ public function __construct(TransportInterface $transport, MessageBusInterface $ { $this->transport = $transport; $this->bus = $bus; - $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher; + $this->dispatcher = $dispatcher; } public function __toString(): string diff --git a/src/Symfony/Component/Notifier/Texter.php b/src/Symfony/Component/Notifier/Texter.php index f0c526ad5d438..fd0490dd1212d 100644 --- a/src/Symfony/Component/Notifier/Texter.php +++ b/src/Symfony/Component/Notifier/Texter.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Notifier; -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy; use Symfony\Component\Messenger\MessageBusInterface; use Symfony\Component\Notifier\Event\MessageEvent; use Symfony\Component\Notifier\Message\MessageInterface; @@ -33,7 +31,7 @@ public function __construct(TransportInterface $transport, MessageBusInterface $ { $this->transport = $transport; $this->bus = $bus; - $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher; + $this->dispatcher = $dispatcher; } public function __toString(): string diff --git a/src/Symfony/Component/Notifier/Transport/AbstractTransport.php b/src/Symfony/Component/Notifier/Transport/AbstractTransport.php index 670fd49847ebd..85d1dc6c0b8e3 100644 --- a/src/Symfony/Component/Notifier/Transport/AbstractTransport.php +++ b/src/Symfony/Component/Notifier/Transport/AbstractTransport.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Notifier\Transport; -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy; use Symfony\Component\HttpClient\HttpClient; use Symfony\Component\Notifier\Event\MessageEvent; use Symfony\Component\Notifier\Exception\LogicException; @@ -45,7 +43,7 @@ public function __construct(HttpClientInterface $client = null, EventDispatcherI $this->client = HttpClient::create(); } - $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher; + $this->dispatcher = $dispatcher; } /** diff --git a/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php b/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php index d595aa623a723..0a1d1513e8bae 100644 --- a/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php +++ b/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Notifier\Transport; -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy; use Symfony\Component\Notifier\Exception\IncompleteDsnException; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Contracts\HttpClient\HttpClientInterface; @@ -28,7 +26,7 @@ abstract class AbstractTransportFactory implements TransportFactoryInterface public function __construct(EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null) { - $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher; + $this->dispatcher = $dispatcher; $this->client = $client; } diff --git a/src/Symfony/Component/Notifier/Transport/NullTransport.php b/src/Symfony/Component/Notifier/Transport/NullTransport.php index 5178b1e14e8f4..ac9fe97f9b209 100644 --- a/src/Symfony/Component/Notifier/Transport/NullTransport.php +++ b/src/Symfony/Component/Notifier/Transport/NullTransport.php @@ -11,8 +11,6 @@ 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; use Symfony\Component\Notifier\Message\NullMessage; @@ -28,7 +26,7 @@ class NullTransport implements TransportInterface public function __construct(EventDispatcherInterface $dispatcher = null) { - $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher; + $this->dispatcher = $dispatcher; } public function send(MessageInterface $message): SentMessage diff --git a/src/Symfony/Component/Notifier/composer.json b/src/Symfony/Component/Notifier/composer.json index 1a08ab5c2ef44..7f0a8b8785a52 100644 --- a/src/Symfony/Component/Notifier/composer.json +++ b/src/Symfony/Component/Notifier/composer.json @@ -28,6 +28,7 @@ "symfony/http-kernel": "<5.4", "symfony/discord-notifier": "<5.4", "symfony/esendex-notifier": "<5.4", + "symfony/event-dispatcher": "<5.4", "symfony/firebase-notifier": "<5.4", "symfony/free-mobile-notifier": "<5.4", "symfony/google-chat-notifier": "<5.4", diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php index 9416777b81ae3..009de18034eea 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php @@ -12,8 +12,6 @@ namespace Symfony\Component\Security\Http\Firewall; use Psr\Log\LoggerInterface; -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpKernel\Event\RequestEvent; @@ -68,7 +66,7 @@ public function __construct(TokenStorageInterface $tokenStorage, iterable $userP $this->userProviders = $userProviders; $this->sessionKey = '_security_'.$contextKey; $this->logger = $logger; - $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher; + $this->dispatcher = $dispatcher; $this->trustResolver = $trustResolver ?? new AuthenticationTrustResolver(AnonymousToken::class, RememberMeToken::class); $this->sessionTrackerEnabler = $sessionTrackerEnabler;