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

diff --git a/Entity/User.php b/Entity/User.php
index cd32f1e..e1693cc 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -83,14 +83,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 = '';
+		$this->surname = '';
 		$this->active = false;
 		$this->disabled = false;
 		$this->created = new \DateTime('now');
@@ -117,7 +119,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;
 	}
@@ -392,7 +401,7 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getUsername(): string {
+	public function getUserIdentifier(): string {
 		return $this->mail;
 	}
 
@@ -468,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
 	 *