Merge pull request FriendsOfSymfony#2255 from XWB/usermanager

Removed deprecated methods in UserManager

Author: XWB

Changelog.md

@@ -15,6 +15,9 @@ Changelog
 * Replaced `checkPostAuth` by `checkPreAuth` in `AuthenticationListener`.
 * [BC break] Method `ResettingController::getObfuscatedEmail` has been removed.
 * [BC break] Renamed templates to underscore case.
+* [BC break] Removed `UserManager::refreshUser`.
+* [BC break] Removed `UserManager::loadUserByUsername`.
+* [BC break] Removed `UserManager::supportsClass`.
 
 ### 2.0.0-alpha3 (2015-09-15)
 

Model/UserManager.php

@@ -14,18 +14,14 @@
 use FOS\UserBundle\Util\CanonicalizerInterface;
 use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface;
-use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
-use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
-use Symfony\Component\Security\Core\User\UserInterface as SecurityUserInterface;
-use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 /**
  * Abstract User Manager implementation which can be used as base class for your
  * concrete manager.
  *
  * @author Johannes M. Schmitt <[email protected]>
  */
-abstract class UserManager implements UserManagerInterface, UserProviderInterface
+abstract class UserManager implements UserManagerInterface
 {
     /**
      * @var EncoderFactoryInterface
@@ -103,49 +99,6 @@ public function findUserByConfirmationToken($token)
         return $this->findUserBy(array('confirmationToken' => $token));
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated Use FOS\UserBundle\Security\UserProvider instead
-     */
-    public function refreshUser(SecurityUserInterface $user)
-    {
-        @trigger_error('Using the UserManager as user provider is deprecated. Use FOS\UserBundle\Security\UserProvider instead.', E_USER_DEPRECATED);
-
-        $class = $this->getClass();
-        if (!$user instanceof $class) {
-            throw new UnsupportedUserException('Account is not supported.');
-        }
-        if (!$user instanceof User) {
-            throw new UnsupportedUserException(sprintf('Expected an instance of FOS\UserBundle\Model\User, but got "%s".', get_class($user)));
-        }
-
-        $refreshedUser = $this->findUserBy(array('id' => $user->getId()));
-        if (null === $refreshedUser) {
-            throw new UsernameNotFoundException(sprintf('User with ID "%d" could not be reloaded.', $user->getId()));
-        }
-
-        return $refreshedUser;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated Use FOS\UserBundle\Security\UserProvider instead
-     */
-    public function loadUserByUsername($username)
-    {
-        @trigger_error('Using the UserManager as user provider is deprecated. Use FOS\UserBundle\Security\UserProvider instead.', E_USER_DEPRECATED);
-
-        $user = $this->findUserByUsername($username);
-
-        if (!$user) {
-            throw new UsernameNotFoundException(sprintf('No user with name "%s" was found.', $username));
-        }
-
-        return $user;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -200,15 +153,4 @@ protected function getEncoder(UserInterface $user)
     {
         return $this->encoderFactory->getEncoder($user);
     }
-
-    /**
-     * {@inheritdoc}
-     * @deprecated Use FOS\UserBundle\Security\UserProvider instead
-     */
-    public function supportsClass($class)
-    {
-        @trigger_error('Using the UserManager as user provider is deprecated. Use FOS\UserBundle\Security\UserProvider instead.', E_USER_DEPRECATED);
-
-        return $class === $this->getClass();
-    }
 }