summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Acl/Voter/AclVoter.php11
-rw-r--r--Http/Firewall/AbstractAuthenticationListener.php3
2 files changed, 7 insertions, 7 deletions
diff --git a/Acl/Voter/AclVoter.php b/Acl/Voter/AclVoter.php
index 574b5c2..7dd80f1 100644
--- a/Acl/Voter/AclVoter.php
+++ b/Acl/Voter/AclVoter.php
@@ -82,14 +82,13 @@ class AclVoter implements VoterInterface
$this->logger->debug(sprintf('Object identity unavailable. Voting to %s', $this->allowIfObjectIdentityUnavailable? 'grant access' : 'abstain'));
}
- if (!$this->supportsClass($oid->getType())) {
- return self::ACCESS_ABSTAIN;
- }
-
- $sids = $this->securityIdentityRetrievalStrategy->getSecurityIdentities($token);
-
return $this->allowIfObjectIdentityUnavailable ? self::ACCESS_GRANTED : self::ACCESS_ABSTAIN;
}
+
+ if (!$this->supportsClass($oid->getType())) {
+ return self::ACCESS_ABSTAIN;
+ }
+
$sids = $this->securityIdentityRetrievalStrategy->getSecurityIdentities($token);
try {
diff --git a/Http/Firewall/AbstractAuthenticationListener.php b/Http/Firewall/AbstractAuthenticationListener.php
index f5969d8..5270e8d 100644
--- a/Http/Firewall/AbstractAuthenticationListener.php
+++ b/Http/Firewall/AbstractAuthenticationListener.php
@@ -53,13 +53,14 @@ abstract class AbstractAuthenticationListener implements ListenerInterface
protected $logger;
protected $authenticationManager;
protected $providerKey;
+ protected $httpUtils;
+
private $securityContext;
private $sessionStrategy;
private $dispatcher;
private $successHandler;
private $failureHandler;
private $rememberMeServices;
- private $httpUtils;
/**
* Constructor.