diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-22 17:57:18 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-22 17:57:18 +0100 |
| commit | 71583a67fb04833fa05bc754de6a11cddedf1af6 (patch) | |
| tree | 26aee6852561af53ad926aed0587820638cd71df /Core/Tests/Authorization/AccessDecisionManagerTest.php | |
| parent | 392a5d13bca0f0559fef926b7a28a00353d91db9 (diff) | |
| parent | 14ee647257dcabea3d193c1f1f508d85ef6f0948 (diff) | |
| download | symfony-security-71583a67fb04833fa05bc754de6a11cddedf1af6.zip symfony-security-71583a67fb04833fa05bc754de6a11cddedf1af6.tar.gz symfony-security-71583a67fb04833fa05bc754de6a11cddedf1af6.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
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)
[WebProfilerBundle] fixed undefined buttons.
[WebProfilerBundle] Fix javascript toolbar on IE8
[DependencyInjection] Highest precedence for user parameters
bumped Symfony version to 2.6.6
[Translation][MoFileLoader] fixed load empty translation.
updated VERSION for 2.6.5
updated CHANGELOG for 2.6.5
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
[HttpKernel] UriSigner::buildUrl - default params for http_build_query
Conflicts:
src/Symfony/Bridge/Propel1/Tests/DataCollector/PropelDataCollectorTest.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php
src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
Diffstat (limited to 'Core/Tests/Authorization/AccessDecisionManagerTest.php')
| -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), ))) ; |