Fix replacement of getUsername by getUserIdentifier in symfony 5.3+

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index 549b176a290795e79b11866919e0044ae7b7afd5..e1693cc06a2934ba21db9cc50745a83b143d0cd2 100644 (file)
--- 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
         */
@@ -87,9 +83,22 @@ class User implements UserInterface, \Serializable {
         * @param string $mail The user mail
         */
        public function __construct(string $mail) {
-               $this->mail = $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();
        }
 
@@ -110,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;
        }
@@ -120,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): User {
-               $this->pseudonym = $pseudonym;
-
-               return $this;
-       }
-
-       /**
-        * Get pseudonym
-        *
-        * @return string
-        */
-       public function getPseudonym(): ?string {
-               return $this->pseudonym;
-       }
-
        /**
         * Set forename
         *
@@ -164,7 +158,7 @@ class User implements UserInterface, \Serializable {
         *
         * @return string
         */
-       public function getForename(): ?string {
+       public function getForename(): string {
                return $this->forename;
        }
 
@@ -186,7 +180,7 @@ class User implements UserInterface, \Serializable {
         *
         * @return string
         */
-       public function getSurname(): ?string {
+       public function getSurname(): string {
                return $this->surname;
        }
 
@@ -407,7 +401,7 @@ class User implements UserInterface, \Serializable {
        /**
         * {@inheritdoc}
         */
-       public function getUsername(): string {
+       public function getUserIdentifier(): string {
                return $this->mail;
        }
 
@@ -416,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,
@@ -428,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,
@@ -465,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
@@ -473,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
         *