X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/22896a010c864a979eca840829ddad80b40c6f62..7d3b1e0f78f0f4bccd66a4116a440937df7b0410:/Entity/User.php?ds=sidebyside

diff --git a/Entity/User.php b/Entity/User.php
index 4eee930..5220e77 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -14,68 +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
-	 */
-	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
+	 * Primary key
 	 */
-	protected bool $active;
+	protected ?int $id = null;
 
 	/**
-	 * @var bool
-	 */
-	protected bool $disabled;
-
-	/**
-	 * @var \DateTime
+	 * Create datetime
 	 */
 	protected \DateTime $created;
 
 	/**
-	 * @var \DateTime
+	 * Update datetime
 	 */
 	protected \DateTime $updated;
 
 	/**
-	 * @var Civility
-	 */
-	protected ?Civility $civility;
-
-	/**
-	 * @var Doctrine\Common\Collections\Collection
+	 * Groups collection
 	 */
 	protected Collection $groups;
 
@@ -88,17 +54,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 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
-		$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');
 
@@ -196,10 +155,10 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
 	}
 
 	/**
-	 * Get password
-	 *
 	 * {@inheritdoc}
 	 *
+	 * Get password
+	 *
 	 * @return string
 	 */
 	public function getPassword(): string {
@@ -229,25 +188,25 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
 	}
 
 	/**
-	 * Set disabled
+	 * Set enable
 	 *
-	 * @param bool $disabled
+	 * @param bool $enable
 	 *
 	 * @return User
 	 */
-	public function setDisabled(bool $disabled): User {
-		$this->disabled = $disabled;
+	public function setEnable(bool $enable): User {
+		$this->enable = $enable;
 
 		return $this;
 	}
 
 	/**
-	 * Get disabled
+	 * Get enable
 	 *
 	 * @return bool
 	 */
-	public function getDisabled(): bool {
-		return $this->disabled;
+	public function getEnable(): bool {
+		return $this->enable;
 	}
 
 	/**
@@ -357,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
 			[]
 		));
@@ -428,7 +387,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
 			$this->surname,
 			$this->password,
 			$this->active,
-			$this->disabled,
+			$this->enable,
 			$this->created,
 			$this->updated
 		];
@@ -445,7 +404,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
 			$this->surname,
 			$this->password,
 			$this->active,
-			$this->disabled,
+			$this->enable,
 			$this->created,
 			$this->updated
 		) = $data;
@@ -454,23 +413,19 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
 	/**
 	 * Check if account is activated
 	 *
-	 * It was from deprecated AdvancedUserInterface, see if it's used anymore
-	 *
-	 * @see vendor/symfony/security-core/User/AdvancedUserInterface.php
+	 * @see vendor/rapsys/userbundle/Checker/UserChecker.php
 	 */
 	public function isActivated(): bool {
 		return $this->active;
 	}
 
 	/**
-	 * Check if account is disabled
-	 *
-	 * It was from deprecated AdvancedUserInterface, see if it's used anymore
+	 * Check if account is enabled
 	 *
-	 * @see vendor/symfony/security-core/User/AdvancedUserInterface.php
+	 * @see vendor/symfony/security-core/User/InMemoryUserChecker.php
 	 */
-	public function isDisabled(): bool {
-		return $this->disabled;
+	public function isEnabled(): bool {
+		return $this->enable;
 	}
 
 	/**
@@ -478,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'));
 		}