Handle null mail and password on new User entity

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index 1e36a931b364da2678c99123ec557333bc752668..61be1051684af4a8e533d809413d1aa558eb3c9b 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -81,13 +81,16 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface, \Serial
        /**
         * Constructor
         *
-        * @param string $mail The user mail
+        * @param ?string $mail The user mail
         */
-       public function __construct(string $mail) {
+       public function __construct(?string $mail) {
                //With mail
-               if (!empty($this->mail = $mail)) {
+               if ($mail !== null && !empty($mail)) {
+                       $this->mail = $mail;
                        $this->password = $mail;
+               //Without mail
                } else {
+                       $this->mail = '';
                        $this->password = '';
                }
 
@@ -115,18 +118,23 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface, \Serial
        /**
         * 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)) {
+               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;
@@ -192,8 +200,14 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface, \Serial
         *
         * @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;
        }
@@ -205,7 +219,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface, \Serial
         *
         * @return string
         */
-       public function getPassword(): ?string {
+       public function getPassword(): string {
                return $this->password;
        }