From c10ada0bebaf63162b0db1866f643984bdadbb30 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Tue, 17 Aug 2021 00:58:54 +0200
Subject: [PATCH] Add strict Add title as Civility and Group required
 constructor argument Return right type on set functions

---
 Entity/Civility.php | 11 +++++++----
 Entity/Group.php    | 14 +++++++-------
 Entity/User.php     | 25 ++++++++++++++-----------
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/Entity/Civility.php b/Entity/Civility.php
index 8e1719c..f350919 100644
--- a/Entity/Civility.php
+++ b/Entity/Civility.php
@@ -46,8 +46,11 @@ class Civility {
 
 	/**
 	 * Constructor
+	 *
+	 * @param string $title The civility name
 	 */
-	public function __construct() {
+	public function __construct(string $title) {
+		$this->title = $title;
 		$this->users = new ArrayCollection();
 	}
 
@@ -67,7 +70,7 @@ class Civility {
 	 *
 	 * @return Civility
 	 */
-	public function setTitle(string $title) {
+	public function setTitle(string $title): Civility {
 		$this->title = $title;
 
 		return $this;
@@ -89,7 +92,7 @@ class Civility {
 	 *
 	 * @return Civility
 	 */
-	public function setCreated(\DateTime $created) {
+	public function setCreated(\DateTime $created): Civility {
 		$this->created = $created;
 
 		return $this;
@@ -111,7 +114,7 @@ class Civility {
 	 *
 	 * @return Civility
 	 */
-	public function setUpdated(\DateTime $updated) {
+	public function setUpdated(\DateTime $updated): Civility {
 		$this->updated = $updated;
 
 		return $this;
diff --git a/Entity/Group.php b/Entity/Group.php
index 1141f91..d7ca3c7 100644
--- a/Entity/Group.php
+++ b/Entity/Group.php
@@ -50,7 +50,7 @@ class Group {
 	 * @param string $title The group name
 	 */
 	public function __construct(string $title) {
-		$this->title = (string) $title;
+		$this->title = $title;
 		$this->users = new ArrayCollection();
 	}
 
@@ -68,9 +68,9 @@ class Group {
 	 *
 	 * @param string $title The group name
 	 *
-	 * @return User
+	 * @return Group
 	 */
-	public function setTitle(string $title) {
+	public function setTitle(string $title): Group {
 		$this->title = $title;
 
 		return $this;
@@ -90,9 +90,9 @@ class Group {
 	 *
 	 * @param \DateTime $created
 	 *
-	 * @return User
+	 * @return Group
 	 */
-	public function setCreated(\DateTime $created) {
+	public function setCreated(\DateTime $created): Group {
 		$this->created = $created;
 
 		return $this;
@@ -112,9 +112,9 @@ class Group {
 	 *
 	 * @param \DateTime $updated
 	 *
-	 * @return User
+	 * @return Group
 	 */
-	public function setUpdated(\DateTime $updated) {
+	public function setUpdated(\DateTime $updated): Group {
 		$this->updated = $updated;
 
 		return $this;
diff --git a/Entity/User.php b/Entity/User.php
index 8e6a671..549b176 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -83,8 +83,11 @@ class User implements UserInterface, \Serializable {
 
 	/**
 	 * Constructor
+	 *
+	 * @param string $mail The user mail
 	 */
-	public function __construct() {
+	public function __construct(string $mail) {
+		$this->mail = $mail;
 		$this->active = false;
 		$this->disabled = false;
 		$this->groups = new ArrayCollection();
@@ -106,7 +109,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setMail(string $mail) {
+	public function setMail(string $mail): User {
 		$this->mail = $mail;
 
 		return $this;
@@ -128,7 +131,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setPseudonym(string $pseudonym) {
+	public function setPseudonym(string $pseudonym): User {
 		$this->pseudonym = $pseudonym;
 
 		return $this;
@@ -150,7 +153,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setForename(string $forename) {
+	public function setForename(string $forename): User {
 		$this->forename = $forename;
 
 		return $this;
@@ -172,7 +175,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setSurname(string $surname) {
+	public function setSurname(string $surname): User {
 		$this->surname = $surname;
 
 		return $this;
@@ -194,7 +197,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setPassword(string $password) {
+	public function setPassword(string $password): User {
 		$this->password = $password;
 
 		return $this;
@@ -218,7 +221,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setActive(bool $active) {
+	public function setActive(bool $active): User {
 		$this->active = $active;
 
 		return $this;
@@ -240,7 +243,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setDisabled(bool $disabled) {
+	public function setDisabled(bool $disabled): User {
 		$this->disabled = $disabled;
 
 		return $this;
@@ -262,7 +265,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setCreated(\DateTime $created) {
+	public function setCreated(\DateTime $created): User {
 		$this->created = $created;
 
 		return $this;
@@ -284,7 +287,7 @@ class User implements UserInterface, \Serializable {
 	 *
 	 * @return User
 	 */
-	public function setUpdated(\DateTime $updated) {
+	public function setUpdated(\DateTime $updated): User {
 		$this->updated = $updated;
 
 		return $this;
@@ -302,7 +305,7 @@ class User implements UserInterface, \Serializable {
 	/**
 	 * Set civility
 	 */
-	public function setCivility(Civility $civility) {
+	public function setCivility(Civility $civility): User {
 		$this->civility = $civility;
 
 		return $this;
-- 
2.41.0