Skip to content

Commit 051398a

Browse files
committed
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
2 parents c272bab + 1b603ae commit 051398a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Authentication/Provider/DaoAuthenticationProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected function checkAuthentication(UserInterface $user, UsernamePasswordToke
5959
throw new BadCredentialsException('The credentials were changed from another session.');
6060
}
6161
} else {
62-
if ("" === ($presentedPassword = $token->getCredentials())) {
62+
if ('' === ($presentedPassword = $token->getCredentials())) {
6363
throw new BadCredentialsException('The presented password cannot be empty.');
6464
}
6565

Tests/Authorization/AccessDecisionManagerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ protected function getVoterFor2Roles($token, $vote1, $vote2)
107107
$voter->expects($this->exactly(2))
108108
->method('vote')
109109
->will($this->returnValueMap(array(
110-
array($token, null, array("ROLE_FOO"), $vote1),
111-
array($token, null, array("ROLE_BAR"), $vote2),
110+
array($token, null, array('ROLE_FOO'), $vote1),
111+
array($token, null, array('ROLE_BAR'), $vote2),
112112
)))
113113
;
114114

0 commit comments

Comments
 (0)