X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/49d823e99f9815fca231b76aceef894531e7b42c..60b5bbf626f4aca106b66be539a9b8c4cf71892e:/Entity/User.php diff --git a/Entity/User.php b/Entity/User.php index 809d363..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 $disabled; - /** * @var \DateTime */ @@ -69,11 +39,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface { */ protected \DateTime $updated; - /** - * @var Civility - */ - protected ?Civility $civility; - /** * @var Doctrine\Common\Collections\Collection */ @@ -88,17 +53,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'); @@ -229,25 +187,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; } /** @@ -428,7 +386,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface { $this->surname, $this->password, $this->active, - $this->disabled, + $this->enable, $this->created, $this->updated ]; @@ -445,7 +403,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface { $this->surname, $this->password, $this->active, - $this->disabled, + $this->enable, $this->created, $this->updated ) = $data; @@ -466,7 +424,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface { * @see vendor/symfony/security-core/User/InMemoryUserChecker.php */ public function isEnabled(): bool { - return !$this->disabled; + return $this->enable; } /**