diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-13 14:20:37 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-13 14:20:37 +0200 |
| commit | 249d6e8f35504cb9bfcc3fb1895f41393e8c9e96 (patch) | |
| tree | 74f7be3753efb9bc1f2ff4eb4b37fafbdae976e9 | |
| parent | 21e1cf7af986cce991eb77460765a98181936815 (diff) | |
| parent | d871dc4f0a969fced05085dada3f6e03974a21a9 (diff) | |
| download | symfony-security-249d6e8f35504cb9bfcc3fb1895f41393e8c9e96.zip symfony-security-249d6e8f35504cb9bfcc3fb1895f41393e8c9e96.tar.gz symfony-security-249d6e8f35504cb9bfcc3fb1895f41393e8c9e96.tar.bz2 | |
Merge branch '2.2' into 2.3
* 2.2:
[FrameworkBundle][Security] Replaced void return type with null for consistency
fixed CS
NativeSessionStorage regenerate
removed unneeded comment
Use setTimeZone if this method exists.
Fix FileResource test
fixed wrong usage of unset()
[HttpFoundation] Fixed the way path to directory is trimmed.
[Console] Fixed argument parsing when a single dash is passed.
Conflicts:
src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
| -rw-r--r-- | Core/User/UserInterface.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Core/User/UserInterface.php b/Core/User/UserInterface.php index f5bbde2..6e9b0f1 100644 --- a/Core/User/UserInterface.php +++ b/Core/User/UserInterface.php @@ -80,8 +80,6 @@ interface UserInterface * * This is important if, at any given point, sensitive information like * the plain-text password is stored on this object. - * - * @return void */ public function eraseCredentials(); } |