X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/82aa1aa93aa89f05db588a13ba4396175264ece2..4fbf31c3ac208ecc834bb8b278b516309b4ddfab:/Entity/User.php?ds=inline

diff --git a/Entity/User.php b/Entity/User.php
index e1693cc..a565187 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -11,9 +11,11 @@
 
 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;
@@ -21,80 +23,82 @@ use Rapsys\UserBundle\Entity\Group;
 /**
  * User
  */
-class User implements UserInterface, \Serializable {
+class User implements UserInterface, PasswordAuthenticatedUserInterface {
 	/**
-	 * @var integer
+	 * @var ?integer
 	 */
-	protected $id;
+	protected ?int $id;
 
 	/**
 	 * @var string
 	 */
-	protected $mail;
+	protected string $mail;
 
 	/**
 	 * @var string
 	 */
-	protected $forename;
+	protected string $password;
 
 	/**
-	 * @var string
+	 * @var ?string
 	 */
-	protected $surname;
+	protected ?string $forename;
 
 	/**
-	 * @var string
+	 * @var ?string
 	 */
-	protected $password;
+	protected ?string $surname;
 
 	/**
 	 * @var bool
 	 */
-	protected $active;
+	protected bool $active;
 
 	/**
 	 * @var bool
 	 */
-	protected $disabled;
+	protected bool $enable;
 
 	/**
 	 * @var \DateTime
 	 */
-	protected $created;
+	protected \DateTime $created;
 
 	/**
 	 * @var \DateTime
 	 */
-	protected $updated;
+	protected \DateTime $updated;
 
 	/**
 	 * @var Civility
 	 */
-	protected $civility;
+	protected ?Civility $civility;
 
 	/**
-	 * @var ArrayCollection
+	 * @var Doctrine\Common\Collections\Collection
 	 */
-	protected $groups;
+	protected Collection $groups;
 
 	/**
 	 * Constructor
 	 *
 	 * @param string $mail The user mail
-	 */
-	public function __construct(string $mail) {
-		//With mail
-		if (!empty($this->mail = $mail)) {
-			$this->password = $mail;
-		} else {
-			$this->password = '';
-		}
-
+	 * @param string $password The user password
+	 * @param ?Civility $civility The user civility
+	 * @param ?string $forename The user forename
+	 * @param ?string $surname The user surname
+	 * @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) {
 		//Set defaults
-		$this->forename = '';
-		$this->surname = '';
-		$this->active = false;
-		$this->disabled = false;
+		$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');
 
@@ -105,9 +109,9 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * Get id
 	 *
-	 * @return integer
+	 * @return ?int
 	 */
-	public function getId(): int {
+	public function getId(): ?int {
 		return $this->id;
 	}
 
@@ -115,18 +119,11 @@ class User implements UserInterface, \Serializable {
 	 * Set mail
 	 *
 	 * @param string $mail
-	 *
 	 * @return User
 	 */
 	public function setMail(string $mail): User {
-		//With mail
-		if (!empty($this->mail = $mail)) {
-			//Without password
-			if (empty($this->password)) {
-				//Set mail as password
-				$this->password = $mail;
-			}
-		}
+		//Set mail
+		$this->mail = $mail;
 
 		return $this;
 	}
@@ -143,11 +140,11 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * Set forename
 	 *
-	 * @param string $forename
+	 * @param ?string $forename
 	 *
 	 * @return User
 	 */
-	public function setForename(string $forename): User {
+	public function setForename(?string $forename): User {
 		$this->forename = $forename;
 
 		return $this;
@@ -156,20 +153,20 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * Get forename
 	 *
-	 * @return string
+	 * @return ?string
 	 */
-	public function getForename(): string {
+	public function getForename(): ?string {
 		return $this->forename;
 	}
 
 	/**
 	 * Set surname
 	 *
-	 * @param string $surname
+	 * @param ?string $surname
 	 *
 	 * @return User
 	 */
-	public function setSurname(string $surname): User {
+	public function setSurname(?string $surname): User {
 		$this->surname = $surname;
 
 		return $this;
@@ -178,9 +175,9 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * Get surname
 	 *
-	 * @return string
+	 * @return ?string
 	 */
-	public function getSurname(): string {
+	public function getSurname(): ?string {
 		return $this->surname;
 	}
 
@@ -192,6 +189,7 @@ class User implements UserInterface, \Serializable {
 	 * @return User
 	 */
 	public function setPassword(string $password): User {
+		//Set password
 		$this->password = $password;
 
 		return $this;
@@ -204,7 +202,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return string
 	 */
-	public function getPassword(): ?string {
+	public function getPassword(): string {
 		return $this->password;
 	}
 
@@ -231,25 +229,25 @@ class User implements UserInterface, \Serializable {
 	}
 
 	/**
-	 * 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;
 	}
 
 	/**
@@ -299,7 +297,7 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * Set civility
 	 */
-	public function setCivility(Civility $civility): User {
+	public function setCivility(?Civility $civility = null): User {
 		$this->civility = $civility;
 
 		return $this;
@@ -319,7 +317,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function addGroup(Group $group) {
+	public function addGroup(Group $group): User {
 		$this->groups[] = $group;
 
 		return $this;
@@ -329,17 +327,19 @@ class User implements UserInterface, \Serializable {
 	 * Remove group
 	 *
 	 * @param Group $group
+	 *
+	 * @return Doctrine\Common\Collections\Collection
 	 */
-	public function removeGroup(Group $group) {
-		$this->groups->removeElement($group);
+	public function removeGroup(Group $group): Collection {
+		return $this->groups->removeElement($group);
 	}
 
 	/**
 	 * Get groups
 	 *
-	 * @return ArrayCollection
+	 * @return Doctrine\Common\Collections\Collection
 	 */
-	public function getGroups(): ArrayCollection {
+	public function getGroups(): Collection {
 		return $this->groups;
 	}
 
@@ -398,6 +398,13 @@ class User implements UserInterface, \Serializable {
 		return null;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUsername(): string {
+		return $this->mail;
+	}
+
 	/**
 	 * {@inheritdoc}
 	 */
@@ -413,24 +420,24 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * {@inheritdoc}
 	 */
-	public function serialize(): string {
-		return serialize([
+	public function __serialize(): array {
+		return [
 			$this->id,
 			$this->mail,
 			$this->forename,
 			$this->surname,
 			$this->password,
 			$this->active,
-			$this->disabled,
+			$this->enable,
 			$this->created,
 			$this->updated
-		]);
+		];
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function unserialize($serialized) {
+	public function __unserialize(array $data): void {
 		list(
 			$this->id,
 			$this->mail,
@@ -438,32 +445,28 @@ class User implements UserInterface, \Serializable {
 			$this->surname,
 			$this->password,
 			$this->active,
-			$this->disabled,
+			$this->enable,
 			$this->created,
 			$this->updated
-		) = unserialize($serialized);
+		) = $data;
 	}
 
 	/**
 	 * 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;
 	}
 
 	/**