From: Raphaƫl Gertz Date: Sat, 28 Aug 2021 09:06:19 +0000 (+0200) Subject: Remove pseudonym and slug X-Git-Tag: 0.2.0~29 X-Git-Url: https://git.rapsys.eu/userbundle/commitdiff_plain/92df56260494a1a27a5c509493200ac8594d50d8 Remove pseudonym and slug Add forename and surname in serializing Set forename and surname from mail extraction Initialize all fields --- diff --git a/Entity/User.php b/Entity/User.php index c4c14df..cd32f1e 100644 --- a/Entity/User.php +++ b/Entity/User.php @@ -32,11 +32,6 @@ class User implements UserInterface, \Serializable { */ protected $mail; - /** - * @var string - */ - protected $pseudonym; - /** * @var string */ @@ -52,11 +47,6 @@ class User implements UserInterface, \Serializable { */ protected $password; - /** - * @var string - */ - protected $slug; - /** * @var bool */ @@ -93,9 +83,20 @@ class User implements UserInterface, \Serializable { * @param string $mail The user mail */ public function __construct(string $mail) { + //Extract names from mail + $names = explode(' ', ucwords(trim(preg_replace('/[^a-zA-Z]+/', ' ', current(explode('@', $mail)))))); + + //Set defaults $this->mail = $mail; + $this->forename = $names[0]; + $this->surname = $names[1]??$names[0]; + $this->password = $mail; $this->active = false; $this->disabled = false; + $this->created = new \DateTime('now'); + $this->updated = new \DateTime('now'); + + //Set collections $this->groups = new ArrayCollection(); } @@ -126,32 +127,10 @@ class User implements UserInterface, \Serializable { * * @return string */ - public function getMail(): ?string { + public function getMail(): string { return $this->mail; } - /** - * Set pseudonym - * - * @param string $pseudonym - * - * @return User - */ - public function setPseudonym(string $pseudonym): User { - $this->pseudonym = $pseudonym; - - return $this; - } - - /** - * Get pseudonym - * - * @return string - */ - public function getPseudonym(): ?string { - return $this->pseudonym; - } - /** * Set forename * @@ -170,7 +149,7 @@ class User implements UserInterface, \Serializable { * * @return string */ - public function getForename(): ?string { + public function getForename(): string { return $this->forename; } @@ -192,7 +171,7 @@ class User implements UserInterface, \Serializable { * * @return string */ - public function getSurname(): ?string { + public function getSurname(): string { return $this->surname; } @@ -220,28 +199,6 @@ class User implements UserInterface, \Serializable { return $this->password; } - /** - * Set slug - * - * @param string $slug - * - * @return User - */ - public function setSlug(?string $slug): User { - $this->slug = $slug; - - return $this; - } - - /** - * Get slug - * - * @return string - */ - public function getSlug(): ?string { - return $this->slug; - } - /** * Set active * @@ -444,10 +401,15 @@ class User implements UserInterface, \Serializable { */ public function eraseCredentials(): void {} + /** + * {@inheritdoc} + */ public function serialize(): string { return serialize([ $this->id, $this->mail, + $this->forename, + $this->surname, $this->password, $this->active, $this->disabled, @@ -456,10 +418,15 @@ class User implements UserInterface, \Serializable { ]); } + /** + * {@inheritdoc} + */ public function unserialize($serialized) { list( $this->id, $this->mail, + $this->forename, + $this->surname, $this->password, $this->active, $this->disabled,