comparison core/lib/Drupal/Core/EventSubscriber/AuthenticationSubscriber.php @ 5:12f9dff5fda9 tip

Update to Drupal core 8.7.1

 use Drupal\Core\Session\AccountProxyInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * Authentication subscriber.
  *

    *   The request event.
    *
    * @see \Drupal\Core\Authentication\AuthenticationProviderInterface::authenticate()
    */
   public function onKernelRequestAuthenticate(GetResponseEvent $event) {
-    if ($event->getRequestType() === HttpKernelInterface::MASTER_REQUEST) {
+    if ($event->isMasterRequest()) {
       $request = $event->getRequest();
       if ($this->authenticationProvider->applies($request)) {
         $account = $this->authenticationProvider->authenticate($request);
         if ($account) {
           $this->accountProxy->setAccount($account);

    *
    * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event
    *   The request event.
    */
   public function onKernelRequestFilterProvider(GetResponseEvent $event) {
-    if (isset($this->filter) && $event->getRequestType() === HttpKernelInterface::MASTER_REQUEST) {
+    if (isset($this->filter) && $event->isMasterRequest()) {
       $request = $event->getRequest();
       if ($this->authenticationProvider->applies($request) && !$this->filter->appliesToRoutedRequest($request, TRUE)) {
         throw new AccessDeniedHttpException('The used authentication method is not allowed on this route.');
       }
     }

    *
    * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
    *   The exception event.
    */
   public function onExceptionSendChallenge(GetResponseForExceptionEvent $event) {
-    if (isset($this->challengeProvider) && $event->getRequestType() === HttpKernelInterface::MASTER_REQUEST) {
+    if (isset($this->challengeProvider) && $event->isMasterRequest()) {
       $request = $event->getRequest();
       $exception = $event->getException();
       if ($exception instanceof AccessDeniedHttpException && !$this->authenticationProvider->applies($request) && (!isset($this->filter) || $this->filter->appliesToRoutedRequest($request, FALSE))) {
         $challenge_exception = $this->challengeProvider->challengeException($request, $exception);
         if ($challenge_exception) {

   /**
    * Detect disallowed authentication methods on access denied exceptions.
    *
    * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
    */
-  public function _onExceptionAccessDenied(GetResponseForExceptionEvent $event) {
+  public function onExceptionAccessDenied(GetResponseForExceptionEvent $event) {
     if (isset($this->filter) && $event->isMasterRequest()) {
       $request = $event->getRequest();
       $exception = $event->getException();
       if ($exception instanceof AccessDeniedHttpException && $this->authenticationProvider->applies($request) && !$this->filter->appliesToRoutedRequest($request, TRUE)) {
         $event->setException(new AccessDeniedHttpException('The used authentication method is not allowed on this route.', $exception));

     $events[KernelEvents::REQUEST][] = ['onKernelRequestAuthenticate', 300];
 
     // Access check must be performed after routing.
     $events[KernelEvents::REQUEST][] = ['onKernelRequestFilterProvider', 31];
     $events[KernelEvents::EXCEPTION][] = ['onExceptionSendChallenge', 75];
-    $events[KernelEvents::EXCEPTION][] = ['_onExceptionAccessDenied', 80];
+    $events[KernelEvents::EXCEPTION][] = ['onExceptionAccessDenied', 80];
     return $events;
   }
 
 }