Remove unnecessary dev requirement

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index e1693cc06a2934ba21db9cc50745a83b143d0cd2..8103ea6bcd111d26ad5592eb046022f5ce3ed89e 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 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;
 
 use Rapsys\UserBundle\Entity\Civility;
 use Rapsys\UserBundle\Entity\Group;


@@ -21,7 +22,7 @@ use Rapsys\UserBundle\Entity\Group;
 /**
  * User
  */
 /**
  * User
  */

-class User implements UserInterface, \Serializable {
+class User implements UserInterface, PasswordAuthenticatedUserInterface {

        /**
         * @var integer
         */
        /**
         * @var integer
         */


@@ -80,19 +81,22 @@ class User implements UserInterface, \Serializable {
        /**
         * Constructor
         *
        /**
         * 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
                //With mail

-               if (!empty($this->mail = $mail)) {
+               if ($mail !== null && !empty($mail)) {
+                       $this->mail = $mail;

                        $this->password = $mail;
                        $this->password = $mail;

+               //Without mail

                } else {
                } else {

+                       $this->mail = '';

                        $this->password = '';
                }
 
                //Set defaults
                        $this->password = '';
                }
 
                //Set defaults

-               $this->forename = '';
-               $this->surname = '';
+               $this->forename = null;
+               $this->surname = null;

                $this->active = false;
                $this->disabled = false;
                $this->created = new \DateTime('now');
                $this->active = false;
                $this->disabled = false;
                $this->created = new \DateTime('now');


@@ -114,18 +118,23 @@ class User implements UserInterface, \Serializable {
        /**
         * Set mail
         *
        /**
         * Set mail
         *

-        * @param string $mail
-        *
+        * @param ?string $mail

         * @return User
         */
         * @return User
         */

-       public function setMail(string $mail): User {
+       public function setMail(?string $mail): User {

                //With mail
                //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 password
                        if (empty($this->password)) {
                                //Set mail as password
                                $this->password = $mail;
                        }

+               //Without mail
+               } else {
+                       $this->mail = '';

                }
 
                return $this;
                }
 
                return $this;


@@ -143,11 +152,11 @@ class User implements UserInterface, \Serializable {
        /**
         * Set forename
         *
        /**
         * Set forename
         *

-        * @param string $forename
+        * @param ?string $forename

         *
         * @return User
         */
         *
         * @return User
         */

-       public function setForename(string $forename): User {
+       public function setForename(?string $forename): User {

                $this->forename = $forename;
 
                return $this;
                $this->forename = $forename;
 
                return $this;


@@ -156,20 +165,20 @@ class User implements UserInterface, \Serializable {
        /**
         * Get forename
         *
        /**
         * Get forename
         *

-        * @return string
+        * @return ?string

         */
         */

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

                return $this->forename;
        }
 
        /**
         * Set surname
         *
                return $this->forename;
        }
 
        /**
         * Set surname
         *

-        * @param string $surname
+        * @param ?string $surname

         *
         * @return User
         */
         *
         * @return User
         */

-       public function setSurname(string $surname): User {
+       public function setSurname(?string $surname): User {

                $this->surname = $surname;
 
                return $this;
                $this->surname = $surname;
 
                return $this;


@@ -178,9 +187,9 @@ class User implements UserInterface, \Serializable {
        /**
         * Get surname
         *
        /**
         * Get surname
         *

-        * @return string
+        * @return ?string

         */
         */

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

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


@@ -191,8 +200,14 @@ class User implements UserInterface, \Serializable {
         *
         * @return User
         */
         *
         * @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;
        }
 
                return $this;
        }


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

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

                return $this->password;
        }
 
                return $this->password;
        }
 


@@ -398,6 +413,13 @@ class User implements UserInterface, \Serializable {
                return null;
        }
 
                return null;
        }
 

+       /**
+        * {@inheritdoc}
+        */
+       public function getUsername(): string {
+               return $this->mail;
+       }
+

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


@@ -413,8 +435,8 @@ class User implements UserInterface, \Serializable {
        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */

-       public function serialize(): string {
-               return serialize([
+       public function __serialize(): array {
+               return [

                        $this->id,
                        $this->mail,
                        $this->forename,
                        $this->id,
                        $this->mail,
                        $this->forename,


@@ -424,13 +446,13 @@ class User implements UserInterface, \Serializable {
                        $this->disabled,
                        $this->created,
                        $this->updated
                        $this->disabled,
                        $this->created,
                        $this->updated

-               ]);
+               ];

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

-       public function unserialize($serialized) {
+       public function __unserialize(array $data): void {

                list(
                        $this->id,
                        $this->mail,
                list(
                        $this->id,
                        $this->mail,


@@ -441,7 +463,7 @@ class User implements UserInterface, \Serializable {
                        $this->disabled,
                        $this->created,
                        $this->updated
                        $this->disabled,
                        $this->created,
                        $this->updated

-               ) = unserialize($serialized);
+               ) = $data;

        }
 
        /**
        }
 
        /**