X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/71c0edfd65c95bd05705d7c037766f477aac2791..82aa1aa93aa89f05db588a13ba4396175264ece2:/Entity/User.php

diff --git a/Entity/User.php b/Entity/User.php
index 8e6a671..e1693cc 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -12,6 +12,7 @@
 namespace Rapsys\UserBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Event\PreUpdateEventArgs;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 use Rapsys\UserBundle\Entity\Civility;
@@ -31,11 +32,6 @@ class User implements UserInterface, \Serializable {
 	 */
 	protected $mail;
 
-	/**
-	 * @var string
-	 */
-	protected $pseudonym;
-
 	/**
 	 * @var string
 	 */
@@ -83,10 +79,26 @@ class User implements UserInterface, \Serializable {
 
 	/**
 	 * Constructor
+	 *
+	 * @param string $mail The user mail
 	 */
-	public function __construct() {
+	public function __construct(string $mail) {
+		//With mail
+		if (!empty($this->mail = $mail)) {
+			$this->password = $mail;
+		} else {
+			$this->password = '';
+		}
+
+		//Set defaults
+		$this->forename = '';
+		$this->surname = '';
 		$this->active = false;
 		$this->disabled = false;
+		$this->created = new \DateTime('now');
+		$this->updated = new \DateTime('now');
+
+		//Set collections
 		$this->groups = new ArrayCollection();
 	}
 
@@ -106,8 +118,15 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setMail(string $mail) {
-		$this->mail = $mail;
+	public function setMail(string $mail): User {
+		//With mail
+		if (!empty($this->mail = $mail)) {
+			//Without password
+			if (empty($this->password)) {
+				//Set mail as password
+				$this->password = $mail;
+			}
+		}
 
 		return $this;
 	}
@@ -117,32 +136,10 @@ 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
 	 *
@@ -150,7 +147,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setForename(string $forename) {
+	public function setForename(string $forename): User {
 		$this->forename = $forename;
 
 		return $this;
@@ -161,7 +158,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return string
 	 */
-	public function getForename(): ?string {
+	public function getForename(): string {
 		return $this->forename;
 	}
 
@@ -172,7 +169,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setSurname(string $surname) {
+	public function setSurname(string $surname): User {
 		$this->surname = $surname;
 
 		return $this;
@@ -183,7 +180,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return string
 	 */
-	public function getSurname(): ?string {
+	public function getSurname(): string {
 		return $this->surname;
 	}
 
@@ -194,7 +191,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setPassword(string $password) {
+	public function setPassword(string $password): User {
 		$this->password = $password;
 
 		return $this;
@@ -218,7 +215,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 +237,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 +259,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 +281,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 +299,7 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * Set civility
 	 */
-	public function setCivility(Civility $civility) {
+	public function setCivility(Civility $civility): User {
 		$this->civility = $civility;
 
 		return $this;
@@ -404,7 +401,7 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getUsername(): string {
+	public function getUserIdentifier(): string {
 		return $this->mail;
 	}
 
@@ -413,10 +410,15 @@ class User implements UserInterface, \Serializable {
 	 */
 	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,
@@ -425,10 +427,15 @@ class User implements UserInterface, \Serializable {
 		]);
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function unserialize($serialized) {
 		list(
 			$this->id,
 			$this->mail,
+			$this->forename,
+			$this->surname,
 			$this->password,
 			$this->active,
 			$this->disabled,
@@ -462,7 +469,7 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * {@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 +477,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
 	 *