Remove unnecessary dev requirement

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index 549b176a290795e79b11866919e0044ae7b7afd5..8103ea6bcd111d26ad5592eb046022f5ce3ed89e 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -12,7 +12,9 @@
 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;
@@ -20,7 +22,7 @@ use Rapsys\UserBundle\Entity\Group;
 /**
  * User
  */
-class User implements UserInterface, \Serializable {
+class User implements UserInterface, PasswordAuthenticatedUserInterface {
        /**
         * @var integer
         */
@@ -31,11 +33,6 @@ class User implements UserInterface, \Serializable {
         */
        protected $mail;
 
-       /**
-        * @var string
-        */
-       protected $pseudonym;
-
        /**
         * @var string
         */
@@ -84,12 +81,28 @@ class User implements UserInterface, \Serializable {
        /**
         * Constructor
         *
-        * @param string $mail The user mail
-        */
-       public function __construct(string $mail) {
-               $this->mail = $mail;
+        * @param ?string $mail The user mail
+        */
+       public function __construct(?string $mail) {
+               //With mail
+               if ($mail !== null && !empty($mail)) {
+                       $this->mail = $mail;
+                       $this->password = $mail;
+               //Without mail
+               } else {
+                       $this->mail = '';
+                       $this->password = '';
+               }
+
+               //Set defaults
+               $this->forename = null;
+               $this->surname = null;
                $this->active = false;
                $this->disabled = false;
+               $this->created = new \DateTime('now');
+               $this->updated = new \DateTime('now');
+
+               //Set collections
                $this->groups = new ArrayCollection();
        }
 
@@ -105,12 +118,24 @@ class User implements UserInterface, \Serializable {
        /**
         * Set mail
         *
-        * @param string $mail
-        *
+        * @param ?string $mail
         * @return User
         */
-       public function setMail(string $mail): User {
-               $this->mail = $mail;
+       public function setMail(?string $mail): User {
+               //With 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;
        }
@@ -120,40 +145,18 @@ 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
         *
-        * @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;
@@ -162,7 +165,7 @@ class User implements UserInterface, \Serializable {
        /**
         * Get forename
         *
-        * @return string
+        * @return ?string
         */
        public function getForename(): ?string {
                return $this->forename;
@@ -171,11 +174,11 @@ class User implements UserInterface, \Serializable {
        /**
         * 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;
@@ -184,7 +187,7 @@ class User implements UserInterface, \Serializable {
        /**
         * Get surname
         *
-        * @return string
+        * @return ?string
         */
        public function getSurname(): ?string {
                return $this->surname;
@@ -197,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;
        }
@@ -210,7 +219,7 @@ class User implements UserInterface, \Serializable {
         *
         * @return string
         */
-       public function getPassword(): ?string {
+       public function getPassword(): string {
                return $this->password;
        }
 
@@ -411,33 +420,50 @@ class User implements UserInterface, \Serializable {
                return $this->mail;
        }
 
+       /**
+        * {@inheritdoc}
+        */
+       public function getUserIdentifier(): string {
+               return $this->mail;
+       }
+
        /**
         * {@inheritdoc}
         */
        public function eraseCredentials(): void {}
 
-       public function serialize(): string {
-               return serialize([
+       /**
+        * {@inheritdoc}
+        */
+       public function __serialize(): array {
+               return [
                        $this->id,
                        $this->mail,
+                       $this->forename,
+                       $this->surname,
                        $this->password,
                        $this->active,
                        $this->disabled,
                        $this->created,
                        $this->updated
-               ]);
+               ];
        }
 
-       public function unserialize($serialized) {
+       /**
+        * {@inheritdoc}
+        */
+       public function __unserialize(array $data): void {
                list(
                        $this->id,
                        $this->mail,
+                       $this->forename,
+                       $this->surname,
                        $this->password,
                        $this->active,
                        $this->disabled,
                        $this->created,
                        $this->updated
-               ) = unserialize($serialized);
+               ) = $data;
        }
 
        /**
@@ -465,7 +491,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 +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
         *