diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-02 21:19:20 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-02 21:19:20 +0100 |
| commit | 95579d91a123f8b2af6709bcf1e4b2157a65c6ce (patch) | |
| tree | f17bcfadb6a066bc4704e75aa2158e483c82f443 /Core/Tests/Authorization | |
| parent | c2c3bd12e70eb8c74471ecba8254057b12affb1e (diff) | |
| parent | aba0b41e79aaae3c8eb9c52f9b2da2f01adb80ca (diff) | |
| download | symfony-security-95579d91a123f8b2af6709bcf1e4b2157a65c6ce.zip symfony-security-95579d91a123f8b2af6709bcf1e4b2157a65c6ce.tar.gz symfony-security-95579d91a123f8b2af6709bcf1e4b2157a65c6ce.tar.bz2 | |
Merge branch '2.5' into 2.6v2.6.1
* 2.5:
Configure firewall's kernel exception listener with configured entry point or a default entry point
PSR-2 fixes
[DependencyInjection] make paths relative to __DIR__ in the generated container
Fixed the syntax of a composer.json file
Fixed the symfony/config version constraint
Tweaked the password-compat version constraint
Docblock fixes
Remove dialog usage
define constant only if it wasn't defined before
Fix incorrect spanish translation
Fixed typos
Conflicts:
src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/OptionsResolver/Options.php
src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
src/Symfony/Component/Process/ProcessPipes.php
src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
src/Symfony/Component/Validator/ConstraintViolation.php
src/Symfony/Component/Yaml/Inline.php
src/Symfony/Component/Yaml/Parser.php
Diffstat (limited to 'Core/Tests/Authorization')
| -rw-r--r-- | Core/Tests/Authorization/AccessDecisionManagerTest.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Core/Tests/Authorization/AccessDecisionManagerTest.php b/Core/Tests/Authorization/AccessDecisionManagerTest.php index bf0ad11..ae5894d 100644 --- a/Core/Tests/Authorization/AccessDecisionManagerTest.php +++ b/Core/Tests/Authorization/AccessDecisionManagerTest.php @@ -107,8 +107,8 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase $voter->expects($this->exactly(2)) ->method('vote') ->will($this->returnValueMap(array( - array($token, null, array("ROLE_FOO"),$vote1), - array($token, null, array("ROLE_BAR"),$vote2), + array($token, null, array("ROLE_FOO"), $vote1), + array($token, null, array("ROLE_BAR"), $vote2), ))) ; |