Adapt entity and user checker to match with symfony classes and interfaces

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index 4393db6b4c4d996f35d10a489d24f36dd54bdb66..809d363777ea36555d855b7ca991318de32b5a65 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -11,9 +11,11 @@
 
 namespace Rapsys\UserBundle\Entity;
 
 
 namespace Rapsys\UserBundle\Entity;
 

+use Doctrine\Common\Collections\Collection;

 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,80 +23,82 @@ use Rapsys\UserBundle\Entity\Group;
 /**
  * User
  */
 /**
  * User
  */

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

        /**
        /**

-        * @var integer
+        * @var ?integer

         */
         */

-       protected $id;
+       protected ?int $id;

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

-       protected $mail;
+       protected string $mail;

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

-       protected $forename;
+       protected string $password;

 
        /**
 
        /**

-        * @var string
+        * @var ?string

         */
         */

-       protected $surname;
+       protected ?string $forename;

 
        /**
 
        /**

-        * @var string
+        * @var ?string

         */
         */

-       protected $password;
+       protected ?string $surname;

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

-       protected $active;
+       protected bool $active;

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

-       protected $disabled;
+       protected bool $disabled;

 
        /**
         * @var \DateTime
         */
 
        /**
         * @var \DateTime
         */

-       protected $created;
+       protected \DateTime $created;

 
        /**
         * @var \DateTime
         */
 
        /**
         * @var \DateTime
         */

-       protected $updated;
+       protected \DateTime $updated;

 
        /**
         * @var Civility
         */
 
        /**
         * @var Civility
         */

-       protected $civility;
+       protected ?Civility $civility;

 
        /**
 
        /**

-        * @var ArrayCollection
+        * @var Doctrine\Common\Collections\Collection

         */
         */

-       protected $groups;
+       protected Collection $groups;

 
        /**
         * Constructor
         *
         * @param string $mail The user mail
 
        /**
         * Constructor
         *
         * @param string $mail The user mail

-        */
-       public function __construct(string $mail) {
-               //With mail
-               if (!empty($this->mail = $mail)) {
-                       $this->password = $mail;
-               } else {
-                       $this->password = '';
-               }
-
+        * @param string $password The user password
+        * @param ?Civility $civility The user civility
+        * @param ?string $forename The user forename
+        * @param ?string $surname The user surname
+        * @param bool $active The user active
+        * @param bool $disabled The user disabled
+        */
+       public function __construct(string $mail, string $password, ?Civility $civility = null, ?string $forename = null, ?string $surname = null, bool $active = false, bool $disabled = false) {

                //Set defaults
                //Set defaults

-               $this->forename = '';
-               $this->surname = '';
-               $this->active = false;
-               $this->disabled = false;
+               $this->mail = $mail;
+               $this->password = $password;
+               $this->civility = $civility;
+               $this->forename = $forename;
+               $this->surname = $surname;
+               $this->active = $active;
+               $this->disabled = $disabled;

                $this->created = new \DateTime('now');
                $this->updated = new \DateTime('now');
 
                $this->created = new \DateTime('now');
                $this->updated = new \DateTime('now');
 


@@ -105,9 +109,9 @@ class User implements UserInterface, \Serializable {
        /**
         * Get id
         *
        /**
         * Get id
         *

-        * @return integer
+        * @return ?int

         */
         */

-       public function getId(): int {
+       public function getId(): ?int {

                return $this->id;
        }
 
                return $this->id;
        }
 


@@ -115,18 +119,11 @@ class User implements UserInterface, \Serializable {
         * Set mail
         *
         * @param string $mail
         * Set mail
         *
         * @param string $mail

-        *

         * @return User
         */
        public function setMail(string $mail): User {
         * @return User
         */
        public function setMail(string $mail): User {

-               //With mail
-               if (!empty($this->mail = $mail)) {
-                       //Without password
-                       if (empty($this->password)) {
-                               //Set mail as password
-                               $this->password = $mail;
-                       }
-               }
+               //Set mail
+               $this->mail = $mail;

 
                return $this;
        }
 
                return $this;
        }


@@ -143,11 +140,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 +153,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 +175,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;
        }
 


@@ -192,6 +189,7 @@ class User implements UserInterface, \Serializable {
         * @return User
         */
        public function setPassword(string $password): User {
         * @return User
         */
        public function setPassword(string $password): User {

+               //Set password

                $this->password = $password;
 
                return $this;
                $this->password = $password;
 
                return $this;


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

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

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


@@ -299,7 +297,7 @@ class User implements UserInterface, \Serializable {
        /**
         * Set civility
         */
        /**
         * Set civility
         */

-       public function setCivility(Civility $civility): User {
+       public function setCivility(?Civility $civility = null): User {

                $this->civility = $civility;
 
                return $this;
                $this->civility = $civility;
 
                return $this;


@@ -319,7 +317,7 @@ class User implements UserInterface, \Serializable {
         *
         * @return User
         */
         *
         * @return User
         */

-       public function addGroup(Group $group) {
+       public function addGroup(Group $group): User {

                $this->groups[] = $group;
 
                return $this;
                $this->groups[] = $group;
 
                return $this;


@@ -329,17 +327,19 @@ class User implements UserInterface, \Serializable {
         * Remove group
         *
         * @param Group $group
         * Remove group
         *
         * @param Group $group

+        *
+        * @return Doctrine\Common\Collections\Collection

         */
         */

-       public function removeGroup(Group $group) {
-               $this->groups->removeElement($group);
+       public function removeGroup(Group $group): Collection {
+               return $this->groups->removeElement($group);

        }
 
        /**
         * Get groups
         *
        }
 
        /**
         * Get groups
         *

-        * @return ArrayCollection
+        * @return Doctrine\Common\Collections\Collection

         */
         */

-       public function getGroups(): ArrayCollection {
+       public function getGroups(): Collection {

                return $this->groups;
        }
 
                return $this->groups;
        }
 


@@ -405,6 +405,13 @@ class User implements UserInterface, \Serializable {
                return $this->mail;
        }
 
                return $this->mail;
        }
 

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

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


@@ -413,8 +420,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 +431,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,29 +448,25 @@ class User implements UserInterface, \Serializable {
                        $this->disabled,
                        $this->created,
                        $this->updated
                        $this->disabled,
                        $this->created,
                        $this->updated

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

        }
 
        /**
         * Check if account is activated
         *
        }
 
        /**
         * Check if account is activated
         *

-        * It was from deprecated AdvancedUserInterface, see if it's used anymore
-        *
-        * @see vendor/symfony/security-core/User/AdvancedUserInterface.php
+        * @see vendor/rapsys/userbundle/Checker/UserChecker.php

         */
        public function isActivated(): bool {
                return $this->active;
        }
 
        /**
         */
        public function isActivated(): bool {
                return $this->active;
        }
 
        /**

-        * Check if account is disabled
-        *
-        * It was from deprecated AdvancedUserInterface, see if it's used anymore
+        * Check if account is enabled

         *
         *

-        * @see vendor/symfony/security-core/User/AdvancedUserInterface.php
+        * @see vendor/symfony/security-core/User/InMemoryUserChecker.php

         */
         */

-       public function isDisabled(): bool {
-               return $this->disabled;
+       public function isEnabled(): bool {
+               return !$this->disabled;

        }
 
        /**
        }
 
        /**