diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-18 22:40:13 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-18 22:40:13 +0200 |
| commit | 50b628485926fe99395dc9c5b0f3d5d5b377222b (patch) | |
| tree | c9b751dec6f40dacfbc0f191f73b0141f9a831c9 /Http/RememberMe | |
| parent | f96131c5c32c9d9260028968dd5ba38e0bad91ac (diff) | |
| parent | 2a3393fbb9f593f6d0958a3058466593d6f9f69f (diff) | |
| download | symfony-security-50b628485926fe99395dc9c5b0f3d5d5b377222b.zip symfony-security-50b628485926fe99395dc9c5b0f3d5d5b377222b.tar.gz symfony-security-50b628485926fe99395dc9c5b0f3d5d5b377222b.tar.bz2 | |
Merge branch '2.4'
* 2.4:
unified return null usages
[Validator] added Japanese translation
Textarea value should default to empty string instead of null.
Fix doc blocks
[Process] Fix #10681, process are failing on Windows Server 2003
updated doc
[Security] fix DBAL connection typehint
[HttpFoundation] status 201 is allowed to have a body
unified return null usages
Conflicts:
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
src/Symfony/Component/DomCrawler/Crawler.php
src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
Diffstat (limited to 'Http/RememberMe')
| -rw-r--r-- | Http/RememberMe/AbstractRememberMeServices.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php index 1e60db0..be84208 100644 --- a/Http/RememberMe/AbstractRememberMeServices.php +++ b/Http/RememberMe/AbstractRememberMeServices.php @@ -142,8 +142,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface } $this->cancelCookie($request); - - return null; } /** |