From 09388c0e8247c60b1f01360944d9ad416810b77b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Thu, 7 Mar 2024 18:46:25 +0100
Subject: [PATCH] Strict types Cleanup

---
 Entity/Civility.php | 17 ++++++-----------
 Entity/Group.php    | 19 +++++++------------
 Entity/User.php     |  5 +++--
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/Entity/Civility.php b/Entity/Civility.php
index ea8b95b..d1ccec3 100644
--- a/Entity/Civility.php
+++ b/Entity/Civility.php
@@ -11,6 +11,7 @@
 
 namespace Rapsys\UserBundle\Entity;
 
+use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 
@@ -23,36 +24,30 @@ class Civility {
 	/**
 	 * @var integer
 	 */
-	protected $id;
-
-	/**
-	 * @var string
-	 */
-	protected $title;
+	protected int $id;
 
 	/**
 	 * @var \DateTime
 	 */
-	protected $created;
+	protected \DateTime $created;
 
 	/**
 	 * @var \DateTime
 	 */
-	protected $updated;
+	protected \DateTime $updated;
 
 	/**
 	 * @var ArrayCollection
 	 */
-	protected $users;
+	protected Collection $users;
 
 	/**
 	 * Constructor
 	 *
 	 * @param string $title The civility name
 	 */
-	public function __construct(string $title) {
+	public function __construct(protected string $title) {
 		//Set defaults
-		$this->title = $title;
 		$this->created = new \DateTime('now');
 		$this->updated = new \DateTime('now');
 		$this->users = new ArrayCollection();
diff --git a/Entity/Group.php b/Entity/Group.php
index aa60f77..d155002 100644
--- a/Entity/Group.php
+++ b/Entity/Group.php
@@ -11,6 +11,7 @@
 
 namespace Rapsys\UserBundle\Entity;
 
+use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 
@@ -23,36 +24,30 @@ class Group {
 	/**
 	 * @var integer
 	 */
-	protected $id;
-
-	/**
-	 * @var string
-	 */
-	protected $title;
+	protected int $id;
 
 	/**
 	 * @var \DateTime
 	 */
-	protected $created;
+	protected \DateTime $created;
 
 	/**
 	 * @var \DateTime
 	 */
-	protected $updated;
+	protected \DateTime $updated;
 
 	/**
 	 * @var ArrayCollection
 	 */
-	protected $users;
+	protected Collection $users;
 
 	/**
 	 * Constructor
 	 *
 	 * @param string $title The group name
 	 */
-	public function __construct(string $title) {
+	public function __construct(protected string $title) {
 		//Set defaults
-		$this->title = $title;
 		$this->created = new \DateTime('now');
 		$this->updated = new \DateTime('now');
 		$this->users = new ArrayCollection();
@@ -85,7 +80,7 @@ class Group {
 	 *
 	 * @return string
 	 */
-	public function getTitle(): ?string {
+	public function getTitle(): string {
 		return $this->title;
 	}
 
diff --git a/Entity/User.php b/Entity/User.php
index 299303b..380c7ff 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -14,6 +14,7 @@ namespace Rapsys\UserBundle\Entity;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
+
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 
@@ -154,10 +155,10 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface {
 	}
 
 	/**
-	 * Get password
-	 *
 	 * {@inheritdoc}
 	 *
+	 * Get password
+	 *
 	 * @return string
 	 */
 	public function getPassword(): string {
-- 
2.41.1