diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-06 10:31:51 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-06 10:31:51 +0200 |
| commit | 30e9e96aee9e644889a5ec669382e1e1bbd79abe (patch) | |
| tree | 8e9c49b0442b87b564a2197ddced1cbe5b8618c7 /Core/Tests | |
| parent | 427c50c174f7ae307d61a722da4ab53e87819041 (diff) | |
| parent | a23e3f65689331b054159daf8316cc3da3676596 (diff) | |
| download | symfony-security-30e9e96aee9e644889a5ec669382e1e1bbd79abe.zip symfony-security-30e9e96aee9e644889a5ec669382e1e1bbd79abe.tar.gz symfony-security-30e9e96aee9e644889a5ec669382e1e1bbd79abe.tar.bz2 | |
Merge branch '2.3' into 2.7
Conflicts:
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Component/Process/Process.php
Diffstat (limited to 'Core/Tests')
| -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 3c970d1..7a9ab08 100644 --- a/Core/Tests/Authorization/AccessDecisionManagerTest.php +++ b/Core/Tests/Authorization/AccessDecisionManagerTest.php @@ -104,7 +104,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), |