diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-09-22 11:14:18 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-09-22 11:14:18 +0200 |
| commit | 133d64ad84f9e37d681c70db8a05743fa2001e11 (patch) | |
| tree | dcc9de2e552cb9e008b74cf7fc745e9317503a7b /Http/RememberMe/TokenBasedRememberMeServices.php | |
| parent | 8f099fcbce1ba9a86d5b15c5558de80a8242d91e (diff) | |
| parent | 78ebbab243651e31b940cb1330b06361dbd3c37b (diff) | |
| download | symfony-security-133d64ad84f9e37d681c70db8a05743fa2001e11.zip symfony-security-133d64ad84f9e37d681c70db8a05743fa2001e11.tar.gz symfony-security-133d64ad84f9e37d681c70db8a05743fa2001e11.tar.bz2 | |
Merge branch '2.4' into 2.5
* 2.4:
fixed CS
[Process] fixed some volatile tests
[HttpKernel] fixed a volatile test
[HttpFoundation] fixed some volatile tests
[Tests] PHPUnit Optimizations
Use getPathname() instead of string casting to get BinaryFileReponse file path
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
src/Symfony/Component/Validator/Constraints/CollectionValidator.php
src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
src/Symfony/Component/Validator/Tests/ValidationVisitorTest.php
src/Symfony/Component/Yaml/Parser.php
Diffstat (limited to 'Http/RememberMe/TokenBasedRememberMeServices.php')
| -rw-r--r-- | Http/RememberMe/TokenBasedRememberMeServices.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php index 0cc4a71..32a0df0 100644 --- a/Http/RememberMe/TokenBasedRememberMeServices.php +++ b/Http/RememberMe/TokenBasedRememberMeServices.php @@ -105,7 +105,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices $class, base64_encode($username), $expires, - $this->generateCookieHash($class, $username, $expires, $password) + $this->generateCookieHash($class, $username, $expires, $password), )); } |