From f570fe92a5675bbac245590a97e146ce024b22b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 28 Jul 2023 02:40:02 +0200
Subject: [PATCH] apply rector rules

---
 .../DataFixtures/ORM/LoadActivity.php         |  5 +--
 .../Entity/ActivityReasonCategory.php         |  7 +--
 .../src/Entity/AsideActivity.php              | 12 ++---
 .../Controller/ChargeController.php           | 25 +++--------
 .../Controller/ElementController.php          | 10 +----
 .../Controller/ResourceController.php         | 25 +++--------
 .../ChillBudgetBundle/Entity/Charge.php       |  3 +-
 .../Entity/CancelReason.php                   |  6 +--
 .../DataFixtures/ORM/LoadOption.php           |  2 +-
 .../Entity/CustomField.php                    | 16 ++-----
 .../Entity/CustomFieldLongChoice/Option.php   | 21 ++++-----
 .../Entity/CustomFieldsGroup.php              |  8 +---
 .../Form/Type/ChoiceWithOtherType.php         |  2 +-
 .../Form/Type/LinkedCustomFieldsType.php      |  8 +---
 .../Service/CustomFieldProvider.php           |  2 +-
 .../Twig/CustomFieldRenderingTwig.php         |  7 +--
 .../Twig/CustomFieldsGroupRenderingTwig.php   |  7 +--
 .../CustomFields/CustomFieldsChoiceTest.php   |  5 +--
 .../CustomFields/CustomFieldsNumberTest.php   |  5 +--
 .../CustomFields/CustomFieldsTextTest.php     |  5 +--
 .../Tests/Service/CustomFieldsHelperTest.php  | 10 +----
 .../Twig/CustomFieldRenderingTwigTest.php     | 10 +----
 .../CustomFieldsGroupRenderingTwigTest.php    | 10 +----
 .../Helper/NormalizeNullValueHelper.php       |  2 +-
 .../ChillDocStoreBundle/Entity/Document.php   | 12 ++---
 src/Bundle/ChillEventBundle/Entity/Event.php  | 12 ++---
 .../ChillEventBundle/Entity/Participation.php | 15 +++----
 src/Bundle/ChillEventBundle/Entity/Role.php   |  3 +-
 src/Bundle/ChillEventBundle/Entity/Status.php |  3 +-
 .../ParticipationControllerTest.php           |  2 +-
 .../Entity/AbstractFamilyMember.php           | 34 +++++---------
 .../Controller/AbstractCRUDController.php     |  2 -
 .../CRUD/Controller/ApiController.php         |  7 ---
 .../CRUD/Controller/CRUDController.php        | 12 -----
 .../ChillUserSendRenewPasswordCodeCommand.php |  8 +---
 .../Command/LoadAndUpdateLanguagesCommand.php |  7 ++-
 .../ORM/LoadAddressReferences.php             |  5 +--
 .../DataFixtures/ORM/LoadCountries.php        |  5 +--
 .../DataFixtures/ORM/LoadLanguages.php        | 11 ++---
 .../DataFixtures/ORM/LoadLocationType.php     |  5 +--
 .../DataFixtures/ORM/LoadPostalCodes.php      |  4 +-
 .../DataFixtures/ORM/LoadUsers.php            |  5 +--
 .../Widget/AbstractWidgetsCompilerPass.php    |  8 ++--
 .../ChillMainBundle/Doctrine/DQL/Age.php      |  4 +-
 .../ChillMainBundle/Doctrine/DQL/Extract.php  |  2 +-
 .../Doctrine/DQL/GetJsonFieldByKey.php        |  4 +-
 .../Doctrine/DQL/JsonAggregate.php            |  2 +-
 .../Doctrine/DQL/JsonExtract.php              |  4 +-
 .../Doctrine/DQL/JsonbArrayLength.php         |  2 +-
 .../Doctrine/DQL/JsonbExistsInArray.php       |  4 +-
 .../Doctrine/DQL/OverlapsI.php                |  8 ++--
 .../Doctrine/DQL/STContains.php               |  4 +-
 .../ChillMainBundle/Doctrine/DQL/STX.php      |  2 +-
 .../ChillMainBundle/Doctrine/DQL/STY.php      |  2 +-
 .../Doctrine/DQL/Similarity.php               |  4 +-
 .../Doctrine/DQL/StrictWordSimilarityOPS.php  |  4 +-
 .../ChillMainBundle/Doctrine/DQL/ToChar.php   |  4 +-
 .../ChillMainBundle/Doctrine/DQL/Unaccent.php |  2 +-
 .../Entity/Embeddable/CommentEmbeddable.php   |  3 +-
 .../Entity/PermissionsGroup.php               |  2 +-
 .../ChillMainBundle/Entity/PostalCode.php     | 15 +++----
 .../ChillMainBundle/Export/ExportManager.php  |  5 +--
 .../Export/Formatter/SpreadSheetFormatter.php |  8 +---
 .../Form/Type/ComposedRoleScopeType.php       |  9 ++--
 .../Form/Type/TranslatableStringFormType.php  |  2 +-
 .../Phonenumber/PhonenumberHelper.php         |  2 +-
 .../ChillMainBundle/Routing/MenuTwig.php      |  7 +--
 .../ChillMainBundle/Search/SearchProvider.php |  6 +--
 .../ChillMainBundle/Security/RoleProvider.php |  6 +--
 .../Templating/Widget/WidgetRenderingTwig.php |  1 -
 .../Test/Export/AbstractExportTest.php        |  8 ----
 .../Tests/Controller/UserControllerTest.php   |  2 +-
 .../Tests/Routing/Loader/RouteLoaderTest.php  |  2 +-
 .../Tests/Search/AbstractSearchTest.php       |  2 +-
 .../Tests/Search/SearchProviderTest.php       |  5 +--
 .../Timeline/TimelineBuilder.php              |  6 +--
 .../ChillMainBundle/Util/CountriesInfo.php    |  2 +-
 .../migrations/Version20150821105642.php      |  7 +--
 .../ORM/LoadAccompanyingPeriodOrigin.php      |  2 +-
 .../DataFixtures/ORM/LoadCustomFields.php     |  4 +-
 .../DataFixtures/ORM/LoadMaritalStatus.php    |  2 +-
 .../DataFixtures/ORM/LoadPeople.php           |  4 +-
 .../DependencyInjection/Configuration.php     |  2 +-
 .../Doctrine/DQL/AddressPart.php              | 10 +----
 .../Entity/AccompanyingPeriod.php             |  6 +--
 .../AccompanyingPeriodWorkGoal.php            |  2 +-
 .../ChillPersonBundle/Entity/Person.php       | 44 +++++++------------
 .../Entity/PersonAltName.php                  |  4 +-
 .../Entity/PersonNotDuplicate.php             | 15 ++-----
 .../Entity/SocialWork/Goal.php                |  2 +-
 .../Entity/SocialWork/SocialAction.php        | 10 ++---
 .../Entity/SocialWork/SocialIssue.php         |  6 +--
 .../Export/Export/ListPerson.php              |  2 +-
 .../Privacy/PrivacyEvent.php                  |  5 +--
 .../Controller/PersonControllerUpdateTest.php | 14 ++----
 ...onControllerUpdateWithHiddenFieldsTest.php | 14 ++----
 .../Controller/PersonControllerViewTest.php   | 12 ++---
 ...rsonControllerViewWithHiddenFieldsTest.php | 12 ++---
 .../Tests/Export/Export/CountPersonTest.php   |  2 +-
 .../migrations/Version20210326113045.php      |  2 +-
 .../DataFixtures/ORM/LoadReports.php          |  7 +--
 .../ChillReportBundle/Entity/Report.php       | 15 +++----
 .../ChillReportBundle/Search/ReportSearch.php |  5 +--
 .../Tests/Controller/ReportControllerTest.php |  5 +--
 .../Tests/Timeline/TimelineProviderTest.php   | 24 ++--------
 .../migrations/Version20150622233319.php      |  5 +--
 .../ChillTaskBundle/Entity/AbstractTask.php   | 24 ++++------
 .../ChillTaskBundle/Entity/RecurringTask.php  |  2 +-
 .../ChillTaskBundle/Entity/SingleTask.php     |  3 +-
 .../Entity/Task/AbstractTaskPlaceEvent.php    | 19 +++-----
 .../ThirdPartyType/ThirdPartyTypeManager.php  |  2 -
 .../migrations/Version20230215175150.php      |  2 +-
 112 files changed, 252 insertions(+), 562 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
