From c3b641e801ce1526196b04e2722d3bb5c02a7ec6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Sat, 28 Aug 2021 12:35:39 +0200
Subject: [PATCH] Add getRecipientName function Replace empty password with
mail Revert to empty forename and surname when not provided
---
Entity/User.php | 43 +++++++++++++++++++++++++++----------------
1 file changed, 27 insertions(+), 16 deletions(-)
diff --git a/Entity/User.php b/Entity/User.php
index 9ccad72..4393db6 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -83,17 +83,16 @@ class User implements UserInterface, \Serializable {
* @param string $mail The user mail
*/
public function __construct(string $mail) {
- //Set defaults
+ //With mail
if (!empty($this->mail = $mail)) {
- //Extract names from mail
- $names = explode(' ', ucwords(trim(preg_replace('/[^a-zA-Z]+/', ' ', current(explode('@', $mail))))));
- $this->forename = $names[0];
- $this->surname = $names[1]??$names[0];
+ $this->password = $mail;
} else {
- $this->forename = '';
- $this->surname = '';
+ $this->password = '';
}
- $this->password = $mail;
+
+ //Set defaults
+ $this->forename = '';
+ $this->surname = '';
$this->active = false;
$this->disabled = false;
$this->created = new \DateTime('now');
@@ -122,14 +121,10 @@ class User implements UserInterface, \Serializable {
public function setMail(string $mail): User {
//With mail
if (!empty($this->mail = $mail)) {
- //Without forename and surname
- if (empty($this->forename) && empty($this->surname)) {
- //Extract names from mail
- $names = explode(' ', ucwords(trim(preg_replace('/[^a-zA-Z]+/', ' ', current(explode('@', $mail))))));
- //Set forename
- $this->forename = $names[0];
- //Set surname
- $this->surname = $names[1]??$names[0];
+ //Without password
+ if (empty($this->password)) {
+ //Set mail as password
+ $this->password = $mail;
}
}
@@ -482,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
*
--
2.41.3