Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'upgrade-sf3' of framagit.org:Chill-project/Chill-Main into upgrade-sf3

Browse Source 
merge...
This commit is contained in:
nobohan 2018-04-04 16:36:43 +02:00
commit fac8506893
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Security/Authorization/AbstractChillVoter.php
View File

@ -19,7 +19,8 @@
namespace Chill\MainBundle\Security\Authorization; namespace Chill\MainBundle\Security\Authorization;
use Symfony\Component\Security\Core\Authorization\Voter\AbstractVoter; use Symfony\Component\Security\Core\Authorization\Voter\Voter;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
/** /**
* Voter for Chill software. * Voter for Chill software.
@ -29,8 +30,26 @@ use Symfony\Component\Security\Core\Authorization\Voter\AbstractVoter;
* *
* @author Julien Fastré <julien.fastre@champs-libres.coop> * @author Julien Fastré <julien.fastre@champs-libres.coop>
*/ */
abstract class AbstractChillVoter extends AbstractVoter implements ChillVoterInterface abstract class AbstractChillVoter extends Voter implements ChillVoterInterface
{ {
protected function supports($attribute, $subject)
{
@trigger_error('This voter should implements the new `supports` '
. 'methods introduced by Symfony 3.0, and do not rely on '
. 'getSupportedAttributes and getSupportedClasses methods.',
E_USER_DEPRECATED);
return \in_array($attribute, $this->getSupportedAttributes($attribute))
&& \in_array(\get_class($subject), $this->getSupportedClasses());
}
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
{
@trigger_error('This voter should implements the new `voteOnAttribute` '
. 'methods introduced by Symfony 3.0, and do not rely on '
. 'isGranted method', E_USER_DEPRECATED);
return $this->isGranted($attribute, $subject, $token->getUser());
}
} }

21
Test/Export/AbstractAggregatorTest.php
View File

@ -210,19 +210,28 @@ abstract class AbstractAggregatorTest extends KernelTestCase
public function testAlterQuery(QueryBuilder $query, $data) public function testAlterQuery(QueryBuilder $query, $data)
{ {
// retains informations about query // retains informations about query
$nbOfFrom = count($query->getDQLPart('from')); $nbOfFrom = $query->getDQLPart('from') !== null ?
$nbOfWhere = count($query->getDQLPart('where')); count($query->getDQLPart('from')) : 0;
$nbOfSelect = count($query->getDQLPart('select')); $nbOfWhere = $query->getDQLPart('where') !== null ?
count($query->getDQLPart('where')) : 0;
$nbOfSelect = $query->getDQLPart('select') !== null ?
count($query->getDQLPart('select')) : 0;
$this->getAggregator()->alterQuery($query, $data); $this->getAggregator()->alterQuery($query, $data);
$this->assertGreaterThanOrEqual($nbOfFrom, count($query->getDQLPart('from')), $this->assertGreaterThanOrEqual(
$nbOfFrom,
$query->getDQLPart('from') !== null ? count($query->getDQLPart('from')) : 0,
"Test that there are equal or more 'from' clause after that the filter has "Test that there are equal or more 'from' clause after that the filter has
altered the query"); altered the query");
$this->assertGreaterThanOrEqual($nbOfWhere, count($query->getDQLPart('where')), $this->assertGreaterThanOrEqual(
$nbOfWhere,
$query->getDQLPart('where') !== null ? count($query->getDQLPart('where')) : 0,
"Test that there are equal or more 'where' clause after that the filter has" "Test that there are equal or more 'where' clause after that the filter has"
. "altered the query"); . "altered the query");
$this->assertGreaterThanOrEqual($nbOfSelect, count($query->getDQLPart('select')), $this->assertGreaterThanOrEqual(
$nbOfSelect,
$query->getDQLPart('select') !== null ? count($query->getDQLPart('select')) : 0,
"Test that the filter has no altered the 'select' part of the query"); "Test that the filter has no altered the 'select' part of the query");
} }