diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2011-06-16 18:00:36 +0200 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2011-06-16 18:00:36 +0200 |
commit | a35825a241b2b0fa0d5c74e7a580ada9bdb70290 (patch) | |
tree | ca0be7f00fa6d447f0ca2685e234087571c3580e /Core/User | |
parent | 4015cc3ce76a4bbfebea001dcb03f523de3b8edf (diff) | |
download | symfony-security-a35825a241b2b0fa0d5c74e7a580ada9bdb70290.zip symfony-security-a35825a241b2b0fa0d5c74e7a580ada9bdb70290.tar.gz symfony-security-a35825a241b2b0fa0d5c74e7a580ada9bdb70290.tar.bz2 |
[Security] renamed UserProviderInterface::loadUser() to refreshUser()
Diffstat (limited to 'Core/User')
-rw-r--r-- | Core/User/ChainUserProvider.php | 4 | ||||
-rw-r--r-- | Core/User/EntityUserProvider.php | 2 | ||||
-rw-r--r-- | Core/User/InMemoryUserProvider.php | 2 | ||||
-rw-r--r-- | Core/User/UserProviderInterface.php | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Core/User/ChainUserProvider.php b/Core/User/ChainUserProvider.php index d2b6e8c..e6aca32 100644 --- a/Core/User/ChainUserProvider.php +++ b/Core/User/ChainUserProvider.php @@ -50,11 +50,11 @@ class ChainUserProvider implements UserProviderInterface /** * {@inheritDoc} */ - public function loadUser(UserInterface $user) + public function refreshUser(UserInterface $user) { foreach ($this->providers as $provider) { try { - return $provider->loadUser($user); + return $provider->refreshUser($user); } catch (UnsupportedUserException $unsupported) { // try next one } diff --git a/Core/User/EntityUserProvider.php b/Core/User/EntityUserProvider.php index 61dd708..cc6f6ed 100644 --- a/Core/User/EntityUserProvider.php +++ b/Core/User/EntityUserProvider.php @@ -66,7 +66,7 @@ class EntityUserProvider implements UserProviderInterface /** * {@inheritDoc} */ - public function loadUser(UserInterface $user) + public function refreshUser(UserInterface $user) { if (!$user instanceof $this->class) { throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user))); diff --git a/Core/User/InMemoryUserProvider.php b/Core/User/InMemoryUserProvider.php index e73eb95..eae2083 100644 --- a/Core/User/InMemoryUserProvider.php +++ b/Core/User/InMemoryUserProvider.php @@ -78,7 +78,7 @@ class InMemoryUserProvider implements UserProviderInterface /** * {@inheritDoc} */ - public function loadUser(UserInterface $user) + public function refreshUser(UserInterface $user) { if (!$user instanceof User) { throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user))); diff --git a/Core/User/UserProviderInterface.php b/Core/User/UserProviderInterface.php index fb5c106..11fd62c 100644 --- a/Core/User/UserProviderInterface.php +++ b/Core/User/UserProviderInterface.php @@ -33,7 +33,7 @@ interface UserProviderInterface function loadUserByUsername($username); /** - * Loads the user for the account interface. + * Refreshes the user for the account interface. * * It is up to the implementation if it decides to reload the user data * from the database, or if it simply merges the passed User into the @@ -44,7 +44,7 @@ interface UserProviderInterface * * @return UserInterface */ - function loadUser(UserInterface $user); + function refreshUser(UserInterface $user); /** * Whether this provider supports the given user class |