From 2707b12e9d9110ba1dfd1789f05e8477ad9bd7c5 Mon Sep 17 00:00:00 2001 From: Wouter J Date: Thu, 24 Sep 2015 14:52:46 +0200 Subject: [PATCH] Improve deprecation logic to minimalize the changes required in 3.0 --- .../Core/Authorization/Voter/AbstractVoter.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php index 6bbea361fd098..86841d88fa9f8 100644 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php +++ b/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php @@ -79,16 +79,9 @@ public function vote(TokenInterface $token, $object, array $attributes) // as soon as at least one attribute is supported, default is to deny access $vote = self::ACCESS_DENIED; - if ($isNewOverwritten) { - if ($this->voteOnAttribute($attribute, $object, $token)) { - // grant access as soon as at least one voter returns a positive response - return self::ACCESS_GRANTED; - } - } else { - if ($this->isGranted($attribute, $object, $token->getUser())) { - // grant access as soon as at least one voter returns a positive response - return self::ACCESS_GRANTED; - } + if ($this->voteOnAttribute($attribute, $object, $token)) { + // grant access as soon as at least one voter returns a positive response + return self::ACCESS_GRANTED; } } @@ -146,6 +139,6 @@ protected function isGranted($attribute, $object, $user = null) */ protected function voteOnAttribute($attribute, $object, TokenInterface $token) { - return false; + return $this->isGranted($attribute, $object, $token->getUser()); } }