X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/dc6abe457620de69b2322f0ae39f06083611ec01..5fce2114e5ad298ccb19955253c08cab48675f63:/Entity/User.php

diff --git a/Entity/User.php b/Entity/User.php
index c2c1642..7d274f9 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -14,6 +14,7 @@ namespace Rapsys\UserBundle\Entity;
 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,7 +22,7 @@ use Rapsys\UserBundle\Entity\Group;
 /**
  * User
  */
-class User implements UserInterface, \Serializable {
+class User implements UserInterface, PasswordAuthenticatedUserInterface {
 	/**
 	 * @var integer
 	 */
@@ -80,19 +81,22 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * Constructor
 	 *
-	 * @param string $mail The user mail
+	 * @param ?string $mail The user mail
 	 */
-	public function __construct(string $mail) {
+	public function __construct(?string $mail = null) {
 		//With mail
-		if (!empty($this->mail = $mail)) {
+		if ($mail !== null && !empty($mail)) {
+			$this->mail = $mail;
 			$this->password = $mail;
+		//Without mail
 		} else {
+			$this->mail = '';
 			$this->password = '';
 		}
 
 		//Set defaults
-		$this->forename = '';
-		$this->surname = '';
+		$this->forename = null;
+		$this->surname = null;
 		$this->active = false;
 		$this->disabled = false;
 		$this->created = new \DateTime('now');
@@ -114,18 +118,23 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * Set mail
 	 *
-	 * @param string $mail
-	 *
+	 * @param ?string $mail
 	 * @return User
 	 */
-	public function setMail(string $mail): User {
+	public function setMail(?string $mail): User {
 		//With mail
-		if (!empty($this->mail = $mail)) {
+		if ($mail !== null && !empty($mail)) {
+			//Set mail
+			$this->mail = $mail;
+
 			//Without password
 			if (empty($this->password)) {
 				//Set mail as password
 				$this->password = $mail;
 			}
+		//Without mail
+		} else {
+			$this->mail = '';
 		}
 
 		return $this;
@@ -143,11 +152,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 +165,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 +187,9 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * Get surname
 	 *
-	 * @return string
+	 * @return ?string
 	 */
-	public function getSurname(): string {
+	public function getSurname(): ?string {
 		return $this->surname;
 	}
 
@@ -191,8 +200,14 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setPassword(string $password): User {
-		$this->password = $password;
+	public function setPassword(?string $password): User {
+		//With password
+		if ($password !== null && !empty($password)) {
+			$this->password = $password;
+		//Without password
+		} else {
+			$this->password = '';
+		}
 
 		return $this;
 	}
@@ -204,7 +219,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return string
 	 */
-	public function getPassword(): ?string {
+	public function getPassword(): string {
 		return $this->password;
 	}
 
@@ -420,8 +435,8 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * {@inheritdoc}
 	 */
-	public function serialize(): string {
-		return serialize([
+	public function __serialize(): array {
+		return [
 			$this->id,
 			$this->mail,
 			$this->forename,
@@ -431,13 +446,13 @@ class User implements UserInterface, \Serializable {
 			$this->disabled,
 			$this->created,
 			$this->updated
-		]);
+		];
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function unserialize($serialized) {
+	public function __unserialize(array $data): void {
 		list(
 			$this->id,
 			$this->mail,
@@ -448,7 +463,7 @@ class User implements UserInterface, \Serializable {
 			$this->disabled,
 			$this->created,
 			$this->updated
-		) = unserialize($serialized);
+		) = $data;
 	}
 
 	/**