X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/60b5bbf626f4aca106b66be539a9b8c4cf71892e..0811e272814cf05d6fc8bc76646a0be99bf79bb9:/Entity/User.php?ds=sidebyside

diff --git a/Entity/User.php b/Entity/User.php
index 68b0dcf..5220e77 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -14,33 +14,34 @@ 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;
 
 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 {
 	/**
-	 * @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'));
 		}