Rename user bundle alias

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index 809d363777ea36555d855b7ca991318de32b5a65..7d15a367f358f08e7c44f83daba7af4b14b6e159 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -29,36 +29,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
         */
        protected ?int $id;
 
         */
        protected ?int $id;
 

-       /**
-        * @var string
-        */
-       protected string $mail;
-
-       /**
-        * @var string
-        */
-       protected string $password;
-
-       /**
-        * @var ?string
-        */
-       protected ?string $forename;
-
-       /**
-        * @var ?string
-        */
-       protected ?string $surname;
-
-       /**
-        * @var bool
-        */
-       protected bool $active;
-
-       /**
-        * @var bool
-        */
-       protected bool $disabled;
-

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


@@ -69,11 +39,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
         */
        protected \DateTime $updated;
 
         */
        protected \DateTime $updated;
 

-       /**
-        * @var Civility
-        */
-       protected ?Civility $civility;
-

        /**
         * @var Doctrine\Common\Collections\Collection
         */
        /**
         * @var Doctrine\Common\Collections\Collection
         */


@@ -88,17 +53,10 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
         * @param ?string $forename The user forename
         * @param ?string $surname The user surname
         * @param bool $active The user active
         * @param ?string $forename The user forename
         * @param ?string $surname The user surname
         * @param bool $active The user active

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

         */
         */

-       public function __construct(string $mail, string $password, ?Civility $civility = null, ?string $forename = null, ?string $surname = null, bool $active = false, bool $disabled = false) {
+       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->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');
 


@@ -229,25 +187,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;

        }
 
        /**
        }
 
        /**


@@ -428,7 +386,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
                ];


@@ -445,7 +403,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;


@@ -466,7 +424,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
         * @see vendor/symfony/security-core/User/InMemoryUserChecker.php
         */
        public function isEnabled(): bool {
         * @see vendor/symfony/security-core/User/InMemoryUserChecker.php
         */
        public function isEnabled(): bool {

-               return !$this->disabled;
+               return $this->enable;

        }
 
        /**
        }
 
        /**


@@ -474,7 +432,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'));
                }