]> Raphaƫl G. Git Repositories - userbundle/blobdiff - Entity/User.php
Cleanup
[userbundle] / Entity / User.php
index 68b0dcf1ee1d6baf1f8ccb3e8f6391970ac7a61e..445c3bdddec00fd78e55481942f09c167648dae3 100644 (file)
@@ -14,6 +14,7 @@ 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 Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 
@@ -25,22 +26,22 @@ use Rapsys\UserBundle\Entity\Group;
  */
 class User implements UserInterface, PasswordAuthenticatedUserInterface {
        /**
-        * @var ?integer
+        * Primary key
         */
-       protected ?int $id;
+       protected ?int $id = null;
 
        /**
-        * @var \DateTime
+        * Create datetime
         */
        protected \DateTime $created;
 
        /**
-        * @var \DateTime
+        * Update datetime
         */
        protected \DateTime $updated;
 
        /**
-        * @var Doctrine\Common\Collections\Collection
+        * Groups collection
         */
        protected Collection $groups;
 
@@ -154,10 +155,10 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
        }
 
        /**
-        * Get password
-        *
         * {@inheritdoc}
         *
+        * Get password
+        *
         * @return string
         */
        public function getPassword(): string {
@@ -315,7 +316,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
                        []
                ));
@@ -432,7 +433,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'));
                }