Merge branch '3.4' into 4.1

* 3.4:
  fix authorization checker variable name
  [Routing] Remove duplicate schemes and methods for invokable controllers
  [Bridge/PhpUnit] fix the fix

Author: fabpot

EventListener/GuardListener.php

@@ -28,17 +28,17 @@ class GuardListener
     private $configuration;
     private $expressionLanguage;
     private $tokenStorage;
-    private $authenticationChecker;
+    private $authorizationChecker;
     private $trustResolver;
     private $roleHierarchy;
     private $validator;
 
-    public function __construct(array $configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authenticationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null, ValidatorInterface $validator = null)
+    public function __construct(array $configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authorizationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null, ValidatorInterface $validator = null)
     {
         $this->configuration = $configuration;
         $this->expressionLanguage = $expressionLanguage;
         $this->tokenStorage = $tokenStorage;
-        $this->authenticationChecker = $authenticationChecker;
+        $this->authorizationChecker = $authorizationChecker;
         $this->trustResolver = $trustResolver;
         $this->roleHierarchy = $roleHierarchy;
         $this->validator = $validator;
@@ -94,7 +94,7 @@ private function getVariables(GuardEvent $event): array
                 return $role->getRole();
             }, $roles),
             // needed for the is_granted expression function
-            'auth_checker' => $this->authenticationChecker,
+            'auth_checker' => $this->authorizationChecker,
             // needed for the is_* expression function
             'trust_resolver' => $this->trustResolver,
             // needed for the is_valid expression function