Skip to content

Commit b2741d1

Browse files
Merge branch '4.1'
* 4.1: (23 commits) [Routing] fix trailing slash redirection when using RedirectableUrlMatcher [PropertyAccessor] fix encoding of cache keys [WebProfiler] Detect empty file paths in file viewer fixed CS Changes for upcoming Travis' infra migration Doc fix: clarify isMethodCacheable() returns true only for GET & HEAD [MonologBridge] Return empty list for unknonwn requests [DomCrawler] exclude fields inside "template" tags Use XLIFF source rather than resname when there's no target [DoctrineBridge] catch errors while converting to db values in data collector [DoctrineBridge] fix case sensitivity issue in RememberMe\DoctrineTokenProvider [EventDispatcher] Unwrap wrapped listeners internally [Routing] fix trailing slash redirection when using RedirectableUrlMatcher Removed the return type phpdoc fix authorization checker variable name [Routing] Remove duplicate schemes and methods for invokable controllers Indentation error [HttpFoundation] Fix trailing space for mime-type with parameters [HttpFoundation] Fixed absolute Request URI with default port [Bridge/PhpUnit] fix the fix ...
2 parents b922edf + afcd87c commit b2741d1

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

EventListener/GuardListener.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ class GuardListener
2828
private $configuration;
2929
private $expressionLanguage;
3030
private $tokenStorage;
31-
private $authenticationChecker;
31+
private $authorizationChecker;
3232
private $trustResolver;
3333
private $roleHierarchy;
3434
private $validator;
3535

36-
public function __construct(array $configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authenticationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null, ValidatorInterface $validator = null)
36+
public function __construct(array $configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authorizationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null, ValidatorInterface $validator = null)
3737
{
3838
$this->configuration = $configuration;
3939
$this->expressionLanguage = $expressionLanguage;
4040
$this->tokenStorage = $tokenStorage;
41-
$this->authenticationChecker = $authenticationChecker;
41+
$this->authorizationChecker = $authorizationChecker;
4242
$this->trustResolver = $trustResolver;
4343
$this->roleHierarchy = $roleHierarchy;
4444
$this->validator = $validator;
@@ -94,7 +94,7 @@ private function getVariables(GuardEvent $event): array
9494
return $role->getRole();
9595
}, $roles),
9696
// needed for the is_granted expression function
97-
'auth_checker' => $this->authenticationChecker,
97+
'auth_checker' => $this->authorizationChecker,
9898
// needed for the is_* expression function
9999
'trust_resolver' => $this->trustResolver,
100100
// needed for the is_valid expression function

0 commit comments

Comments
 (0)