diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-22 17:45:18 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-22 17:45:18 +0100 |
| commit | 79e6ddaa570c264ade4e6d19e84f9b98d22b5acc (patch) | |
| tree | 24836ae0cbfc9c67ea68fe3dfd4c3b124c4a5501 /Core/User/UserProviderInterface.php | |
| parent | 178e160ba5022168854176deaad4c81f45ae2288 (diff) | |
| parent | 080ac3294fac8b217afe620230600fb427bd2f51 (diff) | |
| download | symfony-security-79e6ddaa570c264ade4e6d19e84f9b98d22b5acc.zip symfony-security-79e6ddaa570c264ade4e6d19e84f9b98d22b5acc.tar.gz symfony-security-79e6ddaa570c264ade4e6d19e84f9b98d22b5acc.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[2.3] CS And DocBlock Fixes
[2.3] CS Fixes
[FrameworkBundle] Fixed Translation loader and update translation command.
[Console] remove « use » statement for PHP built-in exception classes.
[SecurityBundle] adds unit tests suite for SecurityDataCollector class.
Conflicts:
src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
Diffstat (limited to 'Core/User/UserProviderInterface.php')
| -rw-r--r-- | Core/User/UserProviderInterface.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Core/User/UserProviderInterface.php b/Core/User/UserProviderInterface.php index 6b7895c..d17e3b7 100644 --- a/Core/User/UserProviderInterface.php +++ b/Core/User/UserProviderInterface.php @@ -46,7 +46,6 @@ interface UserProviderInterface * @see UsernameNotFoundException * * @throws UsernameNotFoundException if the user is not found - * */ public function loadUserByUsername($username); @@ -57,6 +56,7 @@ interface UserProviderInterface * totally reloaded (e.g. from the database), or if the UserInterface * object can just be merged into some internal array of users / identity * map. + * * @param UserInterface $user * * @return UserInterface @@ -66,7 +66,7 @@ interface UserProviderInterface public function refreshUser(UserInterface $user); /** - * Whether this provider supports the given user class + * Whether this provider supports the given user class. * * @param string $class * |