X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/71c0edfd65c95bd05705d7c037766f477aac2791..0f4bc81741b145ae935f32fff7e98187be16c58c:/Entity/User.php?ds=sidebyside diff --git a/Entity/User.php b/Entity/User.php index 8e6a671..809d363 100644 --- a/Entity/User.php +++ b/Entity/User.php @@ -11,8 +11,11 @@ namespace Rapsys\UserBundle\Entity; +use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Event\PreUpdateEventArgs; use Symfony\Component\Security\Core\User\UserInterface; +use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface; use Rapsys\UserBundle\Entity\Civility; use Rapsys\UserBundle\Entity\Group; @@ -20,82 +23,95 @@ use Rapsys\UserBundle\Entity\Group; /** * User */ -class User implements UserInterface, \Serializable { +class User implements UserInterface, PasswordAuthenticatedUserInterface { /** - * @var integer + * @var ?integer */ - protected $id; + protected ?int $id; /** * @var string */ - protected $mail; + protected string $mail; /** * @var string */ - protected $pseudonym; + protected string $password; /** - * @var string - */ - protected $forename; - - /** - * @var string + * @var ?string */ - protected $surname; + protected ?string $forename; /** - * @var string + * @var ?string */ - protected $password; + protected ?string $surname; /** * @var bool */ - protected $active; + protected bool $active; /** * @var bool */ - protected $disabled; + protected bool $disabled; /** * @var \DateTime */ - protected $created; + protected \DateTime $created; /** * @var \DateTime */ - protected $updated; + protected \DateTime $updated; /** * @var Civility */ - protected $civility; + protected ?Civility $civility; /** - * @var ArrayCollection + * @var Doctrine\Common\Collections\Collection */ - protected $groups; + protected Collection $groups; /** * Constructor + * + * @param string $mail The user mail + * @param string $password The user password + * @param ?Civility $civility The user civility + * @param ?string $forename The user forename + * @param ?string $surname The user surname + * @param bool $active The user active + * @param bool $disabled The user disabled */ - public function __construct() { - $this->active = false; - $this->disabled = false; + public function __construct(string $mail, string $password, ?Civility $civility = null, ?string $forename = null, ?string $surname = null, bool $active = false, bool $disabled = false) { + //Set defaults + $this->mail = $mail; + $this->password = $password; + $this->civility = $civility; + $this->forename = $forename; + $this->surname = $surname; + $this->active = $active; + $this->disabled = $disabled; + $this->created = new \DateTime('now'); + $this->updated = new \DateTime('now'); + + //Set collections $this->groups = new ArrayCollection(); } /** * Get id * - * @return integer + * @return ?int */ - public function getId(): int { + public function getId(): ?int { return $this->id; } @@ -103,10 +119,10 @@ class User implements UserInterface, \Serializable { * Set mail * * @param string $mail - * * @return User */ - public function setMail(string $mail) { + public function setMail(string $mail): User { + //Set mail $this->mail = $mail; return $this; @@ -117,40 +133,18 @@ class User implements UserInterface, \Serializable { * * @return string */ - public function getMail(): ?string { + public function getMail(): string { return $this->mail; } - /** - * Set pseudonym - * - * @param string $pseudonym - * - * @return User - */ - public function setPseudonym(string $pseudonym) { - $this->pseudonym = $pseudonym; - - return $this; - } - - /** - * Get pseudonym - * - * @return string - */ - public function getPseudonym(): ?string { - return $this->pseudonym; - } - /** * Set forename * - * @param string $forename + * @param ?string $forename * * @return User */ - public function setForename(string $forename) { + public function setForename(?string $forename): User { $this->forename = $forename; return $this; @@ -159,7 +153,7 @@ class User implements UserInterface, \Serializable { /** * Get forename * - * @return string + * @return ?string */ public function getForename(): ?string { return $this->forename; @@ -168,11 +162,11 @@ class User implements UserInterface, \Serializable { /** * Set surname * - * @param string $surname + * @param ?string $surname * * @return User */ - public function setSurname(string $surname) { + public function setSurname(?string $surname): User { $this->surname = $surname; return $this; @@ -181,7 +175,7 @@ class User implements UserInterface, \Serializable { /** * Get surname * - * @return string + * @return ?string */ public function getSurname(): ?string { return $this->surname; @@ -194,7 +188,8 @@ class User implements UserInterface, \Serializable { * * @return User */ - public function setPassword(string $password) { + public function setPassword(string $password): User { + //Set password $this->password = $password; return $this; @@ -207,7 +202,7 @@ class User implements UserInterface, \Serializable { * * @return string */ - public function getPassword(): ?string { + public function getPassword(): string { return $this->password; } @@ -218,7 +213,7 @@ class User implements UserInterface, \Serializable { * * @return User */ - public function setActive(bool $active) { + public function setActive(bool $active): User { $this->active = $active; return $this; @@ -240,7 +235,7 @@ class User implements UserInterface, \Serializable { * * @return User */ - public function setDisabled(bool $disabled) { + public function setDisabled(bool $disabled): User { $this->disabled = $disabled; return $this; @@ -262,7 +257,7 @@ class User implements UserInterface, \Serializable { * * @return User */ - public function setCreated(\DateTime $created) { + public function setCreated(\DateTime $created): User { $this->created = $created; return $this; @@ -284,7 +279,7 @@ class User implements UserInterface, \Serializable { * * @return User */ - public function setUpdated(\DateTime $updated) { + public function setUpdated(\DateTime $updated): User { $this->updated = $updated; return $this; @@ -302,7 +297,7 @@ class User implements UserInterface, \Serializable { /** * Set civility */ - public function setCivility(Civility $civility) { + public function setCivility(?Civility $civility = null): User { $this->civility = $civility; return $this; @@ -322,7 +317,7 @@ class User implements UserInterface, \Serializable { * * @return User */ - public function addGroup(Group $group) { + public function addGroup(Group $group): User { $this->groups[] = $group; return $this; @@ -332,17 +327,19 @@ class User implements UserInterface, \Serializable { * Remove group * * @param Group $group + * + * @return Doctrine\Common\Collections\Collection */ - public function removeGroup(Group $group) { - $this->groups->removeElement($group); + public function removeGroup(Group $group): Collection { + return $this->groups->removeElement($group); } /** * Get groups * - * @return ArrayCollection + * @return Doctrine\Common\Collections\Collection */ - public function getGroups(): ArrayCollection { + public function getGroups(): Collection { return $this->groups; } @@ -408,61 +405,74 @@ class User implements UserInterface, \Serializable { return $this->mail; } + /** + * {@inheritdoc} + */ + public function getUserIdentifier(): string { + return $this->mail; + } + /** * {@inheritdoc} */ public function eraseCredentials(): void {} - public function serialize(): string { - return serialize([ + /** + * {@inheritdoc} + */ + public function __serialize(): array { + return [ $this->id, $this->mail, + $this->forename, + $this->surname, $this->password, $this->active, $this->disabled, $this->created, $this->updated - ]); + ]; } - public function unserialize($serialized) { + /** + * {@inheritdoc} + */ + public function __unserialize(array $data): void { list( $this->id, $this->mail, + $this->forename, + $this->surname, $this->password, $this->active, $this->disabled, $this->created, $this->updated - ) = unserialize($serialized); + ) = $data; } /** * Check if account is activated * - * It was from deprecated AdvancedUserInterface, see if it's used anymore - * - * @see vendor/symfony/security-core/User/AdvancedUserInterface.php + * @see vendor/rapsys/userbundle/Checker/UserChecker.php */ public function isActivated(): bool { return $this->active; } /** - * Check if account is disabled + * Check if account is enabled * - * It was from deprecated AdvancedUserInterface, see if it's used anymore - * - * @see vendor/symfony/security-core/User/AdvancedUserInterface.php + * @see vendor/symfony/security-core/User/InMemoryUserChecker.php */ - public function isDisabled(): bool { - return $this->disabled; + public function isEnabled(): bool { + return !$this->disabled; } /** * {@inheritdoc} */ - public function preUpdate(\Doctrine\ORM\Event\PreUpdateEventArgs $eventArgs) { + public function preUpdate(PreUpdateEventArgs $eventArgs) { //Check that we have an user instance if (($user = $eventArgs->getEntity()) instanceof User) { //Set updated value @@ -470,6 +480,22 @@ class User implements UserInterface, \Serializable { } } + /** + * Returns a recipient name of the user + * + * @return string + */ + public function getRecipientName(): string { + //Without forename and surname + if (empty($this->forename) && empty($this->surname)) { + //Return recipient name from mail + return ucwords(trim(preg_replace('/[^a-zA-Z]+/', ' ', current(explode('@', $this->mail))))); + } + + //Return recipient name from forename and surname + return implode(' ', [$this->forename, $this->surname]); + } + /** * Returns a string representation of the user *