X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/6da4de94618dae8d84db5718c5bcb148955cf8ee..8a2af4135e032112590cca76e1645d2da0c97564:/Entity/User.php

diff --git a/Entity/User.php b/Entity/User.php
index a565187..7d15a36 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -29,36 +29,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
 	 */
 	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
-	 */
-	protected bool $active;
-
-	/**
-	 * @var bool
-	 */
-	protected bool $enable;
-
 	/**
 	 * @var \DateTime
 	 */
@@ -69,11 +39,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
 	 */
 	protected \DateTime $updated;
 
-	/**
-	 * @var Civility
-	 */
-	protected ?Civility $civility;
-
 	/**
 	 * @var Doctrine\Common\Collections\Collection
 	 */
@@ -90,15 +55,8 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
 	 * @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) {
+	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->enable = $enable;
 		$this->created = new \DateTime('now');
 		$this->updated = new \DateTime('now');
 
@@ -474,7 +432,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'));
 		}