diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-06 19:12:59 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-06 19:12:59 +0200 |
| commit | ce07ac56f610bc9ca1ef11fddf90d38d3b72f85e (patch) | |
| tree | 5cce7f9ba7469c8ee4577a0b8ca3c8abe940f9ab /Core/Tests/Authorization/AccessDecisionManagerTest.php | |
| parent | 99d73ecb12dedf5c772aab7f00e7d39b60c5f4ed (diff) | |
| parent | 13818e3015a2a20025ae65b6f57756795eaeda7e (diff) | |
| download | symfony-security-ce07ac56f610bc9ca1ef11fddf90d38d3b72f85e.zip symfony-security-ce07ac56f610bc9ca1ef11fddf90d38d3b72f85e.tar.gz symfony-security-ce07ac56f610bc9ca1ef11fddf90d38d3b72f85e.tar.bz2 | |
Merge branch '2.7' into 2.8
Conflicts:
src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
src/Symfony/Component/Security/composer.json
Diffstat (limited to 'Core/Tests/Authorization/AccessDecisionManagerTest.php')
| -rw-r--r-- | Core/Tests/Authorization/AccessDecisionManagerTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Tests/Authorization/AccessDecisionManagerTest.php b/Core/Tests/Authorization/AccessDecisionManagerTest.php index 08bbc58..412af91 100644 --- a/Core/Tests/Authorization/AccessDecisionManagerTest.php +++ b/Core/Tests/Authorization/AccessDecisionManagerTest.php @@ -102,7 +102,7 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase protected function getVoterFor2Roles($token, $vote1, $vote2) { $voter = $this->getMock('Symfony\Component\Security\Core\Authorization\Voter\VoterInterface'); - $voter->expects($this->exactly(2)) + $voter->expects($this->any()) ->method('vote') ->will($this->returnValueMap(array( array($token, null, array('ROLE_FOO'), $vote1), |