index 9f0c59784..b205384e6 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
@@ -25,10 +25,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 {
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
-    /**
-     * @var \Faker\Generator
-     */
-    private $faker;
+    private readonly \Faker\Generator $faker;
 
     public function __construct(private readonly EntityManagerInterface $em)
     {
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
index 1bae408dc..0522d5037 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
@@ -25,10 +25,9 @@ use Doctrine\ORM\Mapping as ORM;
 class ActivityReasonCategory implements \Stringable
 {
     /**
-     * @var bool
      * @ORM\Column(type="boolean")
      */
-    private $active = true;
+    private bool $active = true;
 
     /**
      * @var int
@@ -122,11 +121,9 @@ class ActivityReasonCategory implements \Stringable
      * as unactive, all the reason have this entity as category is also
      * set as unactive.
      *
-     * @param bool $active
-     *
      * @return ActivityReasonCategory
      */
-    public function setActive($active)
+    public function setActive(bool $active)
     {
         if ($this->active !== $active && !$active) {
             foreach ($this->reasons as $reason) {
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
index 3dc205f09..ec318f413 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
@@ -34,7 +34,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime")
      */
-    private $createdAt;
+    private ?\DateTimeInterface $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
@@ -45,7 +45,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime")
      */
-    private $date;
+    private ?\DateTimeInterface $date = null;
 
     /**
      * @ORM\Column(type="time", nullable=true)
@@ -62,23 +62,23 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="string", length=100, nullable=true)
      */
-    private $location;
+    private ?string $location = null;
 
     /**
      * @ORM\Column(type="text", nullable=true)
      */
-    private $note;
+    private ?string $note = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="asideActivities")
      * @ORM\JoinColumn(nullable=false)
      */
-    private $type;
+    private ?\Chill\AsideActivityBundle\Entity\AsideActivityCategory $type = null;
 
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private $updatedAt;
+    private ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
index 5d4a8b3a4..4f057a939 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
@@ -21,12 +21,9 @@ use Symfony\Component\HttpFoundation\Request;
 class ChargeController extends AbstractElementController
 {
     /**
-     * @Route(
-     *     "{_locale}/budget/charge/{id}/delete",
-     *     name="chill_budget_charge_delete"
-     * )
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/charge/{id}/delete", name="chill_budget_charge_delete")
      */
     public function deleteAction(Request $request, Charge $charge)
     {
@@ -39,12 +36,9 @@ class ChargeController extends AbstractElementController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/charge/{id}/edit",
-     *     name="chill_budget_charge_edit"
-     * )
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/charge/{id}/edit", name="chill_budget_charge_edit")
      */
     public function editAction(Request $request, Charge $charge)
     {
@@ -57,12 +51,9 @@ class ChargeController extends AbstractElementController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/charge/by-person/{id}/new",
-     *     name="chill_budget_charge_new"
-     * )
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/charge/by-person/{id}/new", name="chill_budget_charge_new")
      */
     public function newAction(Request $request, Person $person)
     {
@@ -75,12 +66,9 @@ class ChargeController extends AbstractElementController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/charge/by-household/{id}/new",
-     *     name="chill_budget_charge_household_new"
-     * )
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/charge/by-household/{id}/new", name="chill_budget_charge_household_new")
      */
     public function newHouseholdAction(Request $request, Household $household)
     {
@@ -93,12 +81,9 @@ class ChargeController extends AbstractElementController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/charge/{id}/view",
-     *     name="chill_budget_charge_view"
-     * )
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/charge/{id}/view", name="chill_budget_charge_view")
      */
     public function viewAction(Charge $charge)
     {
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
index c949342b9..fdaae0163 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
@@ -36,10 +36,7 @@ class ElementController extends AbstractController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/elements/by-person/{id}",
-     *     name="chill_budget_elements_index"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/elements/by-person/{id}", name="chill_budget_elements_index")
      */
     public function indexAction(Person $person)
     {
@@ -63,10 +60,7 @@ class ElementController extends AbstractController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/elements/by-household/{id}",
-     *     name="chill_budget_elements_household_index"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/elements/by-household/{id}", name="chill_budget_elements_household_index")
      */
     public function indexHouseholdAction(Household $household)
     {
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
index e7f1e9ff3..eb02c3635 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
@@ -22,10 +22,7 @@ use Symfony\Component\HttpFoundation\Response;
 class ResourceController extends AbstractElementController
 {
     /**
-     * @Route(
-     *     "{_locale}/budget/resource/{id}/delete",
-     *     name="chill_budget_resource_delete"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/resource/{id}/delete", name="chill_budget_resource_delete")
      */
     public function deleteAction(Request $request, Resource $resource)
     {
@@ -38,10 +35,7 @@ class ResourceController extends AbstractElementController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/resource/{id}/edit",
-     *     name="chill_budget_resource_edit"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/resource/{id}/edit", name="chill_budget_resource_edit")
      */
     public function editAction(Request $request, Resource $resource): Response
     {
@@ -56,10 +50,7 @@ class ResourceController extends AbstractElementController
     /**
      * Create a new budget element for a person.
      *
-     * @Route(
-     *     "{_locale}/budget/resource/by-person/{id}/new",
-     *     name="chill_budget_resource_new"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/resource/by-person/{id}/new", name="chill_budget_resource_new")
      */
     public function newAction(Request $request, Person $person): Response
     {
@@ -74,10 +65,7 @@ class ResourceController extends AbstractElementController
     /**
      * Create new budget element for a household.
      *
-     * @Route(
-     *     "{_locale}/budget/resource/by-household/{id}/new",
-     *     name="chill_budget_resource_household_new"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/resource/by-household/{id}/new", name="chill_budget_resource_household_new")
      */
     public function newHouseholdAction(Request $request, Household $household): Response
     {
@@ -90,10 +78,7 @@ class ResourceController extends AbstractElementController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/resource/{id}/view",
-     *     name="chill_budget_resource_view"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/resource/{id}/view", name="chill_budget_resource_view")
      */
     public function viewAction(Resource $resource): Response
     {
diff --git a/src/Bundle/ChillBudgetBundle/Entity/Charge.php b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
index 50602e849..6040cb328 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/Charge.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
@@ -46,10 +46,9 @@ class Charge extends AbstractElement implements HasCentersInterface
     private ?ChargeKind $charge = null;
 
     /**
-     * @var string
      * @ORM\Column(name="help", type="string", nullable=true)
      */
-    private $help = self::HELP_NOT_RELEVANT;
+    private string $help = self::HELP_NOT_RELEVANT;
 
     /**
      * @ORM\Column(name="id", type="integer")
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
index 3c4d80c94..c8be951fe 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
@@ -29,12 +29,12 @@ class CancelReason
     /**
      * @ORM\Column(type="boolean")
      */
-    private $active;
+    private ?bool $active = null;
 
     /**
      * @ORM\Column(type="string", length=255)
      */
-    private $canceledBy;
+    private ?string $canceledBy = null;
 
     /**
      * @ORM\Id
@@ -46,7 +46,7 @@ class CancelReason
     /**
      * @ORM\Column(type="json")
      */
-    private $name = [];
+    private array $name = [];
 
     public function getActive(): ?bool
     {
diff --git a/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php b/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
index 5b2598ab7..8b827b535 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
@@ -37,7 +37,7 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
      */
     public $fakerNl;
 
-    private $counter = 0;
+    private int $counter = 0;
 
     public function __construct()
     {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
index 06aeb9f4f..4c466d20e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
@@ -27,20 +27,16 @@ class CustomField
     final public const ONE_TO_ONE = 1;
 
     /**
-     * @var bool
-     *
      * @ORM\Column(type="boolean")
      */
-    private $active = true;
+    private bool $active = true;
 
     /**
-     * @var CustomFieldsGroup
-     *
      * @ORM\ManyToOne(
      *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldsGroup",
      * inversedBy="customFields")
      */
-    private $customFieldGroup;
+    private ?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup $customFieldGroup = null;
 
     /**
      * @var int
@@ -59,11 +55,9 @@ class CustomField
     private $name;
 
     /**
-     * @var array
-     *
      * @ORM\Column(type="json")
      */
-    private $options = [];
+    private array $options = [];
 
     /**
      * @var float
@@ -73,11 +67,9 @@ class CustomField
     private $ordering;
 
     /**
-     * @var bool
-     *
      * @ORM\Column(type="boolean")
      */
-    private $required = false;
+    private false $required = false;
 
     /**
      * @var string
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
index 39eb7a153..92d228659 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
@@ -22,10 +23,9 @@ use Doctrine\ORM\Mapping as ORM;
 class Option
 {
     /**
-     * @var bool
      * @ORM\Column(type="boolean")
      */
-    private $active = true;
+    private bool $active = true;
 
     /**
      * @var Collection<Option>
@@ -45,33 +45,34 @@ class Option
     private $id;
 
     /**
-     * @var string
      * @ORM\Column(type="string", length=50, name="internal_key")
      */
-    private $internalKey = '';
+    private string $internalKey = '';
 
     /**
-     * @var string
      * @ORM\Column(type="string", length=15)
      */
-    private $key;
+    private ?string $key = null;
 
     /**
-     * @var Option
      * @ORM\ManyToOne(
      *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option",
      * inversedBy="children")
      * @ORM\JoinColumn(nullable=true)
      */
-    private $parent;
+    private ?\Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option $parent = null;
 
     /**
      * A json representation of text (multilingual).
      *
-     * @var array
      * @ORM\Column(type="json")
      */
-    private $text;
+    private ?array $text = null;
+
+    public function __construct()
+    {
+        $this->children = new ArrayCollection();
+    }
 
     /**
      * @return bool
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
index 033dfd20e..5cc58253c 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
@@ -26,10 +26,8 @@ class CustomFieldsGroup
     /**
      * The custom fields of the group that are active.
      * This variable if null, if this informations has not been computed.
-     *
-     * @var array|null
      */
-    private $activeCustomFields;
+    private ?array $activeCustomFields = null;
 
     /**
      * The custom fields of the group.
@@ -67,11 +65,9 @@ class CustomFieldsGroup
     private $name;
 
     /**
-     * @var array
-     *
      * @ORM\Column(type="json")
      */
-    private $options = [];
+    private array $options = [];
 
     /**
      * CustomFieldsGroup constructor.
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
index d6cf62393..ffb22f87e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
@@ -22,7 +22,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
  */
 class ChoiceWithOtherType extends AbstractType
 {
-    private $otherValueLabel = 'Other value';
+    private string $otherValueLabel = 'Other value';
 
     /** (non-PHPdoc).
      * @see \Symfony\Component\Form\AbstractType::buildForm()
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
index bd75e58b4..660270a8a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
@@ -32,19 +32,15 @@ class LinkedCustomFieldsType extends AbstractType
      * The name for the choice field.
      *
      * Extracted from builder::getName
-     *
-     * @var string
      */
-    private $choiceName = 'choice';
+    private string $choiceName = 'choice';
 
     /**
      * the option of the form.
      *
      * @internal options are stored at the class level to be reused by appendChoice, after data are setted
-     *
-     * @var array
      */
-    private $options = [];
+    private array $options = [];
 
     public function __construct(private readonly TranslatableStringHelper $translatableStringHelper)
     {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
index 30198f1a2..1f115d675 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
@@ -39,7 +39,7 @@ class CustomFieldProvider implements ContainerAwareInterface
     /**
      * @var array The services indexes by the type
      */
-    private $servicesByType = [];
+    private array $servicesByType = [];
 
     /**
      * Add a new custom field to the provider.
diff --git a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
index a7949de25..65344381a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
@@ -26,15 +26,12 @@ use Twig\TwigFunction;
  */
 class CustomFieldRenderingTwig extends AbstractExtension implements ContainerAwareInterface
 {
-    /**
-     * @var Container The container
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     /**
      * @var array The default parameters
      */
-    private $defaultParams = [
+    private array $defaultParams = [
         'label_layout' => 'ChillCustomFieldsBundle:CustomField:render_label.html.twig',
     ];
 
diff --git a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
index cf6a55604..545340c4f 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
@@ -24,15 +24,12 @@ use Twig\TwigFunction;
  */
 class CustomFieldsGroupRenderingTwig extends AbstractExtension implements ContainerAwareInterface
 {
-    /**
-     * @var Container The container
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     /**
      * @var array The default parameters
      */
-    private $defaultParams = [
+    private array $defaultParams = [
         'layout' => 'ChillCustomFieldsBundle:CustomFieldsGroup:render.html.twig',
         'show_empty' => true,
     ];
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
index 68c41aded..cebff56ab 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
@@ -32,10 +32,7 @@ final class CustomFieldsChoiceTest extends KernelTestCase
      */
     private $cfChoice;
 
-    /**
-     * @var \Chill\CustomFieldsBundle\Service\CustomFieldProvider
-     */
-    private $cfProvider;
+    private ?object $cfProvider = null;
 
     protected function setUp(): void
     {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
index 6fb81af49..3dfaf7ac0 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
@@ -24,10 +24,7 @@ use function count;
  */
 final class CustomFieldsNumberTest extends \Symfony\Bundle\FrameworkBundle\Test\WebTestCase
 {
-    /**
-     * @var CustomFieldNumber
-     */
-    private $customFieldNumber;
+    private ?object $customFieldNumber = null;
 
     /**
      * @var FormBuilderInterface
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
index 6bfe2663c..e13dcba44 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
@@ -24,10 +24,7 @@ final class CustomFieldsTextTest extends WebTestCase
 {
     use CustomFieldTestHelper;
 
-    /**
-     * @var \Chill\CustomFieldsBundle\Service\CustomFieldProvider
-     */
-    private $customFieldProvider;
+    private ?object $customFieldProvider = null;
 
     protected function setUp(): void
     {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
index 186c8ce67..f97d66e13 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
@@ -23,15 +23,9 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  */
 final class CustomFieldsHelperTest extends KernelTestCase
 {
-    /**
-     * @var CustomFieldsHelper
-     */
-    private $cfHelper;
+    private ?object $cfHelper = null;
 
-    /**
-     * @var CustomField
-     */
-    private $randomCFText;
+    private \Chill\CustomFieldsBundle\Entity\CustomField $randomCFText;
 
     protected function setUp(): void
     {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
index 2e29d988b..6353467ff 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
@@ -24,15 +24,9 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  */
 final class CustomFieldRenderingTwigTest extends KernelTestCase
 {
-    /**
-     * @var CustomFieldProvider
-     */
-    private $cfProvider;
+    private ?object $cfProvider = null;
 
-    /**
-     * @var CustomFieldRenderingTwig
-     */
-    private $cfRendering;
+    private ?object $cfRendering = null;
 
     protected function setUp(): void
     {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
index e9c461e06..f01e9d4f8 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
@@ -26,15 +26,9 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  */
 final class CustomFieldsGroupRenderingTwigTest extends KernelTestCase
 {
-    /**
-     * @var CustomFieldProvider
-     */
-    private $cfProvider;
+    private ?object $cfProvider = null;
 
-    /**
-     * @var CustomFieldsGroupRenderingTwig
-     */
-    private $cfRendering;
+    private ?object $cfRendering = null;
 
     protected function setUp(): void
     {
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
index 0b898d59c..63dde7149 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
@@ -19,7 +19,7 @@ use function is_array;
 
 class NormalizeNullValueHelper
 {
-    public function __construct(private readonly NormalizerInterface $normalizer, private ?string $discriminatorType = null, private readonly ?string $discriminatorValue = null)
+    public function __construct(private readonly NormalizerInterface $normalizer, private readonly ?string $discriminatorType = null, private readonly ?string $discriminatorValue = null)
     {
     }
 
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/Document.php b/src/Bundle/ChillDocStoreBundle/Entity/Document.php
index 2345aef61..fa2909af1 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/Document.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/Document.php
@@ -37,17 +37,17 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
      *     @ORM\JoinColumn(name="category_id_inside_bundle", referencedColumnName="id_inside_bundle")
      * })
      */
-    private $category;
+    private ?\Chill\DocStoreBundle\Entity\DocumentCategory $category = null;
 
     /**
      * @ORM\Column(type="datetime")
      */
-    private $date;
+    private ?\DateTimeInterface $date = null;
 
     /**
      * @ORM\Column(type="text")
      */
-    private $description = '';
+    private string $description = '';
 
     /**
      * @ORM\Id
@@ -66,12 +66,12 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
      *     message="Upload a document"
      * )
      */
-    private $object;
+    private ?\Chill\DocStoreBundle\Entity\StoredObject $object = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate")
      */
-    private $template;
+    private ?\Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate $template = null;
 
     /**
      * @ORM\Column(type="text")
@@ -79,7 +79,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
      *     min=2, max=250
      * )
      */
-    private $title;
+    private ?string $title = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
diff --git a/src/Bundle/ChillEventBundle/Entity/Event.php b/src/Bundle/ChillEventBundle/Entity/Event.php
index c23afcba6..be1ceffeb 100644
--- a/src/Bundle/ChillEventBundle/Entity/Event.php
+++ b/src/Bundle/ChillEventBundle/Entity/Event.php
@@ -33,22 +33,19 @@ use Traversable;
 class Event implements HasCenterInterface, HasScopeInterface
 {
     /**
-     * @var Center
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
      */
-    private $center;
+    private ?\Chill\MainBundle\Entity\Center $center = null;
 
     /**
-     * @var Scope
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
      */
-    private $circle;
+    private ?\Chill\MainBundle\Entity\Scope $circle = null;
 
     /**
-     * @var DateTime
      * @ORM\Column(type="datetime")
      */
-    private $date;
+    private ?\DateTime $date = null;
 
     /**
      * @var int
@@ -80,10 +77,9 @@ class Event implements HasCenterInterface, HasScopeInterface
     private Collection $participations;
 
     /**
-     * @var EventType
      * @ORM\ManyToOne(targetEntity="Chill\EventBundle\Entity\EventType")
      */
-    private $type;
+    private ?\Chill\EventBundle\Entity\EventType $type = null;
 
     /**
      * Event constructor.
diff --git a/src/Bundle/ChillEventBundle/Entity/Participation.php b/src/Bundle/ChillEventBundle/Entity/Participation.php
index cb63327a6..d7d3ab399 100644
--- a/src/Bundle/ChillEventBundle/Entity/Participation.php
+++ b/src/Bundle/ChillEventBundle/Entity/Participation.php
@@ -35,12 +35,11 @@ use function in_array;
 class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterface
 {
     /**
-     * @var Event
      * @ORM\ManyToOne(
      *     targetEntity="Chill\EventBundle\Entity\Event",
      * inversedBy="participations")
      */
-    private $event;
+    private ?\Chill\EventBundle\Entity\Event $event = null;
 
     /**
      * @var int
@@ -52,28 +51,24 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     private $id;
 
     /**
-     * @var DateTime
      * @ORM\Column(type="datetime")
      */
-    private $lastUpdate;
+    private ?\DateTime $lastUpdate = null;
 
     /**
-     * @var Person
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
-     * @var Role
      * @ORM\ManyToOne(targetEntity="Chill\EventBundle\Entity\Role")
      */
-    private $role;
+    private ?\Chill\EventBundle\Entity\Role $role = null;
 
     /**
-     * @var Status
      * @ORM\ManyToOne(targetEntity="Chill\EventBundle\Entity\Status")
      */
-    private $status;
+    private ?\Chill\EventBundle\Entity\Status $status = null;
 
     /**
      * @return Center
diff --git a/src/Bundle/ChillEventBundle/Entity/Role.php b/src/Bundle/ChillEventBundle/Entity/Role.php
index b508cda43..878065261 100644
--- a/src/Bundle/ChillEventBundle/Entity/Role.php
+++ b/src/Bundle/ChillEventBundle/Entity/Role.php
@@ -44,12 +44,11 @@ class Role
     private $name;
 
     /**
-     * @var EventType
      * @ORM\ManyToOne(
      *     targetEntity="Chill\EventBundle\Entity\EventType",
      * inversedBy="roles")
      */
-    private $type;
+    private ?\Chill\EventBundle\Entity\EventType $type = null;
 
     /**
      * Get active.
diff --git a/src/Bundle/ChillEventBundle/Entity/Status.php b/src/Bundle/ChillEventBundle/Entity/Status.php
index c0955fd41..b6a987429 100644
--- a/src/Bundle/ChillEventBundle/Entity/Status.php
+++ b/src/Bundle/ChillEventBundle/Entity/Status.php
@@ -44,12 +44,11 @@ class Status
     private $name;
 
     /**
-     * @var EventType
      * @ORM\ManyToOne(
      *     targetEntity="Chill\EventBundle\Entity\EventType",
      * inversedBy="statuses")
      */
-    private $type;
+    private ?\Chill\EventBundle\Entity\EventType $type = null;
 
     /**
      * Get active.
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
index a4b6b2ca3..7de774e92 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
@@ -42,7 +42,7 @@ final class ParticipationControllerTest extends WebTestCase
      *
      * @var int[]
      */
-    private $personsIdsCache = [];
+    private array $personsIdsCache = [];
 
     protected function setUp(): void
     {
diff --git a/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php b/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
index 2d8ff8040..2ba3a1b62 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
@@ -38,10 +38,9 @@ abstract class AbstractFamilyMember implements HasCenterInterface
      * @ORM\Column(name="birthdate", type="date_immutable", nullable=true)
      * @Assert\Date
      */
-    private $birthdate;
+    private ?\DateTimeImmutable $birthdate = null;
 
     /**
-     * @var DateTimeImmutable|null
      *
      * @ORM\Column(name="endDate", type="datetime_immutable", nullable=true)
      * @Assert\Date
@@ -50,7 +49,7 @@ abstract class AbstractFamilyMember implements HasCenterInterface
      *     message="The membership's end date should be after the start date"
      * )
      */
-    private $endDate;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @var string
@@ -59,64 +58,51 @@ abstract class AbstractFamilyMember implements HasCenterInterface
     private $familialSituation;
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="firstname", type="string", length=255)
      */
-    private $firstname = '';
+    private string $firstname = '';
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="gender", type="string", length=20)
      */
-    private $gender = '';
+    private string $gender = '';
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="lastname", type="string", length=255)
      */
-    private $lastname = '';
+    private string $lastname = '';
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="link", type="string", length=255)
      */
-    private $link = '';
+    private string $link = '';
 
     /**
-     * @var MaritalStatus
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\PersonBundle\Entity\MaritalStatus"
      * )
      */
-    private $maritalStatus;
+    private ?\Chill\PersonBundle\Entity\MaritalStatus $maritalStatus = null;
 
     /**
-     * @var Person
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\PersonBundle\Entity\Person"
      * )
      */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="professionnalSituation", type="text")
      */
-    private $professionnalSituation = '';
+    private string $professionnalSituation = '';
 
     /**
-     * @var DateTimeImmutable
      *
      * @ORM\Column(name="startDate", type="datetime_immutable")
      * @Assert\NotNull
      * @Assert\Date
      */
-    private $startDate;
+    private ?\DateTimeImmutable $startDate = null;
 
     public function __construct()
     {
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
index 56d62bb8a..81e138c44 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
@@ -129,8 +129,6 @@ abstract class AbstractCRUDController extends AbstractController
      *
      * By default, count all entities. You can customize the query by
      * using the method `customizeQuery`.
-     *
-     * @param mixed $_format
      */
     protected function countEntities(string $action, Request $request, mixed $_format): int
     {
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
index 41a37d7ca..1209a8f07 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
@@ -218,7 +218,6 @@ class ApiController extends AbstractCRUDController
      * @param string $postedDataType the type of the posted data (the content)
      * @param string $postedDataContext a context to deserialize posted data (the content)
      * @param bool $forcePersist force to persist the created element (only for POST request)
-     * @param mixed $id
      * @throw BadRequestException if unable to deserialize the posted data
      * @throw BadRequestException if the method is not POST or DELETE
      */
@@ -337,9 +336,6 @@ class ApiController extends AbstractCRUDController
      * 4.  launch `onPostCheckACL`. If the result is an instance of Response,
      *     this response is returned ;
      * 5.  Serialize the entity and return the result. The serialization context is given by `getSerializationContext`
-     *
-     * @param mixed $id
-     * @param mixed $_format
      */
     protected function entityGet(string $action, Request $request, mixed $id, mixed $_format = 'html'): Response
     {
@@ -451,8 +447,6 @@ class ApiController extends AbstractCRUDController
      * PATCH, PUT, or POST method).
      *
      * This is called **after** the entity was altered.
-     *
-     * @param mixed $entity
      */
     protected function getContextForSerializationPostAlter(string $action, Request $request, string $_format, mixed $entity, array $more = []): array
     {
@@ -489,7 +483,6 @@ class ApiController extends AbstractCRUDController
      * 4.  Serialize the entities in a Collection, using `SerializeCollection`
      *
      * @param string $action
-     * @param mixed $_format
      */
     protected function indexApiAction($action, Request $request, mixed $_format)
     {
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index 4f7f3b5f9..f9491d800 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -59,8 +59,6 @@ class CRUDController extends AbstractController
      * BAse method for edit action.
      *
      * IMplemented by the method formEditAction, with action as 'edit'
-     *
-     * @param mixed $id
      */
     public function edit(Request $request, mixed $id): Response
     {
@@ -120,8 +118,6 @@ class CRUDController extends AbstractController
      * Base method for the view action.
      *
      * Implemented by the method viewAction, with action as 'view'
-     *
-     * @param mixed $id
      */
     public function view(Request $request, mixed $id): Response
     {
@@ -182,7 +178,6 @@ class CRUDController extends AbstractController
      * Throw an \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
      * if not accessible.
      *
-     * @param mixed $entity
      *
      * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
      */
@@ -223,7 +218,6 @@ class CRUDController extends AbstractController
      * It is preferable to override customizeForm instead of overriding
      * this method.
      *
-     * @param mixed $entity
      * @param string $formClass
      */
     protected function createFormFor(string $action, mixed $entity, ?string $formClass = null, array $formOptions = []): FormInterface
@@ -484,9 +478,7 @@ class CRUDController extends AbstractController
      * 6.  Launch rendering, the parameter is fetch using `getTemplateFor`
      *     The parameters may be personnalized using `generateTemplateParameter`.
      *
-     * @param mixed $id
      * @param string $formClass
-     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
     protected function formEditAction(string $action, Request $request, mixed $id, ?string $formClass = null, array $formOptions = []): Response
@@ -877,7 +869,6 @@ class CRUDController extends AbstractController
      * * save-and-new: return to new page of current crud ;
      * * save-and-view: return to view page of current crud ;
      *
-     * @param mixed $entity
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -1050,9 +1041,6 @@ class CRUDController extends AbstractController
      *     * `crud_name`: the crud name
      * 6.  Launch rendering, the parameter is fetch using `getTemplateFor`
      *     The parameters may be personnalized using `generateTemplateParameter`.
-     *
-     * @param mixed $id
-     * @param mixed $_format
      */
     protected function viewAction(string $action, Request $request, mixed $id, mixed $_format = 'html'): Response
     {
diff --git a/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php b/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
index cb99db829..d6516c983 100644
--- a/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
@@ -64,17 +64,13 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
 
     /**
      * The current input interface.
-     *
-     * @var InputInterface
      */
-    private $input;
+    private ?\Symfony\Component\Console\Input\InputInterface $input = null;
 
     /**
      * The current output interface.
-     *
-     * @var OutputInterface
      */
-    private $output;
+    private ?\Symfony\Component\Console\Output\OutputInterface $output = null;
 
     public function __construct(
         LoggerInterface $logger,
diff --git a/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
index ffdded2df..5b86b8c9b 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
@@ -31,12 +31,12 @@ class LoadAndUpdateLanguagesCommand extends Command
     final public const INCLUDE_REGIONAL_VERSION = 'include_regional';
 
     // Array of ancien languages (to exclude)
-    private $ancientToExclude = ['ang', 'egy', 'fro', 'goh', 'grc', 'la', 'non', 'peo', 'pro', 'sga',
+    private array $ancientToExclude = ['ang', 'egy', 'fro', 'goh', 'grc', 'la', 'non', 'peo', 'pro', 'sga',
         'dum', 'enm', 'frm', 'gmh', 'mga', 'akk', 'phn', 'zxx', 'got', 'und', ];
 
     // The regional version of language are language with _ in the code
     // This array contains regional code to not exclude
-    private $regionalVersionToInclude = ['ro_MD'];
+    private array $regionalVersionToInclude = ['ro_MD'];
 
     /**
      * LoadCountriesCommand constructor.
@@ -84,7 +84,6 @@ class LoadAndUpdateLanguagesCommand extends Command
     {
         $em = $this->entityManager;
         $chillAvailableLanguages = $this->availableLanguages;
-        $languageBundle = Intl::getLanguageBundle();
         $languages = [];
 
         foreach ($chillAvailableLanguages as $avLang) {
@@ -125,7 +124,7 @@ class LoadAndUpdateLanguagesCommand extends Command
                 if ($langageDB) {
                     $em->remove($langageDB);
                 }
-                echo 'Code excluded : ' . $code . ' - ' . \Symfony\Component\Intl\Languages::getName() . "\n";
+                echo 'Code excluded : ' . $code . ' - ' . \Symfony\Component\Intl\Languages::getName('en_GB') . "\n";
             }
         }
 
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
index 0fef33c2f..58971b9e9 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
@@ -26,10 +26,7 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
 {
     protected $faker;
 
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     public function __construct()
     {
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
index 8f3ad0bca..05add5d76 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
@@ -23,10 +23,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class LoadCountries extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     public function getOrder()
     {
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
index ac6c3602d..7b605a0ae 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
@@ -27,17 +27,14 @@ use function in_array;
 class LoadLanguages extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
 {
     // Array of ancien languages (to exclude)
-    private $ancientToExclude = ['ang', 'egy', 'fro', 'goh', 'grc', 'la', 'non', 'peo', 'pro', 'sga',
+    private array $ancientToExclude = ['ang', 'egy', 'fro', 'goh', 'grc', 'la', 'non', 'peo', 'pro', 'sga',
         'dum', 'enm', 'frm', 'gmh', 'mga', 'akk', 'phn', 'zxx', 'got', 'und', ];
 
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     // The regional version of language are language with _ in the code
     // This array contains regional code to not exclude
-    private $regionalVersionToInclude = ['ro_MD'];
+    private array $regionalVersionToInclude = ['ro_MD'];
 
     public function getOrder()
     {
@@ -78,7 +75,7 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface,
         $names = [];
 
         foreach ($this->container->getParameter('chill_main.available_languages') as $lang) {
-            $names[$lang] = \Symfony\Component\Intl\Languages::getName();
+            $names[$lang] = \Symfony\Component\Intl\Languages::getName('en_GB');
         }
 
         return $names;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
index 37a3b605f..d97a484d7 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
@@ -23,10 +23,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class LoadLocationType extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     public function getOrder()
     {
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
index b9eaf58ec..6c23e7ec9 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
@@ -28,7 +28,7 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface
 {
     public static $refs = [];
 
-    private static $postalCodeBelgium = <<<'EOF'
+    private static string $postalCodeBelgium = <<<'EOF'
         1000,BRUXELLES,BE
         1020,BRUXELLES,BE
         1030,SCHAERBEEK,BE
@@ -63,7 +63,7 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface
         1320,BEAUVECHAIN,BE
         EOF;
 
-    private static $postalCodeFrance = <<<'EOF'
+    private static string $postalCodeFrance = <<<'EOF'
         85000,LA ROCHE SUR YON,FR,85191,46.6675261644,-1.4077954093,INSEE
         85000,MOUILLERON LE CAPTIF,FR,85155,46.7104764993,-1.46129661418,INSEE
         85100,LES SABLES D OLONNE,FR,85194,46.5007612799,-1.79255128677,INSEE
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
index 8b6862364..ad865ca14 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
@@ -56,10 +56,7 @@ class LoadUsers extends AbstractFixture implements ContainerAwareInterface, Orde
         ],
     ];
 
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     public function getOrder()
     {
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
index 70a3e2ea1..a0c9912cf 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
@@ -109,17 +109,15 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
      * cache of ordering by place.
      *
      * @internal used by function cacheAndGetOrdering
-     *
-     * @var array
      */
-    private $cacheOrdering = [];
+    private array $cacheOrdering = [];
 
     /**
      * @var WidgetFactoryInterface[]
      */
-    private $widgetFactories;
+    private ?array $widgetFactories = null;
 
-    private $widgetServices = [];
+    private array $widgetServices = [];
 
     /**
      * process the configuration and the container to add the widget available.
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Age.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Age.php
index ad148fe99..4ae7ab942 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Age.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Age.php
@@ -18,9 +18,9 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class Age extends FunctionNode
 {
-    private $value1;
+    private \Doctrine\ORM\Query\AST\ArithmeticTerm|\Doctrine\ORM\Query\AST\SimpleArithmeticExpression|null $value1 = null;
 
-    private $value2;
+    private \Doctrine\ORM\Query\AST\ArithmeticTerm|\Doctrine\ORM\Query\AST\SimpleArithmeticExpression|null $value2 = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php
index e224c2a0c..a63f04164 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php
@@ -29,7 +29,7 @@ class Extract extends FunctionNode
 {
     private string $field;
 
-    private $value;
+    private \Doctrine\ORM\Query\AST\Node|string|null $value = null;
     //private PathExpression $value;
     //private FunctionNode $value;
     //private DateDiffFunction $value;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php
index 69b26e982..94d2da2e8 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php
@@ -18,9 +18,9 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class GetJsonFieldByKey extends FunctionNode
 {
-    private $expr1;
+    private ?\Doctrine\ORM\Query\AST\Node $expr1 = null;
 
-    private $expr2;
+    private ?\Doctrine\ORM\Query\AST\Node $expr2 = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php
index c9a138c20..03809572d 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php
@@ -24,7 +24,7 @@ use Doctrine\ORM\Query\SqlWalker;
  */
 class JsonAggregate extends FunctionNode
 {
-    private $expr;
+    private ?\Doctrine\ORM\Query\AST\Node $expr = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonExtract.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonExtract.php
index 9f93c437e..95d851790 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonExtract.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonExtract.php
@@ -18,9 +18,9 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class JsonExtract extends FunctionNode
 {
-    private $element;
+    private \Doctrine\ORM\Query\AST\Node|string|null $element = null;
 
-    private $keyToExtract;
+    private ?\Doctrine\ORM\Query\AST\ArithmeticExpression $keyToExtract = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php
index 2fc7c7e17..4b3b75dfd 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php
@@ -21,7 +21,7 @@ use Doctrine\ORM\Query\SqlWalker;
  */
 class JsonbArrayLength extends FunctionNode
 {
-    private $expr1;
+    private ?\Doctrine\ORM\Query\AST\Node $expr1 = null;
 
     public function getSql(SqlWalker $sqlWalker): string
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php
index 1556753b6..6ca3da89c 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php
@@ -18,9 +18,9 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class JsonbExistsInArray extends FunctionNode
 {
-    private $expr1;
+    private ?\Doctrine\ORM\Query\AST\Node $expr1 = null;
 
-    private $expr2;
+    private ?\Doctrine\ORM\Query\AST\InputParameter $expr2 = null;
 
     public function getSql(SqlWalker $sqlWalker): string
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
index a1063d4fd..3b868d522 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
@@ -25,13 +25,13 @@ use Exception;
  */
 class OverlapsI extends FunctionNode
 {
-    private $firstPeriodEnd;
+    private ?\Doctrine\ORM\Query\AST\Node $firstPeriodEnd = null;
 
-    private $firstPeriodStart;
+    private ?\Doctrine\ORM\Query\AST\Node $firstPeriodStart = null;
 
-    private $secondPeriodEnd;
+    private ?\Doctrine\ORM\Query\AST\Node $secondPeriodEnd = null;
 
-    private $secondPeriodStart;
+    private ?\Doctrine\ORM\Query\AST\Node $secondPeriodStart = null;
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
index d4dbd7c23..e1e81a799 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
@@ -19,9 +19,9 @@ use Doctrine\ORM\Query\Lexer;
  */
 class STContains extends FunctionNode
 {
-    private $firstPart;
+    private ?\Doctrine\ORM\Query\AST\Node $firstPart = null;
 
-    private $secondPart;
+    private ?\Doctrine\ORM\Query\AST\Node $secondPart = null;
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/STX.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/STX.php
index d5d8d0a3f..2841bb729 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/STX.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/STX.php
@@ -18,7 +18,7 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class STX extends FunctionNode
 {
-    private $field;
+    private ?\Doctrine\ORM\Query\AST\ArithmeticExpression $field = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/STY.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/STY.php
index e827da543..9457a9357 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/STY.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/STY.php
@@ -18,7 +18,7 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class STY extends FunctionNode
 {
-    private $field;
+    private ?\Doctrine\ORM\Query\AST\ArithmeticExpression $field = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
index e8b2bff1e..e539749ec 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
@@ -16,9 +16,9 @@ use Doctrine\ORM\Query\Lexer;
 
 class Similarity extends FunctionNode
 {
-    private $firstPart;
+    private ?\Doctrine\ORM\Query\AST\Node $firstPart = null;
 
-    private $secondPart;
+    private ?\Doctrine\ORM\Query\AST\Node $secondPart = null;
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
index a45338563..b5b01e307 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
@@ -17,9 +17,9 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class StrictWordSimilarityOPS extends \Doctrine\ORM\Query\AST\Functions\FunctionNode
 {
-    private $firstPart;
+    private ?\Doctrine\ORM\Query\AST\Node $firstPart = null;
 
-    private $secondPart;
+    private ?\Doctrine\ORM\Query\AST\Node $secondPart = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php
index 948136637..ef150867e 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php
@@ -21,9 +21,9 @@ use Doctrine\ORM\Query\SqlWalker;
  */
 class ToChar extends FunctionNode
 {
-    private $datetime;
+    private ?\Doctrine\ORM\Query\AST\ArithmeticExpression $datetime = null;
 
-    private $fmt;
+    private \Doctrine\ORM\Query\AST\Node|string|null $fmt = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
index 552f1e557..03d7145e0 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
@@ -22,7 +22,7 @@ use Doctrine\ORM\Query\Lexer;
  */
 class Unaccent extends FunctionNode
 {
-    private $string;
+    private ?\Doctrine\ORM\Query\AST\Node $string = null;
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
index f404d5931..5bc60f2a5 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
@@ -25,10 +25,9 @@ class CommentEmbeddable
     private ?string $comment = null;
 
     /**
-     * @var DateTime
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private $date;
+    private ?\DateTime $date = null;
 
     /**
      * Embeddable does not support associations.
diff --git a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
index 336de9797..a834d4f37 100644
--- a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
+++ b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
@@ -29,7 +29,7 @@ class PermissionsGroup
      *
      * @ORM\Column(type="json")
      */
-    private $flags = [];
+    private array $flags = [];
 
     /**
      * @var Collection<GroupCenter>
diff --git a/src/Bundle/ChillMainBundle/Entity/PostalCode.php b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
index d016f7bc6..57880cb67 100644
--- a/src/Bundle/ChillMainBundle/Entity/PostalCode.php
+++ b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
@@ -53,12 +53,11 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface
     private string $canonical = '';
 
     /**
-     * @var Point
      *
      * @ORM\Column(type="point", nullable=true)
      * @groups({"read"})
      */
-    private $center;
+    private ?\Chill\MainBundle\Doctrine\Model\Point $center = null;
 
     /**
      * @var string
@@ -69,12 +68,11 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface
     private $code;
 
     /**
-     * @var Country
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Country")
      * @groups({"write", "read"})
      */
-    private $country;
+    private ?\Chill\MainBundle\Entity\Country $country = null;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null})
@@ -100,28 +98,25 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface
     private $name;
 
     /**
-     * @var int
      *
      * @ORM\Column(name="origin", type="integer", nullable=true)
      * @groups({"write", "read"})
      */
-    private $origin = 0;
+    private int $origin = 0;
 
     /**
-     * @var string
      *
      * @ORM\Column(type="string", length=255, nullable=true)
      * @groups({"read"})
      */
-    private $postalCodeSource;
+    private ?string $postalCodeSource = null;
 
     /**
-     * @var string
      *
      * @ORM\Column(type="string", length=255, nullable=true)
      * @groups({"read"})
      */
-    private $refPostalCodeId;
+    private ?string $refPostalCodeId = null;
 
     public function getCenter(): ?Point
     {
diff --git a/src/Bundle/ChillMainBundle/Export/ExportManager.php b/src/Bundle/ChillMainBundle/Export/ExportManager.php
index 71ad6fa06..cebe04157 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportManager.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportManager.php
@@ -64,10 +64,7 @@ class ExportManager
      */
     private array $formatters = [];
 
-    /**
-     * @var \Symfony\Component\Security\Core\User\UserInterface
-     */
-    private $user;
+    private readonly string|\Stringable|\Symfony\Component\Security\Core\User\UserInterface $user;
 
     public function __construct(
         private readonly LoggerInterface $logger,
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
index 3d5bb0535..bdb76b8a8 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
@@ -126,17 +126,13 @@ class SpreadSheetFormatter implements FormatterInterface
      * The array's keys are the keys in the raw result, and
      * values are the callable which will transform the raw result to
      * displayable result.
-     *
-     * @var array
      */
-    private $cacheDisplayableResult;
+    private ?array $cacheDisplayableResult = null;
 
     /**
      * Whethe `cacheDisplayableResult` is initialized or not.
-     *
-     * @var bool
      */
-    private $cacheDisplayableResultIsInitialized = false;
+    private bool $cacheDisplayableResultIsInitialized = false;
 
     public function __construct(TranslatorInterface $translatorInterface, ExportManager $exportManager)
     {
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
index 4b9b95031..ee18e7771 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
@@ -28,20 +28,17 @@ use function in_array;
  */
 class ComposedRoleScopeType extends AbstractType
 {
-    /**
-     * @var RoleProvider
-     */
-    private $roleProvider;
+    private readonly \Chill\MainBundle\Security\RoleProvider $roleProvider;
 
     /**
      * @var string[]
      */
-    private $roles = [];
+    private array $roles = [];
 
     /**
      * @var string[]
      */
-    private $rolesWithoutScope = [];
+    private array $rolesWithoutScope = [];
 
     public function __construct(
         private readonly TranslatableStringHelper $translatableStringHelper,
diff --git a/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php b/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
index 118b91226..a0223b823 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
@@ -26,7 +26,7 @@ class TranslatableStringFormType extends AbstractType
 {
     // The langauges availaible
 
-    private $frameworkTranslatorFallback; // The langagues used for the translation
+    private readonly array $frameworkTranslatorFallback; // The langagues used for the translation
 
     public function __construct(private readonly array $availableLanguages, Translator $translator)
     {
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
index 27bd7051d..bb2e354ee 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
@@ -190,7 +190,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
                     'Type' => 'carrier',
                 ],
             ]);
-        } catch (ClientException $e) {
+        } catch (ClientException) {
             return 'invalid';
         } catch (ServerException $e) {
             $response = $e->getResponse();
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
index c46ce9500..9ebcece18 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
@@ -22,17 +22,14 @@ use Twig\TwigFunction;
  */
 class MenuTwig extends AbstractExtension implements ContainerAwareInterface
 {
-    /**
-     * @var \Symfony\Component\DependencyInjection\ContainerInterface
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     /**
      * the default parameters for chillMenu.
      *
      * @var mixed[]
      */
-    private $defaultParams = [
+    private array $defaultParams = [
         'layout' => '@ChillMain/Menu/defaultMenu.html.twig',
         'args' => [],
         'activeRouteKey' => null,
diff --git a/src/Bundle/ChillMainBundle/Search/SearchProvider.php b/src/Bundle/ChillMainBundle/Search/SearchProvider.php
index 81c3a3969..e173b1acb 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchProvider.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchProvider.php
@@ -35,19 +35,19 @@ class SearchProvider
     /**
      * @var HasAdvancedSearchFormInterface[]
      */
-    private $hasAdvancedFormSearchServices = [];
+    private array $hasAdvancedFormSearchServices = [];
 
     /**
      * store string which must be extracted to find default arguments.
      *
      * @var string[]
      */
-    private $mustBeExtracted = [];
+    private array $mustBeExtracted = [];
 
     /**
      * @var SearchInterface[]
      */
-    private $searchServices = [];
+    private array $searchServices = [];
 
     public function addSearchService(SearchInterface $service, $name)
     {
diff --git a/src/Bundle/ChillMainBundle/Security/RoleProvider.php b/src/Bundle/ChillMainBundle/Security/RoleProvider.php
index c7e589674..891066b76 100644
--- a/src/Bundle/ChillMainBundle/Security/RoleProvider.php
+++ b/src/Bundle/ChillMainBundle/Security/RoleProvider.php
@@ -19,17 +19,15 @@ class RoleProvider
     /**
      * @var ProvideRoleInterface[]
      */
-    private $providers = [];
+    private array $providers = [];
 
     /**
      * an array where keys are the role, and value is the title
      * for the given role.
      *
      * Null when not initialized.
-     *
-     * @var array|null
      */
-    private $rolesTitlesCache;
+    private ?array $rolesTitlesCache = null;
 
     /**
      * Add a role provider.
diff --git a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
index 58bdfe614..a95f9831c 100644
--- a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
+++ b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
@@ -80,7 +80,6 @@ class WidgetRenderingTwig extends AbstractExtension
      *
      * @param string $place
      * @param WidgetInterface $widget
-     * @param mixed $ordering
      */
     public function addWidget($place, mixed $ordering, $widget, array $config = [])
     {
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
index d9ec15b3c..6c908246b 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
@@ -286,10 +286,6 @@ abstract class AbstractExportTest extends WebTestCase
      * > 0).
      *
      * @dataProvider dataProviderInitiateQuery
-     *
-     * @param mixed $modifiers
-     * @param mixed $acl
-     * @param mixed $data
      */
     public function testInitiateQuery(mixed $modifiers, mixed $acl, mixed $data)
     {
@@ -377,10 +373,6 @@ abstract class AbstractExportTest extends WebTestCase
      * - nothing, if the query is a native SQL
      *
      * @dataProvider dataProviderInitiateQuery
-     *
-     * @param mixed $modifiers
-     * @param mixed $acl
-     * @param mixed $data
      */
     public function testSupportsModifier(mixed $modifiers, mixed $acl, mixed $data)
     {
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
index 1cbee3002..27a684393 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
@@ -22,7 +22,7 @@ use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
  */
 final class UserControllerTest extends WebTestCase
 {
-    private $client;
+    private \Symfony\Bundle\FrameworkBundle\KernelBrowser $client;
 
     private array $toDelete = [];
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php b/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
index 412f1098a..eae7a15e2 100644
--- a/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
@@ -21,7 +21,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  */
 final class RouteLoaderTest extends KernelTestCase
 {
-    private $router;
+    private ?object $router = null;
 
     protected function setUp(): void
     {
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php b/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
index afe10b4ec..aada1b929 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
@@ -22,7 +22,7 @@ final class AbstractSearchTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Chill\MainBundle\Search\AbstractSearch
      */
-    private $stub;
+    private \Chill\MainBundle\Search\AbstractSearch&\PHPUnit\Framework\MockObject\MockObject $stub;
 
     protected function setUp(): void
     {
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php b/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
index f9dbcec51..c3d15db23 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
@@ -24,10 +24,7 @@ use PHPUnit\Framework\TestCase;
  */
 final class SearchProviderTest extends TestCase
 {
-    /**
-     * @var SearchProvider
-     */
-    private $search;
+    private \Chill\MainBundle\Search\SearchProvider $search;
 
     protected function setUp(): void
     {
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php b/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
index df700324b..81fdb5f71 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
@@ -36,16 +36,14 @@ class TimelineBuilder implements ContainerAwareInterface
      *
      * @var TimelineProviderInterface[]
      */
-    private $providers = [];
+    private array $providers = [];
 
     /**
      * Record provider and their context.
      *
      * This array has the structure `[ 'context' => [ 'service id' ] ]`
-     *
-     * @var array
      */
-    private $providersByContext = [];
+    private array $providersByContext = [];
 
     public function __construct(private readonly EntityManagerInterface $em)
     {
diff --git a/src/Bundle/ChillMainBundle/Util/CountriesInfo.php b/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
index 0955303a5..29eb3b041 100644
--- a/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
+++ b/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
@@ -24,7 +24,7 @@ class CountriesInfo
 {
     private static $cacheCountriesCodeByContinent;
 
-    private static $preparedData;
+    private static ?array $preparedData = null;
 
     /**
      * get the information about country in arrays where :.
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php b/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
index 9a19ce0ea..06b2fa638 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
@@ -29,11 +29,8 @@ use function count;
  */
 class Version20150821105642 extends AbstractMigration implements \Symfony\Component\DependencyInjection\ContainerAwareInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-    public function __construct(\Doctrine\DBAL\Connection $connection, \Psr\Log\LoggerInterface $logger, private \Doctrine\ORM\EntityManager $entityManager)
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
+    public function __construct(\Doctrine\DBAL\Connection $connection, \Psr\Log\LoggerInterface $logger, private readonly \Doctrine\ORM\EntityManager $entityManager)
     {
         parent::__construct($connection, $logger);
     }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php
index 84a2d835c..8eb0688bd 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php
@@ -25,7 +25,7 @@ class LoadAccompanyingPeriodOrigin extends AbstractFixture implements OrderedFix
 
     public static $references = [];
 
-    private $phoneCall = ['en' => 'phone call', 'fr' => 'appel téléphonique'];
+    private array $phoneCall = ['en' => 'phone call', 'fr' => 'appel téléphonique'];
 
     public function getOrder()
     {
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
index 6981269cc..97d58863f 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
@@ -32,9 +32,9 @@ use Twig\Environment;
 class LoadCustomFields extends AbstractFixture implements
     OrderedFixtureInterface
 {
-    private $cfText;
+    private ?\Chill\CustomFieldsBundle\Entity\CustomField $cfText = null;
 
-    private $cfChoice;
+    private ?\Chill\CustomFieldsBundle\Entity\CustomField $cfChoice = null;
 
     /**
     /**
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
index 4add4ac2a..67c0ea38f 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
@@ -21,7 +21,7 @@ use Doctrine\Persistence\ObjectManager;
  */
 class LoadMaritalStatus extends AbstractFixture implements OrderedFixtureInterface
 {
-    private $maritalStatuses = [
+    private array $maritalStatuses = [
         ['id' => 'single', 'name' => ['en' => 'single', 'fr' => 'célibataire']],
         ['id' => 'married', 'name' => ['en' => 'married', 'fr' => 'marié(e)']],
         ['id' => 'widow', 'name' => ['en' => 'widow', 'fr' => 'veuf – veuve ']],
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
index 4ef2fde7f..27d148b96 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
@@ -90,9 +90,9 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
 
     protected NativeLoader $loader;
 
-    private $genders = [Person::MALE_GENDER, Person::FEMALE_GENDER, Person::BOTH_GENDER];
+    private array $genders = [Person::MALE_GENDER, Person::FEMALE_GENDER, Person::BOTH_GENDER];
 
-    private $peoples = [
+    private array $peoples = [
         [
             'lastName' => 'Depardieu',
             'firstName' => 'Gérard',
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
index 5289b58a1..d645727ef 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
@@ -23,7 +23,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface;
  */
 class Configuration implements ConfigurationInterface
 {
-    private $validationBirthdateNotAfterInfos = 'The period before today during which'
+    private string $validationBirthdateNotAfterInfos = 'The period before today during which'
             . ' any birthdate is not allowed. The birthdate is expressed as ISO8601 : '
             . 'https://en.wikipedia.org/wiki/ISO_8601#Durations';
 
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
index 5cfdd1fd6..229a69f2c 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
@@ -40,20 +40,14 @@ abstract class AddressPart extends FunctionNode
         'country_id',
     ];
 
-    /**
-     * @var \Doctrine\ORM\Query\AST\Node
-     */
-    private $date;
+    private \Doctrine\ORM\Query\AST\Node|string|null $date = null;
 
     /**
      * @var \Doctrine\ORM\Query\AST\Node
      */
     private $part;
 
-    /**
-     * @var \Doctrine\ORM\Query\AST\Node
-     */
-    private $pid;
+    private ?\Doctrine\ORM\Query\AST\PathExpression $pid = null;
 
     /**
      * return the part of the address.
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index 2dbadb4ab..499502d76 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -226,12 +226,11 @@ class AccompanyingPeriod implements
     private ?int $id = null;
 
     /**
-     * @var string
      * @ORM\Column(type="string", nullable=true)
      * @Groups({"read"})
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
-    private $intensity = self::INTENSITY_OCCASIONAL;
+    private string $intensity = self::INTENSITY_OCCASIONAL;
 
     /**
      * @ORM\ManyToOne(
@@ -597,8 +596,6 @@ class AccompanyingPeriod implements
      *
      * Search for the person's participation and set the end date at
      * 'now'.
-     *
-     * @param mixed $person
      */
     public function closeParticipationFor(mixed $person): ?AccompanyingPeriodParticipation
     {
@@ -1241,7 +1238,6 @@ class AccompanyingPeriod implements
      *
      * For closing a Person file, you should use Person::setClosed instead.
      *
-     * @param mixed $closingDate
      *
      * @return AccompanyingPeriod
      */
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
index a8fefd4f2..f59c45ccd 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
@@ -34,7 +34,7 @@ class AccompanyingPeriodWorkGoal
     /**
      * @ORM\ManyToOne(targetEntity=AccompanyingPeriodWork::class, inversedBy="goals")
      */
-    private $accompanyingPeriodWork;
+    private ?\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork $accompanyingPeriodWork = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Goal::class)
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 42d1534f3..7c51f8be5 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -216,54 +216,49 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Array where customfield's data are stored.
      *
-     * @var array
      *
      * @ORM\Column(type="json")
      */
-    private $cFData;
+    private ?array $cFData = null;
 
     /**
      * The marital status of the person.
      *
-     * @var Civility
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Civility")
      * @ORM\JoinColumn(nullable=true)
      */
-    private $civility;
+    private ?\Chill\MainBundle\Entity\Civility $civility = null;
 
     /**
      * Contact information for contacting the person.
      *
-     * @var string
      *
      * @ORM\Column(type="text", nullable=true)
      */
-    private $contactInfo = '';
+    private string $contactInfo = '';
 
     /**
      * The person's country of birth.
      *
-     * @var Country
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Country")
      *
      *     sf4 check: option inversedBy="birthsIn" return error mapping !!
-     *
      * @ORM\JoinColumn(nullable=true)
      */
-    private $countryOfBirth;
+    private ?\Chill\MainBundle\Entity\Country $countryOfBirth = null;
 
     /**
      * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
      */
-    private $createdAt;
+    private ?\DateTimeInterface $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      * @ORM\JoinColumn(nullable=true)
      */
-    private $createdBy;
+    private ?\Chill\MainBundle\Entity\User $createdBy = null;
 
     /**
      * Cache the computation of household.
@@ -299,14 +294,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's email.
      *
-     * @var string
      *
      * @ORM\Column(type="text", nullable=true)
      * @Assert\Email(
      *     checkMX=true
      * )
      */
-    private $email = '';
+    private string $email = '';
 
     /**
      * The person's first name.
@@ -330,12 +324,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's gender.
      *
-     * @var string
      *
      * @ORM\Column(type="string", length=9, nullable=true)
      * @Assert\NotNull(message="The gender must be set")
      */
-    private $gender;
+    private ?string $gender = null;
 
     /**
      * Comment on gender.
@@ -388,12 +381,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The marital status of the person.
      *
-     * @var MaritalStatus
      *
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\MaritalStatus")
      * @ORM\JoinColumn(nullable=true)
      */
-    private $maritalStatus;
+    private ?\Chill\PersonBundle\Entity\MaritalStatus $maritalStatus = null;
 
     /**
      * Comment on marital status.
@@ -415,11 +407,10 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * A remark over the person.
      *
-     * @var string
      *
      * @ORM\Column(type="text")
      */
-    private $memo = ''; // TO-CHANGE in remark
+    private string $memo = ''; // TO-CHANGE in remark
 
     /**
      * The person's mobile phone number.
@@ -432,15 +423,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's nationality.
      *
-     * @var Country
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Country")
      *
      *    sf4 check: option inversedBy="nationals" return error mapping !!
-     *
      * @ORM\JoinColumn(nullable=true)
      */
-    private $nationality;
+    private ?\Chill\MainBundle\Entity\Country $nationality = null;
 
     /**
      * Number of children.
@@ -488,20 +477,17 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's place of birth.
      *
-     * @var string
      *
      * @ORM\Column(type="string", length=255, name="place_of_birth")
      */
-    private $placeOfBirth = '';
+    private string $placeOfBirth = '';
 
     /**
-     * @var bool
      *
      * @deprecated
-     *
      * @ORM\Column(type="boolean")
      */
-    private $proxyAccompanyingPeriodOpenState = false; //TO-DELETE ?
+    private bool $proxyAccompanyingPeriodOpenState = false; //TO-DELETE ?
 
     /**
      * @ORM\OneToMany(targetEntity=PersonResource::class, mappedBy="personOwner")
@@ -527,14 +513,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
      */
-    private $updatedAt;
+    private ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(
      *     targetEntity=User::class
      * )
      */
-    private $updatedBy;
+    private ?\Chill\MainBundle\Entity\User $updatedBy = null;
 
     /**
      * Person constructor.
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php b/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
index fbf238ac4..2ab6aaf36 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
@@ -48,14 +48,12 @@ class PersonAltName
     private $label;
 
     /**
-     * @var Person
-     *
      * @ORM\ManyToOne(
      *     targetEntity="Chill\PersonBundle\Entity\Person",
      *     inversedBy="altNames"
      * )
      */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
      * Get id.
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
index 6959fc5e3..24bbf9b2b 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
@@ -24,10 +24,9 @@ use Doctrine\ORM\Mapping as ORM;
 class PersonNotDuplicate
 {
     /**
-     * @var DateTime
      * @ORM\Column(type="datetime")
      */
-    private $date;
+    private \DateTime $date;
 
     /**
      * The person's id.
@@ -41,25 +40,19 @@ class PersonNotDuplicate
     private $id;
 
     /**
-     * @var Person
-     *
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
-    private $person1;
+    private ?\Chill\PersonBundle\Entity\Person $person1 = null;
 
     /**
-     * @var Person
-     *
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
-    private $person2;
+    private ?\Chill\PersonBundle\Entity\Person $person2 = null;
 
     /**
-     * @var User
-     *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      */
-    private $user;
+    private ?\Chill\MainBundle\Entity\User $user = null;
 
     public function __construct()
     {
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
index a6e54908f..ad42a05db 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
@@ -32,7 +32,7 @@ class Goal
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private $desactivationDate;
+    private ?\DateTimeInterface $desactivationDate = null;
 
     /**
      * @ORM\Id
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
index a837c8958..a5475263e 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
@@ -40,12 +40,12 @@ class SocialAction
     /**
      * @ORM\Column(type="dateinterval", nullable=true)
      */
-    private $defaultNotificationDelay;
+    private ?\DateInterval $defaultNotificationDelay = null;
 
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private $desactivationDate;
+    private ?\DateTimeInterface $desactivationDate = null;
 
     /**
      * @var Collection<Evaluation>
@@ -71,7 +71,7 @@ class SocialAction
     /**
      * @ORM\ManyToOne(targetEntity=SocialIssue::class, inversedBy="socialActions")
      */
-    private $issue;
+    private ?\Chill\PersonBundle\Entity\SocialWork\SocialIssue $issue = null;
 
     /**
      * @ORM\Column(type="float", name="ordering", options={"default": 0.0})
@@ -81,7 +81,7 @@ class SocialAction
     /**
      * @ORM\ManyToOne(targetEntity=SocialAction::class, inversedBy="children")
      */
-    private $parent;
+    private ?\Chill\PersonBundle\Entity\SocialWork\SocialAction $parent = null;
 
     /**
      * @var Collection<Result>
@@ -93,7 +93,7 @@ class SocialAction
     /**
      * @ORM\Column(type="json")
      */
-    private $title = [];
+    private array $title = [];
 
     public function __construct()
     {
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
index 113c8888d..773b90dfd 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
@@ -36,7 +36,7 @@ class SocialIssue
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private $desactivationDate;
+    private ?\DateTimeInterface $desactivationDate = null;
 
     /**
      * @ORM\Id
@@ -53,7 +53,7 @@ class SocialIssue
     /**
      * @ORM\ManyToOne(targetEntity=SocialIssue::class, inversedBy="children")
      */
-    private $parent;
+    private ?\Chill\PersonBundle\Entity\SocialWork\SocialIssue $parent = null;
 
     /**
      * @var Collection<SocialAction>
@@ -65,7 +65,7 @@ class SocialIssue
      * @ORM\Column(type="json")
      * @Groups({"read"})
      */
-    private $title = [];
+    private array $title = [];
 
     public function __construct()
     {
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
index 218e7e8bb..c5d5ae6a3 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
@@ -48,7 +48,7 @@ use function uniqid;
  */
 class ListPerson implements ExportElementValidatedInterface, ListInterface, GroupedExportInterface
 {
-    private $slugs = [];
+    private array $slugs = [];
 
     public function __construct(private readonly ExportAddressHelper $addressHelper, private readonly CustomFieldProvider $customFieldProvider, private readonly ListPersonHelper $listPersonHelper, private readonly EntityManagerInterface $entityManager, private readonly TranslatableStringHelper $translatableStringHelper)
     {
diff --git a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
index 09b5bbfc0..0354df481 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
@@ -46,10 +46,7 @@ class PrivacyEvent extends \Symfony\Contracts\EventDispatcher\Event
 {
     final public const PERSON_PRIVACY_EVENT = 'chill_person.privacy_event';
 
-    /**
-     * @var array
-     */
-    private $persons = [];
+    private array $persons = [];
 
     /**
      * PrivacyEvent constructor.
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
index 94b618e41..12afd5ca2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
@@ -33,22 +33,16 @@ final class PersonControllerUpdateTest extends WebTestCase
     /**
      * @var string The url using for editing the person's information
      */
-    private $editUrl;
+    private string $editUrl;
 
-    /**
-     * @var \Doctrine\ORM\EntityManagerInterface The entity manager
-     */
-    private $em;
+    private ?object $em = null;
 
-    /**
-     * @var Person The person on which the test is executed
-     */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
      * @var string The url using for seeing the person's information
      */
-    private $viewUrl;
+    private string $viewUrl;
 
     /**
      * Prepare client and create a random person.
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
index 441358c02..27be1dffa 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
@@ -30,22 +30,16 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
     /**
      * @var string The url using for editing the person's information
      */
-    private $editUrl;
+    private string $editUrl;
 
-    /**
-     * @var \Doctrine\ORM\EntityManagerInterface The entity manager
-     */
-    private $em;
+    private ?object $em = null;
 
-    /**
-     * @var Person The person on which the test is executed
-     */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
      * @var string The url using for seeing the person's information
      */
-    private $viewUrl;
+    private string $viewUrl;
 
     /**
      * Prepare client and create a random person.
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
index 789b520a5..bcba3b08c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
@@ -20,20 +20,14 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  */
 final class PersonControllerViewTest extends WebTestCase
 {
-    /**
-     * @var \Doctrine\ORM\EntityManagerInterface The entity manager
-     */
-    private $em;
+    private ?object $em = null;
 
-    /**
-     * @var Person A person used on which to run the test
-     */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
      * @var string The url to view the person details
      */
-    private $viewUrl;
+    private string $viewUrl;
 
     protected function setUp(): void
     {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
index d6bbb461f..a30117ce7 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
@@ -20,20 +20,14 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  */
 final class PersonControllerViewWithHiddenFieldsTest extends WebTestCase
 {
-    /**
-     * @var \Doctrine\ORM\EntityManagerInterface The entity manager
-     */
-    private $em;
+    private ?object $em = null;
 
-    /**
-     * @var Person A person used on which to run the test
-     */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
      * @var string The url to view the person details
      */
-    private $viewUrl;
+    private string $viewUrl;
 
     protected function setUp(): void
     {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
index 980e093ad..1b3055b60 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
@@ -24,7 +24,7 @@ final class CountPersonTest extends AbstractExportTest
     /**
      * @var
      */
-    private $export;
+    private ?object $export = null;
 
     protected function setUp(): void
     {
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php b/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
index 5d10f36e0..23744a603 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
@@ -20,7 +20,7 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210326113045 extends AbstractMigration
 {
-    private $datas = [];
+    private array $datas = [];
 
     /**
      *  The distinct clause makes that for each group of duplicates, it keeps only the first row in the returned result set.
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
index f5958daf7..233634878 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
@@ -33,12 +33,9 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
 {
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
-    /**
-     * @var \Faker\Generator
-     */
-    private $faker;
+    private readonly \Faker\Generator $faker;
 
-    public function __construct(private \Doctrine\ORM\EntityManager $entityManager)
+    public function __construct(private readonly \Doctrine\ORM\EntityManager $entityManager)
     {
         $this->faker = FakerFactory::create('fr_FR');
     }
diff --git a/src/Bundle/ChillReportBundle/Entity/Report.php b/src/Bundle/ChillReportBundle/Entity/Report.php
index 4422fc9e6..655fd4b4b 100644
--- a/src/Bundle/ChillReportBundle/Entity/Report.php
+++ b/src/Bundle/ChillReportBundle/Entity/Report.php
@@ -31,17 +31,15 @@ use Doctrine\ORM\Mapping as ORM;
 class Report implements HasCenterInterface, HasScopeInterface
 {
     /**
-     * @var array
      * @ORM\Column(type="json")
      */
-    private $cFData;
+    private ?array $cFData = null;
 
     /**
-     * @var CustomFieldsGroup
      * @ORM\ManyToOne(
      * targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldsGroup")
      */
-    private $cFGroup;
+    private ?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup $cFGroup = null;
 
     /**
      * @var DateTime
@@ -59,22 +57,19 @@ class Report implements HasCenterInterface, HasScopeInterface
     private $id;
 
     /**
-     * @var Person
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
-     * @var Scope
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
      */
-    private $scope;
+    private ?\Chill\MainBundle\Entity\Scope $scope = null;
 
     /**
-     * @var User
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      */
-    private $user;
+    private ?\Chill\MainBundle\Entity\User $user = null;
 
     /**
      * @return Center
diff --git a/src/Bundle/ChillReportBundle/Search/ReportSearch.php b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
index 3c5e7f4ad..188faaee5 100644
--- a/src/Bundle/ChillReportBundle/Search/ReportSearch.php
+++ b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
@@ -31,10 +31,7 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
 {
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
-    /**
-     * @var \Chill\MainBundle\Entity\User
-     */
-    private $user;
+    private readonly \Chill\MainBundle\Entity\User $user;
 
     public function __construct(
         private readonly EntityManagerInterface $em,
diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
index d447910fe..b94a1d2f3 100644
--- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
@@ -38,10 +38,7 @@ final class ReportControllerTest extends WebTestCase
      */
     private static $client;
 
-    /**
-     * @var \Doctrine\ORM\EntityManagerInterface
-     */
-    private static $em;
+    private static ?object $em = null;
 
     /**
      * @var CustomFieldsGroup
diff --git a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
index 95f85ed1f..22e8d9e38 100644
--- a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
@@ -27,15 +27,9 @@ use function count;
  */
 final class TimelineProviderTest extends WebTestCase
 {
-    /**
-     * @var \Doctrine\ORM\EntityManager
-     */
-    private static $em;
+    private static ?object $em = null;
 
-    /**
-     * @var Person
-     */
-    private $person;
+    private \Chill\PersonBundle\Entity\Person $person;
 
     /**
      * @var Report
@@ -158,18 +152,8 @@ final class TimelineProviderTest extends WebTestCase
                 ->count(),
             'the page contains a .report .summary element'
         );
-        $this->assertContains(
-            'blah blah',
-            $crawler->filter('.report_entry .summary')
-                ->text(),
-            'the page contains the text "blah blah"'
-        );
-        $this->assertContains(
-            'Propriétaire',
-            $crawler->filter('.report_entry .summary')
-                ->text(),
-            'the page contains the mention "Propriétaire"'
-        );
+        $this->assertSelectorTextContains('.report_entry .summary', 'blah blah', 'the page contains the text "blah blah"');
+        $this->assertSelectorTextContains('.report_entry .summary', 'Propriétaire', 'the page contains the mention "Propriétaire"');
     }
 
     /**
diff --git a/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php b/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
index 3aad75baf..e9b1e281b 100644
--- a/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
+++ b/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
@@ -23,10 +23,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class Version20150622233319 extends AbstractMigration implements ContainerAwareInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     public function down(Schema $schema): void
     {
diff --git a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
index d49e5e385..0269f4195 100644
--- a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
@@ -35,35 +35,31 @@ use function array_keys;
 abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
 {
     /**
-     * @var User
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\MainBundle\Entity\User"
      * )
      * @Serializer\Groups({"read"})
      */
-    private $assignee;
+    private ?\Chill\MainBundle\Entity\User $assignee = null;
 
     /**
-     * @var Scope
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\MainBundle\Entity\Scope"
      * )
      */
-    private $circle;
+    private ?\Chill\MainBundle\Entity\Scope $circle = null;
 
     /**
-     * @var bool
      * @ORM\Column(name="closed", type="boolean", options={ "default": false })
      * @Serializer\Groups({"read"})
      */
-    private $closed = false;
+    private bool $closed = false;
 
     /**
-     * @var AccompanyingPeriod
      * @ORM\ManyToOne(targetEntity="\Chill\PersonBundle\Entity\AccompanyingPeriod")
      * @Serializer\Groups({"read"})
      */
-    private $course;
+    private ?\Chill\PersonBundle\Entity\AccompanyingPeriod $course = null;
 
     /**
      * @var json
@@ -74,38 +70,34 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
     private $currentStates = [];
 
     /**
-     * @var string
      *
      * @ORM\Column(name="description", type="text")
      * @Serializer\Groups({"read"})
      */
-    private $description = '';
+    private string $description = '';
 
     /**
-     * @var Person
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\PersonBundle\Entity\Person"
      * )
      * @Serializer\Groups({"read"})
      */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
-     * @var string
      *
      * @ORM\Column(name="title", type="text")
      * @Assert\NotBlank
      * @Serializer\Groups({"read"})
      */
-    private $title = '';
+    private string $title = '';
 
     /**
-     * @var string
      *
      * @ORM\Column(name="type", type="string", length=255)
      * @Serializer\Groups({"read"})
      */
-    private $type;
+    private ?string $type = null;
 
     public function getAssignee(): ?User
     {
diff --git a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
index fc806dd24..33495a295 100644
--- a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
@@ -74,7 +74,7 @@ class RecurringTask extends AbstractTask
      *     mappedBy="recurringTask"
      * )
      */
-    private $singleTasks;
+    private Collection $singleTasks;
 
     public function __construct()
     {
diff --git a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
index 23dc7a5e1..921c495e7 100644
--- a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
@@ -65,13 +65,12 @@ class SingleTask extends AbstractTask
     private $id;
 
     /**
-     * @var RecurringTask
      * @ORM\ManyToOne(
      *     targetEntity="RecurringTask",
      *     inversedBy="singleTasks"
      * )
      */
-    private $recurringTask;
+    private ?\Chill\TaskBundle\Entity\RecurringTask $recurringTask = null;
 
     /**
      * @var DateTime
diff --git a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
index e30161db2..26f250aff 100644
--- a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
+++ b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
@@ -23,19 +23,16 @@ use Doctrine\ORM\Mapping as ORM;
 class AbstractTaskPlaceEvent
 {
     /**
-     * @var User
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\MainBundle\Entity\User"
      * )
      */
-    private $author;
+    private ?\Chill\MainBundle\Entity\User $author = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="data", type="json")
      */
-    private $data = [];
+    private array $data = [];
 
     /**
      * @var datetime_immutable
@@ -54,11 +51,9 @@ class AbstractTaskPlaceEvent
     private $id;
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="transition", type="string", length=255)
      */
-    private $transition = '';
+    private string $transition = '';
 
     public function __construct()
     {
@@ -72,10 +67,8 @@ class AbstractTaskPlaceEvent
 
     /**
      * Get data.
-     *
-     * @return string
      */
-    public function getData()
+    public function getData(): array
     {
         return $this->data;
     }
@@ -120,11 +113,9 @@ class AbstractTaskPlaceEvent
     /**
      * Set data.
      *
-     * @param string $data
-     *
      * @return AbstractTaskPlaceEvent
      */
-    public function setData($data)
+    public function setData(array $data)
     {
         $this->data = $data;
 
diff --git a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
index 714cb6455..7008e42f3 100644
--- a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
+++ b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
@@ -32,8 +32,6 @@ class ThirdPartyTypeManager
      * Add a provider to the manager.
      *
      * Method used during the load of the manager by Dependency Injection
-     *
-     * @param \Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeProviderInterface $provider
      */
     public function addProvider(ThirdPartyTypeProviderInterface $provider): self
     {
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
index beb292d8a..2f0765cc9 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
@@ -21,7 +21,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 final class Version20230215175150 extends AbstractMigration implements ContainerAwareInterface
 {
     public ContainerInterface $container;
-    public function __construct(\Doctrine\DBAL\Connection $connection, \Psr\Log\LoggerInterface $logger, private \Doctrine\ORM\EntityManager $entityManager)
+    public function __construct(\Doctrine\DBAL\Connection $connection, \Psr\Log\LoggerInterface $logger, private readonly \Doctrine\ORM\EntityManager $entityManager)
     {
         parent::__construct($connection, $logger);
     }