X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/92df56260494a1a27a5c509493200ac8594d50d8..429d8ea45f4e559bce01c9e6231771d4601c305e:/Entity/User.php?ds=sidebyside diff --git a/Entity/User.php b/Entity/User.php index cd32f1e..1e36a93 100644 --- a/Entity/User.php +++ b/Entity/User.php @@ -14,6 +14,7 @@ namespace Rapsys\UserBundle\Entity; 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; @@ -21,7 +22,7 @@ use Rapsys\UserBundle\Entity\Group; /** * User */ -class User implements UserInterface, \Serializable { +class User implements UserInterface, PasswordAuthenticatedUserInterface, \Serializable { /** * @var integer */ @@ -83,14 +84,16 @@ class User implements UserInterface, \Serializable { * @param string $mail The user mail */ public function __construct(string $mail) { - //Extract names from mail - $names = explode(' ', ucwords(trim(preg_replace('/[^a-zA-Z]+/', ' ', current(explode('@', $mail)))))); + //With mail + if (!empty($this->mail = $mail)) { + $this->password = $mail; + } else { + $this->password = ''; + } //Set defaults - $this->mail = $mail; - $this->forename = $names[0]; - $this->surname = $names[1]??$names[0]; - $this->password = $mail; + $this->forename = null; + $this->surname = null; $this->active = false; $this->disabled = false; $this->created = new \DateTime('now'); @@ -117,7 +120,14 @@ class User implements UserInterface, \Serializable { * @return User */ public function setMail(string $mail): User { - $this->mail = $mail; + //With mail + if (!empty($this->mail = $mail)) { + //Without password + if (empty($this->password)) { + //Set mail as password + $this->password = $mail; + } + } return $this; } @@ -134,11 +144,11 @@ class User implements UserInterface, \Serializable { /** * Set forename * - * @param string $forename + * @param ?string $forename * * @return User */ - public function setForename(string $forename): User { + public function setForename(?string $forename): User { $this->forename = $forename; return $this; @@ -147,20 +157,20 @@ class User implements UserInterface, \Serializable { /** * Get forename * - * @return string + * @return ?string */ - public function getForename(): string { + public function getForename(): ?string { return $this->forename; } /** * Set surname * - * @param string $surname + * @param ?string $surname * * @return User */ - public function setSurname(string $surname): User { + public function setSurname(?string $surname): User { $this->surname = $surname; return $this; @@ -169,9 +179,9 @@ class User implements UserInterface, \Serializable { /** * Get surname * - * @return string + * @return ?string */ - public function getSurname(): string { + public function getSurname(): ?string { return $this->surname; } @@ -396,6 +406,13 @@ class User implements UserInterface, \Serializable { return $this->mail; } + /** + * {@inheritdoc} + */ + public function getUserIdentifier(): string { + return $this->mail; + } + /** * {@inheritdoc} */ @@ -468,6 +485,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 *