Strict types

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index a56518768910a46ea17fc057b0c579e875a24ee1..380c7ffa1660b83a53fdbd9ab3ed88e65c1d4670 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -14,6 +14,7 @@ namespace Rapsys\UserBundle\Entity;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 use Doctrine\Common\Collections\Collection;
 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 Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 


@@ -29,36 +30,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 $enable;
-

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


@@ -69,11 +40,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
         */


@@ -90,15 +56,8 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
         * @param bool $active The user active
         * @param bool $enable The user enable
         */
         * @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
                //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');
 
                $this->created = new \DateTime('now');
                $this->updated = new \DateTime('now');
 


@@ -196,10 +155,10 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
        }
 
        /**
        }
 
        /**

-        * Get password
-        *

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

+        * Get password
+        *

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


@@ -357,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
                        []
                ));


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