Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed the CS

  • Loading branch information...
commit 1f8d58a998fa3c5725e8671e15e1a4e710896690 1 parent fa8d00c
@stof authored
View
4 Command/ActivateUserCommand.php
@@ -15,7 +15,6 @@
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use FOS\UserBundle\Model\User;
/**
@@ -64,8 +63,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
$username = $this->getHelper('dialog')->askAndValidate(
$output,
'Please choose a username:',
- function($username)
- {
+ function($username) {
if (empty($username)) {
throw new \Exception('Username can not be empty');
}
View
7 Command/ChangePasswordCommand.php
@@ -15,7 +15,6 @@
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use FOS\UserBundle\Model\User;
/**
@@ -73,8 +72,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
$username = $this->getHelper('dialog')->askAndValidate(
$output,
'Please give the username:',
- function($username)
- {
+ function($username) {
if (empty($username)) {
throw new \Exception('Username can not be empty');
}
@@ -89,8 +87,7 @@ function($username)
$password = $this->getHelper('dialog')->askAndValidate(
$output,
'Please enter the new password:',
- function($password)
- {
+ function($password) {
if (empty($password)) {
throw new \Exception('Password can not be empty');
}
View
10 Command/CreateUserCommand.php
@@ -16,7 +16,6 @@
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use FOS\UserBundle\Model\User;
/**
@@ -90,8 +89,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
$username = $this->getHelper('dialog')->askAndValidate(
$output,
'Please choose a username:',
- function($username)
- {
+ function($username) {
if (empty($username)) {
throw new \Exception('Username can not be empty');
}
@@ -106,8 +104,7 @@ function($username)
$email = $this->getHelper('dialog')->askAndValidate(
$output,
'Please choose an email:',
- function($email)
- {
+ function($email) {
if (empty($email)) {
throw new \Exception('Email can not be empty');
}
@@ -122,8 +119,7 @@ function($email)
$password = $this->getHelper('dialog')->askAndValidate(
$output,
'Please choose a password:',
- function($password)
- {
+ function($password) {
if (empty($password)) {
throw new \Exception('Password can not be empty');
}
View
4 Command/DeactivateUserCommand.php
@@ -15,7 +15,6 @@
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use FOS\UserBundle\Model\User;
/**
@@ -64,8 +63,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
$username = $this->getHelper('dialog')->askAndValidate(
$output,
'Please choose a username:',
- function($username)
- {
+ function($username) {
if (empty($username)) {
throw new \Exception('Username can not be empty');
}
View
8 Command/RoleCommand.php
@@ -16,8 +16,6 @@
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use FOS\UserBundle\Model\User;
use FOS\UserBundle\Util\UserManipulator;
/**
@@ -73,8 +71,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
$username = $this->getHelper('dialog')->askAndValidate(
$output,
'Please choose a username:',
- function($username)
- {
+ function($username) {
if (empty($username)) {
throw new \Exception('Username can not be empty');
}
@@ -88,8 +85,7 @@ function($username)
$role = $this->getHelper('dialog')->askAndValidate(
$output,
'Please choose a role:',
- function($role)
- {
+ function($role) {
if (empty($role)) {
throw new \Exception('Role can not be empty');
}
View
2  Controller/GroupController.php
@@ -106,7 +106,7 @@ public function deleteAction($groupname)
* @param string $key property name
* @param mixed $value property value
*
- * @throws NotFoundException if user does not exist
+ * @throws NotFoundException if user does not exist
* @return \FOS\UserBundle\Model\GroupInterface
*/
protected function findGroupBy($key, $value)
View
6 CouchDocument/GroupManager.php
@@ -35,8 +35,7 @@ public function __construct(DocumentManager $dm, $class)
/**
* Deletes a group.
*
- * @param GroupInterface $group
- * @return void
+ * @param GroupInterface $group
*/
public function deleteGroup(GroupInterface $group)
{
@@ -47,7 +46,8 @@ public function deleteGroup(GroupInterface $group)
/**
* Finds one group by the given criteria.
*
- * @param array $criteria
+ * @param array $criteria
+ *
* @return GroupInterface
*/
public function findGroupBy(array $criteria)
View
1  CouchDocument/UserManager.php
@@ -108,4 +108,3 @@ public function reloadUser(UserInterface $user)
$this->dm->refresh($user);
}
}
-
View
1  Entity/GroupManager.php
@@ -68,7 +68,6 @@ public function findGroups()
*
* @param GroupInterface $group
* @param Boolean $andFlush Whether to flush the changes (default true)
- * @return void
*/
public function updateGroup(GroupInterface $group, $andFlush = true)
{
View
2  Form/Type/ProfileFormType.php
@@ -57,7 +57,7 @@ public function getName()
* Builds the embedded form representing the user.
*
* @param FormBuilderInterface $builder
- * @param array $options
+ * @param array $options
*/
protected function buildUserForm(FormBuilderInterface $builder, array $options)
{
View
4 Mailer/MailerInterface.php
@@ -23,12 +23,12 @@
*
* @param UserInterface $user
*/
- function sendConfirmationEmailMessage(UserInterface $user);
+ public function sendConfirmationEmailMessage(UserInterface $user);
/**
* Send an email to a user to confirm the password reset
*
* @param UserInterface $user
*/
- function sendResettingEmailMessage(UserInterface $user);
+ public function sendResettingEmailMessage(UserInterface $user);
}
View
4 Model/Group.php
@@ -28,6 +28,7 @@ public function __construct($name, $roles = array())
/**
* @param string $role
+ *
* @return Group
*/
public function addRole($role)
@@ -61,6 +62,7 @@ public function getRoles()
/**
* @param string $role
+ *
* @return Group
*/
public function removeRole($role)
@@ -75,6 +77,7 @@ public function removeRole($role)
/**
* @param string $name
+ *
* @return Group
*/
public function setName($name)
@@ -86,6 +89,7 @@ public function setName($name)
/**
* @param array $roles
+ *
* @return Group
*/
public function setRoles(array $roles)
View
16 Model/GroupInterface.php
@@ -17,19 +17,19 @@
*/
interface GroupInterface
{
- function addRole($role);
+ public function addRole($role);
- function getId();
+ public function getId();
- function getName();
+ public function getName();
- function hasRole($role);
+ public function hasRole($role);
- function getRoles();
+ public function getRoles();
- function removeRole($role);
+ public function removeRole($role);
- function setName($name);
+ public function setName($name);
- function setRoles(array $roles);
+ public function setRoles(array $roles);
}
View
10 Model/GroupManager.php
@@ -20,10 +20,7 @@
abstract class GroupManager implements GroupManagerInterface
{
/**
- * Returns an empty group instance.
- *
- * @param string $name
- * @return GroupInterface
+ * {@inheritDoc}
*/
public function createGroup($name)
{
@@ -32,10 +29,7 @@ public function createGroup($name)
return new $class($name);
}
/**
- * Finds a group by name.
- *
- * @param string $name
- * @return GroupInterface
+ * {@inheritDoc}
*/
public function findGroupByName($name)
{
View
18 Model/GroupManagerInterface.php
@@ -25,52 +25,56 @@
* Returns an empty group instance.
*
* @param string $name
+ *
* @return GroupInterface
*/
- function createGroup($name);
+ public function createGroup($name);
/**
* Deletes a group.
*
* @param GroupInterface $group
+ *
* @return void
*/
- function deleteGroup(GroupInterface $group);
+ public function deleteGroup(GroupInterface $group);
/**
* Finds one group by the given criteria.
*
* @param array $criteria
+ *
* @return GroupInterface
*/
- function findGroupBy(array $criteria);
+ public function findGroupBy(array $criteria);
/**
* Finds a group by name.
*
* @param string $name
+ *
* @return GroupInterface
*/
- function findGroupByName($name);
+ public function findGroupByName($name);
/**
* Returns a collection with all user instances.
*
* @return \Traversable
*/
- function findGroups();
+ public function findGroups();
/**
* Returns the group's fully qualified class name.
*
* @return string
*/
- function getClass();
+ public function getClass();
/**
* Updates a group.
*
* @param GroupInterface $group
*/
- function updateGroup(GroupInterface $group);
+ public function updateGroup(GroupInterface $group);
}
View
11 Model/GroupableInterface.php
@@ -23,34 +23,35 @@
*
* @return \Doctrine\Common\Collections\Collection
*/
- function getGroups();
+ public function getGroups();
/**
* Gets the name of the groups which includes the user.
*
* @return array
*/
- function getGroupNames();
+ public function getGroupNames();
/**
* Indicates whether the user belongs to the specified group or not.
*
* @param string $name Name of the group
+ *
* @return Boolean
*/
- function hasGroup($name);
+ public function hasGroup($name);
/**
* Add a group to the user groups.
*
* @param GroupInterface $group
*/
- function addGroup(GroupInterface $group);
+ public function addGroup(GroupInterface $group);
/**
* Remove a group from the user groups.
*
* @param GroupInterface $group
*/
- function removeGroup(GroupInterface $group);
+ public function removeGroup(GroupInterface $group);
}
View
25 Model/User.php
@@ -11,7 +11,6 @@
namespace FOS\UserBundle\Model;
-use Symfony\Component\Security\Core\Role\RoleInterface;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\ArrayCollection;
use Symfony\Component\Security\Core\User\UserInterface as SecurityUserInterface;
@@ -160,6 +159,7 @@ public function addRole($role)
* Implementation of SecurityUserInterface.
*
* @param \Symfony\Component\Security\Core\User\UserInterface $user
+ *
* @return Boolean
*/
public function equals(SecurityUserInterface $user)
@@ -372,6 +372,7 @@ public function getRoles()
* $securityContext->isGranted('ROLE_USER');
*
* @param string $role
+ *
* @return Boolean
*/
public function hasRole($role)
@@ -474,6 +475,7 @@ public function isSuperAdmin()
* Useful when not hydrating all fields.
*
* @param UserInterface $user
+ *
* @return Boolean
*/
public function isUser(UserInterface $user = null)
@@ -498,6 +500,7 @@ public function removeRole($role)
* Sets the username.
*
* @param string $username
+ *
* @return User
*/
public function setUsername($username)
@@ -511,6 +514,7 @@ public function setUsername($username)
* Sets the canonical username.
*
* @param string $usernameCanonical
+ *
* @return User
*/
public function setUsernameCanonical($usernameCanonical)
@@ -522,6 +526,7 @@ public function setUsernameCanonical($usernameCanonical)
/**
* @param \DateTime $date
+ *
* @return User
*/
public function setCredentialsExpireAt(\DateTime $date)
@@ -533,6 +538,7 @@ public function setCredentialsExpireAt(\DateTime $date)
/**
* @param boolean $boolean
+ *
* @return User
*/
public function setCredentialsExpired($boolean)
@@ -546,6 +552,7 @@ public function setCredentialsExpired($boolean)
* Sets the email.
*
* @param string $email
+ *
* @return User
*/
public function setEmail($email)
@@ -559,6 +566,7 @@ public function setEmail($email)
* Set the canonical email.
*
* @param string $emailCanonical
+ *
* @return User
*/
public function setEmailCanonical($emailCanonical)
@@ -570,6 +578,7 @@ public function setEmailCanonical($emailCanonical)
/**
* @param Boolean $boolean
+ *
* @return User
*/
public function setEnabled($boolean)
@@ -583,6 +592,7 @@ public function setEnabled($boolean)
* Sets this user to expired.
*
* @param Boolean $boolean
+ *
* @return User
*/
public function setExpired($boolean)
@@ -594,6 +604,7 @@ public function setExpired($boolean)
/**
* @param \DateTime $date
+ *
* @return User
*/
public function setExpiresAt(\DateTime $date)
@@ -607,6 +618,7 @@ public function setExpiresAt(\DateTime $date)
* Sets the hashed password.
*
* @param string $password
+ *
* @return User
*/
public function setPassword($password)
@@ -620,6 +632,7 @@ public function setPassword($password)
* Sets the super admin status
*
* @param Boolean $boolean
+ *
* @return User
*/
public function setSuperAdmin($boolean)
@@ -637,6 +650,7 @@ public function setSuperAdmin($boolean)
* Sets the plain password.
*
* @param string $password
+ *
* @return User
*/
public function setPlainPassword($password)
@@ -650,6 +664,7 @@ public function setPlainPassword($password)
* Sets the last login time
*
* @param \DateTime $time
+ *
* @return User
*/
public function setLastLogin(\DateTime $time)
@@ -663,6 +678,7 @@ public function setLastLogin(\DateTime $time)
* Sets the locking status of the user.
*
* @param Boolean $boolean
+ *
* @return User
*/
public function setLocked($boolean)
@@ -676,6 +692,7 @@ public function setLocked($boolean)
* Sets the confirmation token
*
* @param string $confirmationToken
+ *
* @return User
*/
public function setConfirmationToken($confirmationToken)
@@ -689,6 +706,7 @@ public function setConfirmationToken($confirmationToken)
* Sets the timestamp that the user requested a password reset.
*
* @param \DateTime $date
+ *
* @return User
*/
public function setPasswordRequestedAt(\DateTime $date = null)
@@ -712,6 +730,7 @@ public function getPasswordRequestedAt()
* Checks whether the password reset request has expired.
*
* @param integer $ttl Requests older than this many seconds will be considered expired
+ *
* @return Boolean true if the user's password request is non expired, false otherwise
*/
public function isPasswordRequestNonExpired($ttl)
@@ -726,6 +745,7 @@ public function isPasswordRequestNonExpired($ttl)
* This overwrites any previous roles.
*
* @param array $roles
+ *
* @return User
*/
public function setRoles(array $roles)
@@ -768,6 +788,7 @@ public function getGroupNames()
* Indicates whether the user belongs to the specified group or not.
*
* @param string $name Name of the group
+ *
* @return Boolean
*/
public function hasGroup($name)
@@ -779,6 +800,7 @@ public function hasGroup($name)
* Add a group to the user groups.
*
* @param GroupInterface $group
+ *
* @return User
*/
public function addGroup(GroupInterface $group)
@@ -794,6 +816,7 @@ public function addGroup(GroupInterface $group)
* Remove a group from the user groups.
*
* @param GroupInterface $group
+ *
* @return User
*/
public function removeGroup(GroupInterface $group)
View
51 Model/UserInterface.php
@@ -24,77 +24,77 @@
*
* @param string $username
*/
- function setUsername($username);
+ public function setUsername($username);
/**
* Gets the canonical username in search and sort queries.
*
* @return string
*/
- function getUsernameCanonical();
+ public function getUsernameCanonical();
/**
* Sets the canonical username.
*
* @param string $usernameCanonical
*/
- function setUsernameCanonical($usernameCanonical);
+ public function setUsernameCanonical($usernameCanonical);
/**
* Gets email.
*
* @return string
*/
- function getEmail();
+ public function getEmail();
/**
* Sets the email.
*
* @param string $email
*/
- function setEmail($email);
+ public function setEmail($email);
/**
* Gets the canonical email in search and sort queries.
*
* @return string
*/
- function getEmailCanonical();
+ public function getEmailCanonical();
/**
* Set the canonical email.
*
* @param string $emailCanonical
*/
- function setEmailCanonical($emailCanonical);
+ public function setEmailCanonical($emailCanonical);
/**
* Gets the plain password.
*
* @return string
*/
- function getPlainPassword();
+ public function getPlainPassword();
/**
* Sets the plain password.
*
* @param string $password
*/
- function setPlainPassword($password);
+ public function setPlainPassword($password);
/**
* Sets the hashed password.
*
* @param string $password
*/
- function setPassword($password);
+ public function setPassword($password);
/**
* Tells if the the given user has the super admin role.
*
* @return Boolean
*/
- function isSuperAdmin();
+ public function isSuperAdmin();
/**
* Tells if the the given user is this user.
@@ -102,64 +102,66 @@ function isSuperAdmin();
* Useful when not hydrating all fields.
*
* @param UserInterface $user
+ *
* @return Boolean
*/
- function isUser(UserInterface $user = null);
+ public function isUser(UserInterface $user = null);
/**
* @param Boolean $boolean
*/
- function setEnabled($boolean);
+ public function setEnabled($boolean);
/**
* Sets the locking status of the user.
*
* @param Boolean $boolean
*/
- function setLocked($boolean);
+ public function setLocked($boolean);
/**
* Sets the super admin status
*
* @param Boolean $boolean
*/
- function setSuperAdmin($boolean);
+ public function setSuperAdmin($boolean);
/**
* Gets the confirmation token.
*
* @return string
*/
- function getConfirmationToken();
+ public function getConfirmationToken();
/**
* Sets the confirmation token
*
* @param string $confirmationToken
*/
- function setConfirmationToken($confirmationToken);
+ public function setConfirmationToken($confirmationToken);
/**
* Sets the timestamp that the user requested a password reset.
*
* @param \DateTime $date
*/
- function setPasswordRequestedAt(\DateTime $date = null);
+ public function setPasswordRequestedAt(\DateTime $date = null);
/**
* Checks whether the password reset request has expired.
*
* @param integer $ttl Requests older than this many seconds will be considered expired
+ *
* @return Boolean true if the user's password request is non expired, false otherwise
*/
- function isPasswordRequestNonExpired($ttl);
+ public function isPasswordRequestNonExpired($ttl);
/**
* Sets the last login time
*
* @param \DateTime $time
*/
- function setLastLogin(\DateTime $time);
+ public function setLastLogin(\DateTime $time);
/**
* Never use this to check if this user has access to anything!
@@ -170,9 +172,10 @@ function setLastLogin(\DateTime $time);
* $securityContext->isGranted('ROLE_USER');
*
* @param string $role
+ *
* @return Boolean
*/
- function hasRole($role);
+ public function hasRole($role);
/**
* Sets the roles of the user.
@@ -181,19 +184,19 @@ function hasRole($role);
*
* @param array $roles
*/
- function setRoles(array $roles);
+ public function setRoles(array $roles);
/**
* Adds a role to the user.
*
* @param string $role
*/
- function addRole($role);
+ public function addRole($role);
/**
* Removes a role to the user.
*
* @param string $role
*/
- function removeRole($role);
+ public function removeRole($role);
}
View
8 Model/UserManager.php
@@ -61,6 +61,7 @@ public function createUser()
* Finds a user by email
*
* @param string $email
+ *
* @return UserInterface
*/
public function findUserByEmail($email)
@@ -72,6 +73,7 @@ public function findUserByEmail($email)
* Finds a user by username
*
* @param string $username
+ *
* @return UserInterface
*/
public function findUserByUsername($username)
@@ -83,6 +85,7 @@ public function findUserByUsername($username)
* Finds a user either by email, or username
*
* @param string $usernameOrEmail
+ *
* @return UserInterface
*/
public function findUserByUsernameOrEmail($usernameOrEmail)
@@ -98,6 +101,7 @@ public function findUserByUsernameOrEmail($usernameOrEmail)
* Finds a user either by confirmation token
*
* @param string $token
+ *
* @return UserInterface
*/
public function findUserByConfirmationToken($token)
@@ -115,6 +119,7 @@ public function findUserByConfirmationToken($token)
* all ACL checks.
*
* @param SecurityUserInterface $user
+ *
* @return UserInterface
*/
public function refreshUser(SecurityUserInterface $user)
@@ -134,6 +139,7 @@ public function refreshUser(SecurityUserInterface $user)
* all ACL checks.
*
* @param string $username
+ *
* @return UserInterface
*/
public function loadUserByUsername($username)
@@ -172,6 +178,7 @@ public function updatePassword(UserInterface $user)
* Canonicalizes an email
*
* @param string $email
+ *
* @return string
*/
protected function canonicalizeEmail($email)
@@ -183,6 +190,7 @@ protected function canonicalizeEmail($email)
* Canonicalizes a username
*
* @param string $username
+ *
* @return string
*/
protected function canonicalizeUsername($username)
View
42 Model/UserManagerInterface.php
@@ -33,103 +33,109 @@
*
* @return UserInterface
*/
- function createUser();
+ public function createUser();
/**
* Deletes a user.
*
* @param UserInterface $user
*/
- function deleteUser(UserInterface $user);
+ public function deleteUser(UserInterface $user);
/**
* Finds one user by the given criteria.
*
* @param array $criteria
+ *
* @return UserInterface
*/
- function findUserBy(array $criteria);
+ public function findUserBy(array $criteria);
/**
* Find a user by its username.
*
- * @param string $username
+ * @param string $username
+ *
* @return UserInterface or null if user does not exist
*/
- function findUserByUsername($username);
+ public function findUserByUsername($username);
/**
* Finds a user by its email.
*
- * @param string $email
+ * @param string $email
+ *
* @return UserInterface or null if user does not exist
*/
- function findUserByEmail($email);
+ public function findUserByEmail($email);
/**
* Finds a user by its username or email.
*
- * @param string $usernameOrEmail
+ * @param string $usernameOrEmail
+ *
* @return UserInterface or null if user does not exist
*/
- function findUserByUsernameOrEmail($usernameOrEmail);
+ public function findUserByUsernameOrEmail($usernameOrEmail);
/**
* Finds a user by its confirmationToken.
*
- * @param string $token
+ * @param string $token
+ *
* @return UserInterface or null if user does not exist
*/
- function findUserByConfirmationToken($token);
+ public function findUserByConfirmationToken($token);
/**
* Returns a collection with all user instances.
*
* @return \Traversable
*/
- function findUsers();
+ public function findUsers();
/**
* Returns the user's fully qualified class name.
*
* @return string
*/
- function getClass();
+ public function getClass();
/**
* Reloads a user.
*
* @param UserInterface $user
*/
- function reloadUser(UserInterface $user);
+ public function reloadUser(UserInterface $user);
/**
* Updates a user.
*
* @param UserInterface $user
*/
- function updateUser(UserInterface $user);
+ public function updateUser(UserInterface $user);
/**
* Updates the canonical username and email fields for a user.
*
* @param UserInterface $user
*/
- function updateCanonicalFields(UserInterface $user);
+ public function updateCanonicalFields(UserInterface $user);
/**
* Updates a user password if a plain password is set.
*
* @param UserInterface $user
*/
- function updatePassword(UserInterface $user);
+ public function updatePassword(UserInterface $user);
/**
* Checks the uniqueness of the given fields, returns true if its unique.
*
* @param UserInterface $value
* @param Constraint $constraint
+ *
* @return Boolean
*/
- function validateUnique(UserInterface $value, Constraint $constraint);
+ public function validateUnique(UserInterface $value, Constraint $constraint);
}
View
13 Propel/GroupManager.php
@@ -12,7 +12,6 @@
namespace FOS\UserBundle\Propel;
use FOS\UserBundle\Model\GroupInterface;
-use Doctrine\ORM\EntityManager;
use FOS\UserBundle\Model\GroupManager as BaseGroupManager;
class GroupManager extends BaseGroupManager
@@ -25,11 +24,8 @@ public function __construct($class)
}
/**
- * Returns an empty group instance.
- *
- * @param string $name
- * @return GroupInterface
- */
+ * {@inheritDoc}
+ */
public function createGroup($name)
{
$class = $this->class;
@@ -83,10 +79,7 @@ public function findGroups()
}
/**
- * Updates a group
- *
- * @param GroupInterface $group
- * @return void
+ * {@inheritDoc}
*/
public function updateGroup(GroupInterface $group)
{
View
2  Propel/UserManager.php
@@ -16,8 +16,6 @@
use FOS\UserBundle\Propel\User;
use FOS\UserBundle\Util\CanonicalizerInterface;
use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
-use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
-use Symfony\Component\Security\Core\User\UserInterface as SecurityUserInterface;
use Symfony\Component\Validator\Constraint;
class UserManager extends BaseUserManager
View
19 Propel/UserProxy.php
@@ -12,7 +12,6 @@
namespace FOS\UserBundle\Propel;
use FOS\UserBundle\Model\User as FosUser;
-use FOS\UserBundle\Model\GroupInterface;
use Symfony\Component\Security\Core\User\UserInterface as SecurityUserInterface;
class UserProxy extends FosUser
@@ -257,7 +256,7 @@ public function isEnabled()
/**
* Sets the username.
*
- * @param string $username
+ * @param string $username
* @return UserProxy
*/
public function setUsername($username)
@@ -271,6 +270,7 @@ public function setUsername($username)
* Sets the canonical username.
*
* @param string $usernameCanonical
+ *
* @return UserProxy
*/
public function setUsernameCanonical($usernameCanonical)
@@ -298,6 +298,7 @@ public function setCredentialsExpired($boolean)
* Sets the email.
*
* @param string $email
+ *
* @return UserProxy
*/
public function setEmail($email)
@@ -311,6 +312,7 @@ public function setEmail($email)
* Set the canonical email.
*
* @param string $emailCanonical
+ *
* @return UserProxy
*/
public function setEmailCanonical($emailCanonical)
@@ -322,6 +324,7 @@ public function setEmailCanonical($emailCanonical)
/**
* @param Boolean $boolean
+ *
* @return UserProxy
*/
public function setEnabled($boolean)
@@ -335,6 +338,7 @@ public function setEnabled($boolean)
* Sets this user to expired.
*
* @param Boolean $boolean
+ *
* @return UserProxy
*/
public function setExpired($boolean)
@@ -346,6 +350,7 @@ public function setExpired($boolean)
/**
* @param \DateTime $date
+ *
* @return UserProxy
*/
public function setExpiresAt(\DateTime $date)
@@ -359,6 +364,7 @@ public function setExpiresAt(\DateTime $date)
* Sets the hashed password.
*
* @param string $password
+ *
* @return UserProxy
*/
public function setPassword($password)
@@ -372,6 +378,7 @@ public function setPassword($password)
* Sets the plain password.
*
* @param string $password
+ *
* @return UserProxy
*/
public function setPlainPassword($password)
@@ -385,6 +392,7 @@ public function setPlainPassword($password)
* Sets the last login time
*
* @param \DateTime $time
+ *
* @return UserProxy
*/
public function setLastLogin(\DateTime $time)
@@ -398,6 +406,7 @@ public function setLastLogin(\DateTime $time)
* Sets the locking status of the user.
*
* @param Boolean $boolean
+ *
* @return UserProxy
*/
public function setLocked($boolean)
@@ -411,6 +420,7 @@ public function setLocked($boolean)
* Sets the confirmation token
*
* @param string $confirmationToken
+ *
* @return UserProxy
*/
public function setConfirmationToken($confirmationToken)
@@ -424,6 +434,7 @@ public function setConfirmationToken($confirmationToken)
* Sets the timestamp that the user requested a password reset.
*
* @param \DateTime $date
+ *
* @return UserProxy
*/
public function setPasswordRequestedAt(\DateTime $date = null)
@@ -437,7 +448,6 @@ public function setPasswordRequestedAt(\DateTime $date = null)
* Gets the timestamp that the user requested a password reset.
*
* @return \DateTime
- * @return UserProxy
*/
public function getPasswordRequestedAt()
{
@@ -448,6 +458,7 @@ public function getPasswordRequestedAt()
* Adds a role to the user.
*
* @param string $role
+ *
* @return UserProxy
*/
public function addRole($role)
@@ -466,6 +477,7 @@ public function addRole($role)
* Removes a role to the user.
*
* @param string $role
+ *
* @return UserProxy
*/
public function removeRole($role)
@@ -481,6 +493,7 @@ public function removeRole($role)
* This overwrites any previous roles.
*
* @param array $roles
+ *
* @return UserProxy
*/
public function setRoles(array $roles)
View
2  Tests/Util/UserManipulatorTest.php
@@ -14,8 +14,6 @@
use FOS\UserBundle\Util\UserManipulator;
use FOS\UserBundle\Tests\TestUser;
use Symfony\Component\Security\Acl\Domain\Acl;
-use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
-use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy;
class UserManipulatorTest extends \PHPUnit_Framework_TestCase
{
View
2  Util/CanonicalizerInterface.php
@@ -13,5 +13,5 @@
interface CanonicalizerInterface
{
- function canonicalize($string);
+ public function canonicalize($string);
}
View
2  Util/TokenGeneratorInterface.php
@@ -13,5 +13,5 @@
interface TokenGeneratorInterface
{
- function generateToken();
+ public function generateToken();
}
Please sign in to comment.
Something went wrong with that request. Please try again.