Rename user bundle route alias

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index a56518768910a46ea17fc057b0c579e875a24ee1..299303bea98e3d116a29370d1f670f09af786390 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -29,36 +29,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
         */
        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 $enable;
-
        /**
         * @var \DateTime
         */
@@ -69,11 +39,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
         */
        protected \DateTime $updated;
 
-       /**
-        * @var Civility
-        */
-       protected ?Civility $civility;
-
        /**
         * @var Doctrine\Common\Collections\Collection
         */
@@ -90,15 +55,8 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
         * @param bool $active The user active
         * @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 $enable = true) {
+       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
-               $this->mail = $mail;
-               $this->password = $password;
-               $this->civility = $civility;
-               $this->forename = $forename;
-               $this->surname = $surname;
-               $this->active = $active;
-               $this->enable = $enable;
                $this->created = new \DateTime('now');
                $this->updated = new \DateTime('now');
 
@@ -357,7 +315,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
                                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
                        []
                ));
@@ -474,7 +432,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
         */
        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'));
                }