diff --git a/Security/User/ModelUserProvider.php b/Security/User/ModelUserProvider.php index 388ea880..e3720411 100644 --- a/Security/User/ModelUserProvider.php +++ b/Security/User/ModelUserProvider.php @@ -1,112 +1,110 @@ - - */ -class ModelUserProvider implements UserProviderInterface -{ - - /** - * A Model class name. - * @var string - */ - protected $class; - - /** - * A Proxy class name for the model class. - * @var string - */ - protected $proxyClass; - - /** - * A Query class name. - * @var string - */ - protected $queryClass; - - /** - * A property to use to retrieve the user. - * @var string - */ - protected $property; - - /** - * Default constructor - * - * @param $class The User model class. - * @param $proxyClass The Proxy class name for the model class. - * @param $property The property to use to retrieve a user. - */ - public function __construct($class, $proxyClass, $property = null) - { - $this->class = $class; - $this->proxyClass = $proxyClass; - $this->queryClass = $class . 'Query'; - $this->property = $property; - } - - /** - * {@inheritdoc} - */ - public function loadUserByUsername($username) - { - $queryClass = $this->queryClass; - - $query = $queryClass::create(); - - if (null !== $this->property) { - $filter = 'filterBy' . ucfirst($this->property); - $query->$filter($username); - } else { - $query->filterByUsername($username); - } - - $user = $query->findOne(); - - if (null === $user) { - throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username)); - } - $proxyClass = $this->proxyClass; - return new $proxyClass($user); - } - - /** - * {@inheritdoc} - */ - public function refreshUser(UserInterface $user) - { - if (!$user instanceof $this->proxyClass) { - throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user))); - } - - return $this->loadUserByUsername($user->getUsername()); - } - - /** - * {@inheritdoc} - */ - public function supportsClass($class) - { - return $class === $this->proxyClass; - } - -} + + */ +class ModelUserProvider implements UserProviderInterface +{ + /** + * A Model class name. + * @var string + */ + protected $class; + + /** + * A Proxy class name for the model class. + * @var string + */ + protected $proxyClass; + + /** + * A Query class name. + * @var string + */ + protected $queryClass; + + /** + * A property to use to retrieve the user. + * @var string + */ + protected $property; + + /** + * Default constructor + * + * @param $class The User model class. + * @param $proxyClass The Proxy class name for the model class. + * @param $property The property to use to retrieve a user. + */ + public function __construct($class, $proxyClass, $property = null) + { + $this->class = $class; + $this->proxyClass = $proxyClass; + $this->queryClass = $class . 'Query'; + $this->property = $property; + } + + /** + * {@inheritdoc} + */ + public function loadUserByUsername($username) + { + $queryClass = $this->queryClass; + $query = $queryClass::create(); + + if (null !== $this->property) { + $filter = 'filterBy' . ucfirst($this->property); + $query->$filter($username); + } else { + $query->filterByUsername($username); + } + + $user = $query->findOne(); + + if (null === $user) { + throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username)); + } + + $proxyClass = $this->proxyClass; + return new $proxyClass($user); + } + + /** + * {@inheritdoc} + */ + public function refreshUser(UserInterface $user) + { + if (!$user instanceof $this->proxyClass) { + throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user))); + } + + return $this->loadUserByUsername($user->getUsername()); + } + + /** + * {@inheritdoc} + */ + public function supportsClass($class) + { + return $class === $this->proxyClass; + } +}