Use bundle name as translation domain

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index 7d274f9f48ecf8b171a848bbd1d9a41aec5f0732..5220e77dd0bec6410bc184ef0dd487e1ac433e46 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -11,94 +11,53 @@
 
 namespace Rapsys\UserBundle\Entity;
 
 
 namespace Rapsys\UserBundle\Entity;
 

+use Doctrine\Common\Collections\Collection;

 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 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;
 

+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
+

 /**
  * User
  */
 class User implements UserInterface, PasswordAuthenticatedUserInterface {
        /**
 /**
  * User
  */
 class User implements UserInterface, PasswordAuthenticatedUserInterface {
        /**

-        * @var integer
-        */
-       protected $id;
-
-       /**
-        * @var string
-        */
-       protected $mail;
-
-       /**
-        * @var string
-        */
-       protected $forename;
-
-       /**
-        * @var string
-        */
-       protected $surname;
-
-       /**
-        * @var string
-        */
-       protected $password;
-
-       /**
-        * @var bool
-        */
-       protected $active;
-
-       /**
-        * @var bool
-        */
-       protected $disabled;
-
-       /**
-        * @var \DateTime
+        * Primary key

         */
         */

-       protected $created;
+       protected ?int $id = null;

 
        /**
 
        /**

-        * @var \DateTime
+        * Create datetime

         */
         */

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

 
        /**
 
        /**

-        * @var Civility
+        * Update datetime

         */
         */

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

 
        /**
 
        /**

-        * @var ArrayCollection
+        * Groups collection

         */
         */

-       protected $groups;
+       protected Collection $groups;

 
        /**
         * Constructor
         *
 
        /**
         * Constructor
         *

-        * @param ?string $mail The user mail
-        */
-       public function __construct(?string $mail = null) {
-               //With mail
-               if ($mail !== null && !empty($mail)) {
-                       $this->mail = $mail;
-                       $this->password = $mail;
-               //Without mail
-               } else {
-                       $this->mail = '';
-                       $this->password = '';
-               }
-
+        * @param string $mail The user mail
+        * @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 $enable The user enable
+        */
+       public function __construct(protected string $mail, protected string $password, protected ?Civility $civility = null, protected ?string $forename = null, protected ?string $surname = null, protected bool $active = false, protected bool $enable = true) {

                //Set defaults
                //Set defaults

-               $this->forename = null;
-               $this->surname = null;
-               $this->active = false;
-               $this->disabled = false;

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


@@ -109,33 +68,21 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
        /**
         * Get id
         *
        /**
         * Get id
         *

-        * @return integer
+        * @return ?int

         */
         */

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

                return $this->id;
        }
 
        /**
         * Set mail
         *
                return $this->id;
        }
 
        /**
         * Set mail
         *

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

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

-       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 = '';
-               }
+       public function setMail(string $mail): User {
+               //Set mail
+               $this->mail = $mail;

 
                return $this;
        }
 
                return $this;
        }


@@ -200,23 +147,18 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
         *
         * @return User
         */
         *
         * @return User
         */

-       public function setPassword(?string $password): User {
-               //With password
-               if ($password !== null && !empty($password)) {
-                       $this->password = $password;
-               //Without password
-               } else {
-                       $this->password = '';
-               }
+       public function setPassword(string $password): User {
+               //Set password
+               $this->password = $password;

 
                return $this;
        }
 
        /**
 
                return $this;
        }
 
        /**

-        * Get password
-        *

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

+        * Get password
+        *

         * @return string
         */
        public function getPassword(): string {
         * @return string
         */
        public function getPassword(): string {


@@ -246,25 +188,25 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
        }
 
        /**
        }
 
        /**

-        * Set disabled
+        * Set enable

         *
         *

-        * @param bool $disabled
+        * @param bool $enable

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

-       public function setDisabled(bool $disabled): User {
-               $this->disabled = $disabled;
+       public function setEnable(bool $enable): User {
+               $this->enable = $enable;

 
                return $this;
        }
 
        /**
 
                return $this;
        }
 
        /**

-        * Get disabled
+        * Get enable

         *
         * @return bool
         */
         *
         * @return bool
         */

-       public function getDisabled(): bool {
-               return $this->disabled;
+       public function getEnable(): bool {
+               return $this->enable;

        }
 
        /**
        }
 
        /**


@@ -314,7 +256,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
        /**
         * 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;


@@ -334,7 +276,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
         *
         * @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;


@@ -344,17 +286,19 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
         * 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;
        }
 


@@ -372,7 +316,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
                                return $array;
                        },
                        //Init with empty array
                                return $array;
                        },
                        //Init with empty array

-                       //XXX: on registration, add each group present in rapsys_user.default.group array to user
+                       //XXX: on registration, add each group present in rapsysuser.default.group array to user

                        //XXX: see vendor/rapsys/userbundle/Controller/DefaultController.php +450
                        []
                ));
                        //XXX: see vendor/rapsys/userbundle/Controller/DefaultController.php +450
                        []
                ));


@@ -443,7 +387,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
                        $this->surname,
                        $this->password,
                        $this->active,
                        $this->surname,
                        $this->password,
                        $this->active,

-                       $this->disabled,
+                       $this->enable,

                        $this->created,
                        $this->updated
                ];
                        $this->created,
                        $this->updated
                ];


@@ -460,7 +404,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
                        $this->surname,
                        $this->password,
                        $this->active,
                        $this->surname,
                        $this->password,
                        $this->active,

-                       $this->disabled,
+                       $this->enable,

                        $this->created,
                        $this->updated
                ) = $data;
                        $this->created,
                        $this->updated
                ) = $data;


@@ -469,23 +413,19 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
        /**
         * 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->enable;

        }
 
        /**
        }
 
        /**


@@ -493,7 +433,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
         */
        public function preUpdate(PreUpdateEventArgs $eventArgs) {
                //Check that we have an user instance
         */
        public function preUpdate(PreUpdateEventArgs $eventArgs) {
                //Check that we have an user instance

-               if (($user = $eventArgs->getEntity()) instanceof User) {
+               if (($user = $eventArgs->getObject()) instanceof User) {

                        //Set updated value
                        $user->setUpdated(new \DateTime('now'));
                }
                        //Set updated value
                        $user->setUpdated(new \DateTime('now'));
                }