From: Raphaël Gertz <git@rapsys.eu>
Date: Thu, 29 Feb 2024 13:22:00 +0000 (+0100)
Subject: Php 8.x constructor style
X-Git-Tag: 0.4.0~26
X-Git-Url: https://git.rapsys.eu/userbundle/commitdiff_plain/60b5bbf626f4aca106b66be539a9b8c4cf71892e?ds=sidebyside

Php 8.x constructor style
Strict types
Cleanup
---

diff --git a/Entity/User.php b/Entity/User.php
index a565187..68b0dcf 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');