diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-22 17:55:57 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-22 17:55:57 +0100 |
| commit | 14ee647257dcabea3d193c1f1f508d85ef6f0948 (patch) | |
| tree | f77c55b3a7ea62613a9be140cba3431299d1567c /Core/Tests/Authorization | |
| parent | 33c79de444fd031ff45425e7007f56677c3ff11f (diff) | |
| parent | 419d7792f0f74cb94cbf7bff159084564e32a1d0 (diff) | |
| download | symfony-security-14ee647257dcabea3d193c1f1f508d85ef6f0948.zip symfony-security-14ee647257dcabea3d193c1f1f508d85ef6f0948.tar.gz symfony-security-14ee647257dcabea3d193c1f1f508d85ef6f0948.tar.bz2 | |
Merge branch '2.3' into 2.6
* 2.3:
Fix small coding style
[2.3] Static Code Analysis for Components
[Form] fixed phpdoc
CS: Convert double quotes to single quotes
Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader.
[Validator] added Japanese translation for unmatched charset (id: 80)
[DependencyInjection] Highest precedence for user parameters
[Translation][MoFileLoader] fixed load empty translation.
bumped Symfony version to 2.3.27
updated VERSION for 2.3.26
update CONTRIBUTORS for 2.3.26
updated CHANGELOG for 2.3.26
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
src/Symfony/Component/Config/Definition/ReferenceDumper.php
src/Symfony/Component/Debug/ExceptionHandler.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
src/Symfony/Component/Filesystem/Filesystem.php
src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Translation/PluralizationRules.php
src/Symfony/Component/Validator/Constraints/IssnValidator.php
src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
src/Symfony/Component/Yaml/Tests/InlineTest.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 ae5894d..126bfe8 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), ))) ; |