Fix extraction of forename and surname from mail when empty

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index c4c14df4f5c8240c264f3c1df9279fcd6a32f2df..9ccad72e5a17fb405bfa0b5f8d2dc163e951d55a 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -32,11 +32,6 @@ class User implements UserInterface, \Serializable {
         */
        protected $mail;
 
         */
        protected $mail;
 

-       /**
-        * @var string
-        */
-       protected $pseudonym;
-

        /**
         * @var string
         */
        /**
         * @var string
         */


@@ -52,11 +47,6 @@ class User implements UserInterface, \Serializable {
         */
        protected $password;
 
         */
        protected $password;
 

-       /**
-        * @var string
-        */
-       protected $slug;
-

        /**
         * @var bool
         */
        /**
         * @var bool
         */


@@ -93,9 +83,23 @@ class User implements UserInterface, \Serializable {
         * @param string $mail The user mail
         */
        public function __construct(string $mail) {
         * @param string $mail The user mail
         */
        public function __construct(string $mail) {

-               $this->mail = $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];
+               } else {
+                       $this->forename = '';
+                       $this->surname = '';
+               }
+               $this->password = $mail;

                $this->active = false;
                $this->disabled = false;
                $this->active = false;
                $this->disabled = false;

+               $this->created = new \DateTime('now');
+               $this->updated = new \DateTime('now');
+
+               //Set collections

                $this->groups = new ArrayCollection();
        }
 
                $this->groups = new ArrayCollection();
        }
 


@@ -116,7 +120,18 @@ class User implements UserInterface, \Serializable {
         * @return User
         */
        public function setMail(string $mail): User {
         * @return User
         */
        public function setMail(string $mail): User {

-               $this->mail = $mail;
+               //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];
+                       }
+               }

 
                return $this;
        }
 
                return $this;
        }


@@ -126,32 +141,10 @@ class User implements UserInterface, \Serializable {
         *
         * @return string
         */
         *
         * @return string
         */

-       public function getMail(): ?string {
+       public function getMail(): string {

                return $this->mail;
        }
 
                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
         *
        /**
         * Set forename
         *


@@ -170,7 +163,7 @@ class User implements UserInterface, \Serializable {
         *
         * @return string
         */
         *
         * @return string
         */

-       public function getForename(): ?string {
+       public function getForename(): string {

                return $this->forename;
        }
 
                return $this->forename;
        }
 


@@ -192,7 +185,7 @@ class User implements UserInterface, \Serializable {
         *
         * @return string
         */
         *
         * @return string
         */

-       public function getSurname(): ?string {
+       public function getSurname(): string {

                return $this->surname;
        }
 
                return $this->surname;
        }
 


@@ -220,28 +213,6 @@ class User implements UserInterface, \Serializable {
                return $this->password;
        }
 
                return $this->password;
        }
 

-       /**
-        * Set slug
-        *
-        * @param string $slug
-        *
-        * @return User
-        */
-       public function setSlug(?string $slug): User {
-               $this->slug = $slug;
-
-               return $this;
-       }
-
-       /**
-        * Get slug
-        *
-        * @return string
-        */
-       public function getSlug(): ?string {
-               return $this->slug;
-       }
-

        /**
         * Set active
         *
        /**
         * Set active
         *


@@ -444,10 +415,15 @@ class User implements UserInterface, \Serializable {
         */
        public function eraseCredentials(): void {}
 
         */
        public function eraseCredentials(): void {}
 

+       /**
+        * {@inheritdoc}
+        */

        public function serialize(): string {
                return serialize([
                        $this->id,
                        $this->mail,
        public function serialize(): string {
                return serialize([
                        $this->id,
                        $this->mail,

+                       $this->forename,
+                       $this->surname,

                        $this->password,
                        $this->active,
                        $this->disabled,
                        $this->password,
                        $this->active,
                        $this->disabled,


@@ -456,10 +432,15 @@ class User implements UserInterface, \Serializable {
                ]);
        }
 
                ]);
        }
 

+       /**
+        * {@inheritdoc}
+        */

        public function unserialize($serialized) {
                list(
                        $this->id,
                        $this->mail,
        public function unserialize($serialized) {
                list(
                        $this->id,
                        $this->mail,

+                       $this->forename,
+                       $this->surname,

                        $this->password,
                        $this->active,
                        $this->disabled,
                        $this->password,
                        $this->active,
                        $this->disabled,