Set mail as optional

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index 9ccad72e5a17fb405bfa0b5f8d2dc163e951d55a..7d274f9f48ecf8b171a848bbd1d9a41aec5f0732 100644 (file)
--- 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 {
        /**
         * @var integer
         */
@@ -80,20 +81,22 @@ class User implements UserInterface, \Serializable {
        /**
         * Constructor
         *
-        * @param string $mail The user mail
+        * @param ?string $mail The user mail
         */
-       public function __construct(string $mail) {
-               //Set defaults
-               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];
+       public function __construct(?string $mail = null) {
+               //With mail
+               if ($mail !== null && !empty($mail)) {
+                       $this->mail = $mail;
+                       $this->password = $mail;
+               //Without mail
                } else {
-                       $this->forename = '';
-                       $this->surname = '';
+                       $this->mail = '';
+                       $this->password = '';
                }
-               $this->password = $mail;
+
+               //Set defaults
+               $this->forename = null;
+               $this->surname = null;
                $this->active = false;
                $this->disabled = false;
                $this->created = new \DateTime('now');
@@ -115,22 +118,23 @@ class User implements UserInterface, \Serializable {
        /**
         * Set mail
         *
-        * @param string $mail
-        *
+        * @param ?string $mail
         * @return User
         */
-       public function setMail(string $mail): User {
+       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];
+               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;
@@ -148,11 +152,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;
@@ -161,20 +165,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;
@@ -183,9 +187,9 @@ class User implements UserInterface, \Serializable {
        /**
         * Get surname
         *
-        * @return string
+        * @return ?string
         */
-       public function getSurname(): string {
+       public function getSurname(): ?string {
                return $this->surname;
        }
 
@@ -196,8 +200,14 @@ class User implements UserInterface, \Serializable {
         *
         * @return User
         */
-       public function setPassword(string $password): User {
-               $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;
        }
@@ -209,7 +219,7 @@ class User implements UserInterface, \Serializable {
         *
         * @return string
         */
-       public function getPassword(): ?string {
+       public function getPassword(): string {
                return $this->password;
        }
 
@@ -410,6 +420,13 @@ class User implements UserInterface, \Serializable {
                return $this->mail;
        }
 
+       /**
+        * {@inheritdoc}
+        */
+       public function getUserIdentifier(): string {
+               return $this->mail;
+       }
+
        /**
         * {@inheritdoc}
         */
@@ -418,8 +435,8 @@ class User implements UserInterface, \Serializable {
        /**
         * {@inheritdoc}
         */
-       public function serialize(): string {
-               return serialize([
+       public function __serialize(): array {
+               return [
                        $this->id,
                        $this->mail,
                        $this->forename,
@@ -429,13 +446,13 @@ class User implements UserInterface, \Serializable {
                        $this->disabled,
                        $this->created,
                        $this->updated
-               ]);
+               ];
        }
 
        /**
         * {@inheritdoc}
         */
-       public function unserialize($serialized) {
+       public function __unserialize(array $data): void {
                list(
                        $this->id,
                        $this->mail,
@@ -446,7 +463,7 @@ class User implements UserInterface, \Serializable {
                        $this->disabled,
                        $this->created,
                        $this->updated
-               ) = unserialize($serialized);
+               ) = $data;
        }
 
        /**
@@ -482,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
         *