Si vous constatez la perte de tickets, de commentaires ou de projets, veuillez consulter la page https://status.framasoft.org/incident/626.

Commit ed00833e authored by Julien Minet's avatar Julien Minet

fix deprecations: implement abstract method supports and voteOnAttribute for ActivityVoter

parent 6327d257
Pipeline #46068 failed with stages
in 1 minute and 28 seconds
......@@ -19,12 +19,16 @@
namespace Chill\ActivityBundle\Security\Authorization;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
use Chill\MainBundle\Entity\User;
use Chill\ActivityBundle\Entity\Activity;
/**
*
*
*
* @author Julien Fastré <julien.fastre@champs-libres.coop>
*/
......@@ -35,39 +39,40 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
const SEE_DETAILS = 'CHILL_ACTIVITY_SEE_DETAILS';
const UPDATE = 'CHILL_ACTIVITY_UPDATE';
const DELETE = 'CHILL_ACTIVITY_DELETE';
/**
*
* @var AuthorizationHelper
*/
protected $helper;
public function __construct(AuthorizationHelper $helper)
{
$this->helper = $helper;
}
protected function getSupportedAttributes()
{
return array(self::CREATE, self::SEE, self::UPDATE, self::DELETE,
self::SEE_DETAILS);
}
protected function getSupportedClasses()
protected function supports($attribute, $subject)
{
return array('Chill\ActivityBundle\Entity\Activity');
if ($subject instanceof Activity) {
return \in_array($attribute, [
self::CREATE, self::SEE, self::UPDATE, self::DELETE,
self::SEE_DETAILS
]);
} else {
return false;
}
}
protected function isGranted($attribute, $report, $user = null)
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
{
if (! $user instanceof \Chill\MainBundle\Entity\User){
if (!$token->getUser() instanceof User) {
return false;
}
return $this->helper->userHasAccess($user, $report, $attribute);
return $this->helper->userHasAccess($token->getUser(), $subject, $attribute);
}
public function getRoles()
{
return $this->getSupportedAttributes();
......@@ -77,8 +82,8 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
{
return array();
}
public function getRolesWithHierarchy()
{
return [ 'Activity' => $this->getRoles() ];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment