gracefully handle missing event dispatchers

Author: xabbuh

Core/Authorization/Voter/TraceableVoter.php

@@ -31,7 +31,12 @@ class TraceableVoter implements VoterInterface
  public function __construct(VoterInterface $voter, EventDispatcherInterface $eventDispatcher)
  {
  $this->voter = $voter;
- $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+
+ if (class_exists(LegacyEventDispatcherProxy::class)) {
+ $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+ } else {
+ $this->eventDispatcher = $eventDispatcher;
+ }
  }
 
  public function vote(TokenInterface $token, $subject, array $attributes)

Guard/GuardAuthenticatorHandler.php

@@ -46,7 +46,13 @@ class GuardAuthenticatorHandler
  public function __construct(TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher = null, array $statelessProviderKeys = [])
  {
  $this->tokenStorage = $tokenStorage;
- $this->dispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+
+ if (null !== $eventDispatcher && class_exists(LegacyEventDispatcherProxy::class)) {
+ $this->dispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+ } else {
+ $this->dispatcher = $eventDispatcher;
+ }
+
  $this->statelessProviderKeys = $statelessProviderKeys;
  }
 

Http/Firewall/AbstractAuthenticationListener.php

@@ -93,7 +93,13 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM
  'require_previous_session' => true,
  ], $options);
  $this->logger = $logger;
- $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+
+ if (null !== $dispatcher && class_exists(LegacyEventDispatcherProxy::class)) {
+ $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+ } else {
+ $this->dispatcher = $dispatcher;
+ }
+
  $this->httpUtils = $httpUtils;
  }
 

Http/Firewall/AbstractPreAuthenticatedListener.php

@@ -52,7 +52,12 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM
  $this->authenticationManager = $authenticationManager;
  $this->providerKey = $providerKey;
  $this->logger = $logger;
- $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+
+ if (null !== $dispatcher && class_exists(LegacyEventDispatcherProxy::class)) {
+ $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+ } else {
+ $this->dispatcher = $dispatcher;
+ }
  }
 
  /**

Http/Firewall/ContextListener.php

@@ -66,7 +66,13 @@ public function __construct(TokenStorageInterface $tokenStorage, iterable $userP
  $this->userProviders = $userProviders;
  $this->sessionKey = '_security_'.$contextKey;
  $this->logger = $logger;
- $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+
+ if (null !== $dispatcher && class_exists(LegacyEventDispatcherProxy::class)) {
+ $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+ } else {
+ $this->dispatcher = $dispatcher;
+ }
+
  $this->trustResolver = $trustResolver ?: new AuthenticationTrustResolver(AnonymousToken::class, RememberMeToken::class);
  }
 

Http/Firewall/RememberMeListener.php

@@ -49,7 +49,13 @@ public function __construct(TokenStorageInterface $tokenStorage, RememberMeServi
  $this->rememberMeServices = $rememberMeServices;
  $this->authenticationManager = $authenticationManager;
  $this->logger = $logger;
- $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+
+ if (null !== $dispatcher && class_exists(LegacyEventDispatcherProxy::class)) {
+ $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+ } else {
+ $this->dispatcher = $dispatcher;
+ }
+
  $this->catchExceptions = $catchExceptions;
  $this->sessionStrategy = null === $sessionStrategy ? new SessionAuthenticationStrategy(SessionAuthenticationStrategy::MIGRATE) : $sessionStrategy;
  }

Http/Firewall/SimplePreAuthenticationListener.php

@@ -65,7 +65,13 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM
  $this->providerKey = $providerKey;
  $this->simpleAuthenticator = $simpleAuthenticator;
  $this->logger = $logger;
- $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+
+ if (null !== $dispatcher && class_exists(LegacyEventDispatcherProxy::class)) {
+ $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+ } else {
+ $this->dispatcher = $dispatcher;
+ }
+
  $this->trustResolver = $trustResolver ?: new AuthenticationTrustResolver(AnonymousToken::class, RememberMeToken::class);
  }
 

Http/Firewall/SwitchUserListener.php

@@ -70,7 +70,13 @@ public function __construct(TokenStorageInterface $tokenStorage, UserProviderInt
  $this->usernameParameter = $usernameParameter;
  $this->role = $role;
  $this->logger = $logger;
- $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+
+ if (null !== $dispatcher && class_exists(LegacyEventDispatcherProxy::class)) {
+ $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+ } else {
+ $this->dispatcher = $dispatcher;
+ }
+
  $this->stateless = $stateless;
  }
 

Http/Firewall/UsernamePasswordJsonAuthenticationListener.php

@@ -69,7 +69,13 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM
  $this->successHandler = $successHandler;
  $this->failureHandler = $failureHandler;
  $this->logger = $logger;
- $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+
+ if (null !== $eventDispatcher && class_exists(LegacyEventDispatcherProxy::class)) {
+ $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+ } else {
+ $this->eventDispatcher = $eventDispatcher;
+ }
+
  $this->options = array_merge(['username_path' => 'username', 'password_path' => 'password'], $options);
  $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
  }