Commit eeff93c8 authored by Julien Minet's avatar Julien Minet
Browse files

fix deprecations: implement abstract function for reportVoter

parent 1b4bb4f7
Pipeline #46051 failed with stages
in 1 minute and 18 seconds
......@@ -19,12 +19,17 @@
namespace Chill\ReportBundle\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\ReportBundle\Entity\Report;
use Chill\MainBundle\Entity\User;
/**
*
*
*
* @author Julien Fastré <julien.fastre@champs-libres.coop>
*/
......@@ -33,38 +38,41 @@ class ReportVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
const CREATE = 'CHILL_REPORT_CREATE';
const SEE = 'CHILL_REPORT_SEE';
const UPDATE = 'CHILL_REPORT_UPDATE';
/**
*
* @var AuthorizationHelper
*/
protected $helper;
public function __construct(AuthorizationHelper $helper)
{
$this->helper = $helper;
}
protected function getSupportedAttributes()
{
return array(self::CREATE, self::SEE, self::UPDATE);
}
protected function getSupportedClasses()
protected function supports($attribute, $subject)
{
return array('Chill\ReportBundle\Entity\Report');
if ($subject instanceof Report) {
return \in_array($attribute, [
self::CREATE, self::UPDATE, self::SEE
]);
} 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();
......@@ -74,7 +82,7 @@ class ReportVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
{
return array();
}
public function getRolesWithHierarchy()
{
return [ 'Report' => $this->getRoles() ];
......
Supports Markdown
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