X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/52fa9645ed8edd4a630e4d7c3382680863b9039d..2f0ee1d8679c0a5de721520a4cc05de72aae9db3:/Entity/User.php?ds=inline diff --git a/Entity/User.php b/Entity/User.php index 5fc9217..61be105 100644 --- a/Entity/User.php +++ b/Entity/User.php @@ -1,14 +1,28 @@ - + * + * for the full copyright and license information, please view the license + * file that was distributed with this source code. + */ -// src/Rapsys/UserBundle/Entity/User.php namespace Rapsys\UserBundle\Entity; -use Rapsys\UserBundle\Entity\Group; -use Symfony\Component\Security\Core\User\UserInterface; 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; -class User implements UserInterface, \Serializable { +/** + * User + */ +class User implements UserInterface, PasswordAuthenticatedUserInterface, \Serializable { /** * @var integer */ @@ -19,11 +33,6 @@ class User implements UserInterface, \Serializable { */ protected $mail; - /** - * @var string - */ - protected $pseudonym; - /** * @var string */ @@ -44,6 +53,11 @@ class User implements UserInterface, \Serializable { */ protected $active; + /** + * @var bool + */ + protected $disabled; + /** * @var \DateTime */ @@ -55,20 +69,40 @@ class User implements UserInterface, \Serializable { protected $updated; /** - * @var \Rapsys\UserBundle\Entity\Civility + * @var Civility */ protected $civility; /** - * @var \Doctrine\Common\Collections\Collection + * @var ArrayCollection */ protected $groups; /** * Constructor - */ - public function __construct() { + * + * @param ?string $mail The user mail + */ + public function __construct(?string $mail) { + //With mail + if ($mail !== null && !empty($mail)) { + $this->mail = $mail; + $this->password = $mail; + //Without mail + } else { + $this->mail = ''; + $this->password = ''; + } + + //Set defaults + $this->forename = null; + $this->surname = null; $this->active = false; + $this->disabled = false; + $this->created = new \DateTime('now'); + $this->updated = new \DateTime('now'); + + //Set collections $this->groups = new ArrayCollection(); } @@ -77,19 +111,31 @@ class User implements UserInterface, \Serializable { * * @return integer */ - public function getId() { + public function getId(): int { return $this->id; } /** * Set mail * - * @param string $mail - * + * @param ?string $mail * @return User */ - public function setMail($mail) { - $this->mail = $mail; + public function setMail(?string $mail): User { + //With mail + if ($mail !== null && !empty($mail)) { + //Set mail + $this->mail = $mail; + + //Without password + if (empty($this->password)) { + //Set mail as password + $this->password = $mail; + } + //Without mail + } else { + $this->mail = ''; + } return $this; } @@ -99,40 +145,18 @@ class User implements UserInterface, \Serializable { * * @return string */ - public function getMail() { + public function getMail(): string { return $this->mail; } - /** - * Set pseudonym - * - * @param string $pseudonym - * - * @return User - */ - public function setPseudonym($pseudonym) { - $this->pseudonym = $pseudonym; - - return $this; - } - - /** - * Get pseudonym - * - * @return string - */ - public function getPseudonym() { - return $this->pseudonym; - } - /** * Set forename * - * @param string $forename + * @param ?string $forename * * @return User */ - public function setForename($forename) { + public function setForename(?string $forename): User { $this->forename = $forename; return $this; @@ -141,20 +165,20 @@ class User implements UserInterface, \Serializable { /** * Get forename * - * @return string + * @return ?string */ - public function getForename() { + public function getForename(): ?string { return $this->forename; } /** * Set surname * - * @param string $surname + * @param ?string $surname * * @return User */ - public function setSurname($surname) { + public function setSurname(?string $surname): User { $this->surname = $surname; return $this; @@ -163,9 +187,9 @@ class User implements UserInterface, \Serializable { /** * Get surname * - * @return string + * @return ?string */ - public function getSurname() { + public function getSurname(): ?string { return $this->surname; } @@ -176,8 +200,14 @@ class User implements UserInterface, \Serializable { * * @return User */ - public function setPassword($password) { - $this->password = $password; + public function setPassword(?string $password): User { + //With password + if ($password !== null && !empty($password)) { + $this->password = $password; + //Without password + } else { + $this->password = ''; + } return $this; } @@ -189,7 +219,7 @@ class User implements UserInterface, \Serializable { * * @return string */ - public function getPassword() { + public function getPassword(): string { return $this->password; } @@ -200,7 +230,7 @@ class User implements UserInterface, \Serializable { * * @return User */ - public function setActive($active) { + public function setActive(bool $active): User { $this->active = $active; return $this; @@ -211,10 +241,32 @@ class User implements UserInterface, \Serializable { * * @return bool */ - public function getActive() { + public function getActive(): bool { return $this->active; } + /** + * Set disabled + * + * @param bool $disabled + * + * @return User + */ + public function setDisabled(bool $disabled): User { + $this->disabled = $disabled; + + return $this; + } + + /** + * Get disabled + * + * @return bool + */ + public function getDisabled(): bool { + return $this->disabled; + } + /** * Set created * @@ -222,7 +274,7 @@ class User implements UserInterface, \Serializable { * * @return User */ - public function setCreated($created) { + public function setCreated(\DateTime $created): User { $this->created = $created; return $this; @@ -233,7 +285,7 @@ class User implements UserInterface, \Serializable { * * @return \DateTime */ - public function getCreated() { + public function getCreated(): \DateTime { return $this->created; } @@ -244,7 +296,7 @@ class User implements UserInterface, \Serializable { * * @return User */ - public function setUpdated($updated) { + public function setUpdated(\DateTime $updated): User { $this->updated = $updated; return $this; @@ -255,14 +307,14 @@ class User implements UserInterface, \Serializable { * * @return \DateTime */ - public function getUpdated() { + public function getUpdated(): \DateTime { return $this->updated; } /** * Set civility */ - public function setCivility(Civility $civility) { + public function setCivility(Civility $civility): User { $this->civility = $civility; return $this; @@ -271,14 +323,14 @@ class User implements UserInterface, \Serializable { /** * Get civility */ - public function getCivility(): Civility { + public function getCivility(): ?Civility { return $this->civility; } /** * Add group * - * @param \Rapsys\UserBundle\Entity\Group $group + * @param Group $group * * @return User */ @@ -291,7 +343,7 @@ class User implements UserInterface, \Serializable { /** * Remove group * - * @param \Rapsys\UserBundle\Entity\Group $group + * @param Group $group */ public function removeGroup(Group $group) { $this->groups->removeElement($group); @@ -300,16 +352,16 @@ class User implements UserInterface, \Serializable { /** * Get groups * - * @return \Doctrine\Common\Collections\Collection + * @return ArrayCollection */ - public function getGroups() { + public function getGroups(): ArrayCollection { return $this->groups; } /** * {@inheritdoc} */ - public function getRoles() { + public function getRoles(): array { //Get the unique roles list by id return array_unique(array_reduce( //Cast groups as array @@ -329,7 +381,7 @@ class User implements UserInterface, \Serializable { /** * {@inheritdoc} */ - public function getRole() { + public function getRole(): ?string { //Retrieve roles $roles = $this->getRoles(); @@ -356,7 +408,7 @@ class User implements UserInterface, \Serializable { /** * {@inheritdoc} */ - public function getSalt() { + public function getSalt(): ?string { //No salt required with bcrypt return null; } @@ -364,46 +416,82 @@ class User implements UserInterface, \Serializable { /** * {@inheritdoc} */ - public function getUsername() { + public function getUsername(): string { + return $this->mail; + } + + /** + * {@inheritdoc} + */ + public function getUserIdentifier(): string { return $this->mail; } /** * {@inheritdoc} */ - public function eraseCredentials() {} + public function eraseCredentials(): void {} + /** + * {@inheritdoc} + */ public function serialize(): string { return serialize([ $this->id, $this->mail, + $this->forename, + $this->surname, $this->password, $this->active, + $this->disabled, $this->created, $this->updated ]); } + /** + * {@inheritdoc} + */ public function unserialize($serialized) { list( $this->id, $this->mail, + $this->forename, + $this->surname, $this->password, $this->active, + $this->disabled, $this->created, $this->updated ) = unserialize($serialized); } - //XXX: was from vendor/symfony/security-core/User/AdvancedUserInterface.php, see if it's used anymore - public function isEnabled() { + /** + * Check if account is activated + * + * It was from deprecated AdvancedUserInterface, see if it's used anymore + * + * @see vendor/symfony/security-core/User/AdvancedUserInterface.php + */ + public function isActivated(): bool { return $this->active; } + /** + * Check if account is disabled + * + * It was from deprecated AdvancedUserInterface, see if it's used anymore + * + * @see vendor/symfony/security-core/User/AdvancedUserInterface.php + */ + public function isDisabled(): 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 @@ -411,6 +499,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 *