diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 31d64e600..9aae1c43f 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -91,7 +91,7 @@ $rules = array_merge(
     [
         '@PhpCsFixer' => true,
         '@PhpCsFixer:risky' => false,
-        '@Symfony' => false,
+        '@Symfony' => true,
         '@Symfony:risky' => false,
         'ordered_class_elements' => [
             'order' => [
@@ -111,13 +111,13 @@ $rules = array_merge(
                 'method_private',
             ],
             'sort_algorithm' => 'alpha',
-        ]
+        ],
     ],
     $rules,
     $riskyRules,
     $untilFullSwitchToPhp8,
 );
 
-$rules['header_comment']['header'] = trim(file_get_contents(__DIR__ . '/resource/header.txt'));
+$rules['header_comment']['header'] = trim(file_get_contents(__DIR__.'/resource/header.txt'));
 
 return $config->setRules($rules);
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 89ff9d3e2..43c0b13bb 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -18,7 +18,6 @@ use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeCategoryRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
-use Chill\ActivityBundle\Repository\ActivityUserJobRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\UserJob;
@@ -35,11 +34,8 @@ use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
-use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
@@ -49,7 +45,6 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_key_exists;
 
 final class ActivityController extends AbstractController
 {
@@ -76,6 +71,7 @@ final class ActivityController extends AbstractController
 
     /**
      * Deletes a Activity entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/{id}/delete", name="chill_activity_activity_delete", methods={"GET", "POST", "DELETE"})
      */
     public function deleteAction(Request $request, mixed $id)
@@ -102,7 +98,7 @@ final class ActivityController extends AbstractController
 
         $form = $this->createDeleteForm($activity->getId(), $person, $accompanyingPeriod);
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -145,6 +141,7 @@ final class ActivityController extends AbstractController
 
     /**
      * Displays a form to edit an existing Activity entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/{id}/edit", name="chill_activity_activity_edit", methods={"GET", "POST", "PUT"})
      */
     public function editAction(int $id, Request $request): Response
@@ -239,6 +236,7 @@ final class ActivityController extends AbstractController
 
     /**
      * Lists all Activity entities.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/", name="chill_activity_activity_list")
      */
     public function listAction(Request $request): Response
@@ -295,7 +293,7 @@ final class ActivityController extends AbstractController
 
             $view = '@ChillActivity/Activity/listAccompanyingCourse.html.twig';
         } else {
-            throw new \LogicException("Unsupported");
+            throw new \LogicException('Unsupported');
         }
 
         return $this->render(
@@ -325,19 +323,19 @@ final class ActivityController extends AbstractController
                 ->addEntityChoice('activity_types', 'activity_filter.Types', \Chill\ActivityBundle\Entity\ActivityType::class, $types, [
                     'choice_label' => function (\Chill\ActivityBundle\Entity\ActivityType $activityType) {
                         $text = match ($activityType->hasCategory()) {
-                            true => $this->translatableStringHelper->localize($activityType->getCategory()->getName()) . ' > ',
+                            true => $this->translatableStringHelper->localize($activityType->getCategory()->getName()).' > ',
                             false => '',
                         };
 
-                        return $text . $this->translatableStringHelper->localize($activityType->getName());
-                    }
+                        return $text.$this->translatableStringHelper->localize($activityType->getName());
+                    },
                 ]);
         }
 
         if (1 < count($jobs)) {
             $filterBuilder
                 ->addEntityChoice('jobs', 'activity_filter.Jobs', UserJob::class, $jobs, [
-                    'choice_label' => fn (UserJob $u) => $this->translatableStringHelper->localize($u->getLabel())
+                    'choice_label' => fn (UserJob $u) => $this->translatableStringHelper->localize($u->getLabel()),
                 ]);
         }
 
@@ -363,7 +361,7 @@ final class ActivityController extends AbstractController
         $activityType = $this->activityTypeRepository->find($activityType_id);
 
         if (isset($activityType) && !$activityType->isActive()) {
-            throw new InvalidArgumentException('Activity type must be active');
+            throw new \InvalidArgumentException('Activity type must be active');
         }
 
         $activityData = null;
@@ -398,45 +396,45 @@ final class ActivityController extends AbstractController
         }
 
         $entity->setActivityType($activityType);
-        $entity->setDate(new DateTime('now'));
+        $entity->setDate(new \DateTime('now'));
 
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
 
-            if (array_key_exists('durationTime', $activityData) && $activityType->getDurationTimeVisible() > 0) {
+            if (\array_key_exists('durationTime', $activityData) && $activityType->getDurationTimeVisible() > 0) {
                 $durationTimeInMinutes = $activityData['durationTime'];
                 $hours = floor($durationTimeInMinutes / 60);
                 $minutes = $durationTimeInMinutes % 60;
-                $duration = DateTime::createFromFormat('H:i', $hours . ':' . $minutes);
+                $duration = \DateTime::createFromFormat('H:i', $hours.':'.$minutes);
 
                 if ($duration) {
                     $entity->setDurationTime($duration);
                 }
             }
 
-            if (array_key_exists('date', $activityData)) {
-                $date = DateTime::createFromFormat('Y-m-d', $activityData['date']);
+            if (\array_key_exists('date', $activityData)) {
+                $date = \DateTime::createFromFormat('Y-m-d', $activityData['date']);
 
                 if ($date) {
                     $entity->setDate($date);
                 }
             }
 
-            if (array_key_exists('personsId', $activityData) && $activityType->getPersonsVisible() > 0) {
+            if (\array_key_exists('personsId', $activityData) && $activityType->getPersonsVisible() > 0) {
                 foreach ($activityData['personsId'] as $personId) {
                     $concernedPerson = $this->personRepository->find($personId);
                     $entity->addPerson($concernedPerson);
                 }
             }
 
-            if (array_key_exists('professionalsId', $activityData) && $activityType->getThirdPartiesVisible() > 0) {
+            if (\array_key_exists('professionalsId', $activityData) && $activityType->getThirdPartiesVisible() > 0) {
                 foreach ($activityData['professionalsId'] as $professionalsId) {
                     $professional = $this->thirdPartyRepository->find($professionalsId);
                     $entity->addThirdParty($professional);
                 }
             }
 
-            if (array_key_exists('usersId', $activityData) && $activityType->getUsersVisible() > 0) {
+            if (\array_key_exists('usersId', $activityData) && $activityType->getUsersVisible() > 0) {
                 foreach ($activityData['usersId'] as $userId) {
                     $user = $this->userRepository->find($userId);
 
@@ -446,16 +444,16 @@ final class ActivityController extends AbstractController
                 }
             }
 
-            if (array_key_exists('location', $activityData) && $activityType->getLocationVisible() > 0) {
+            if (\array_key_exists('location', $activityData) && $activityType->getLocationVisible() > 0) {
                 $location = $this->locationRepository->find($activityData['location']);
                 $entity->setLocation($location);
             }
 
-            if (array_key_exists('comment', $activityData) && $activityType->getCommentVisible() > 0) {
+            if (\array_key_exists('comment', $activityData) && $activityType->getCommentVisible() > 0) {
                 $comment = new CommentEmbeddable();
                 $comment->setComment($activityData['comment']);
                 $comment->setUserId($this->getUser()->getid());
-                $comment->setDate(new DateTime('now'));
+                $comment->setDate(new \DateTime('now'));
                 $entity->setComment($comment);
             }
         }
@@ -593,7 +591,7 @@ final class ActivityController extends AbstractController
         } elseif ($person instanceof Person) {
             $view = '@ChillActivity/Activity/showPerson.html.twig';
         } else {
-            throw new RuntimeException('the activity should be linked with a period or person');
+            throw new \RuntimeException('the activity should be linked with a period or person');
         }
 
         if (null !== $accompanyingPeriod) {
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
index 1a104a3be..6d0b825cc 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
@@ -24,6 +24,7 @@ class ActivityReasonCategoryController extends AbstractController
 {
     /**
      * Creates a new ActivityReasonCategory entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/create", name="chill_activity_activityreasoncategory_create", methods={"POST"})
      */
     public function createAction(Request $request)
@@ -48,6 +49,7 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Displays a form to edit an existing ActivityReasonCategory entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/{id}/edit", name="chill_activity_activityreasoncategory_edit")
      */
     public function editAction(mixed $id)
@@ -70,6 +72,7 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Lists all ActivityReasonCategory entities.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/", name="chill_activity_activityreasoncategory")
      */
     public function indexAction()
@@ -85,6 +88,7 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Displays a form to create a new ActivityReasonCategory entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/new", name="chill_activity_activityreasoncategory_new")
      */
     public function newAction()
@@ -100,6 +104,7 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Finds and displays a ActivityReasonCategory entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/{id}/show", name="chill_activity_activityreasoncategory_show")
      */
     public function showAction(mixed $id)
@@ -119,6 +124,7 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Edits an existing ActivityReasonCategory entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/{id}/update", name="chill_activity_activityreasoncategory_update", methods={"POST", "PUT"})
      */
     public function updateAction(Request $request, mixed $id)
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
index 30638340c..141398cc4 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
@@ -28,6 +28,7 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Creates a new ActivityReason entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/create", name="chill_activity_activityreason_create", methods={"POST"})
      */
     public function createAction(Request $request)
@@ -52,6 +53,7 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Displays a form to edit an existing ActivityReason entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/{id}/edit", name="chill_activity_activityreason_edit")
      */
     public function editAction(mixed $id)
@@ -74,6 +76,7 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Lists all ActivityReason entities.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/", name="chill_activity_activityreason")
      */
     public function indexAction()
@@ -89,6 +92,7 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Displays a form to create a new ActivityReason entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/new", name="chill_activity_activityreason_new")
      */
     public function newAction()
@@ -104,6 +108,7 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Finds and displays a ActivityReason entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/{id}/show", name="chill_activity_activityreason_show")
      */
     public function showAction(mixed $id)
@@ -123,6 +128,7 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Edits an existing ActivityReason entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/{id}/update", name="chill_activity_activityreason_update", methods={"POST", "PUT"})
      */
     public function updateAction(Request $request, mixed $id)
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php b/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
index 3a39ca072..8a1ccda44 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
@@ -24,7 +24,7 @@ class AdminActivityPresenceController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var \Doctrine\ORM\QueryBuilder $query */
+        /* @var \Doctrine\ORM\QueryBuilder $query */
         return $query->orderBy('e.id', 'ASC');
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
index 666f8721c..887749406 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
@@ -24,7 +24,7 @@ class AdminActivityTypeCategoryController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var \Doctrine\ORM\QueryBuilder $query */
+        /* @var \Doctrine\ORM\QueryBuilder $query */
         return $query->orderBy('e.ordering', 'ASC');
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
index 5f245e9c4..ff75e5909 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
@@ -24,7 +24,7 @@ class AdminActivityTypeController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var \Doctrine\ORM\QueryBuilder $query */
+        /* @var \Doctrine\ORM\QueryBuilder $query */
         return $query->orderBy('e.ordering', 'ASC')
             ->addOrderBy('e.id', 'ASC');
     }
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
index d006a624c..af674be9e 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
@@ -52,13 +52,13 @@ class LoadActivityReason extends AbstractFixture implements OrderedFixtureInterf
         ];
 
         foreach ($reasons as $r) {
-            echo 'Creating activity reason : ' . $r['name']['en'] . "\n";
+            echo 'Creating activity reason : '.$r['name']['en']."\n";
             $activityReason = (new ActivityReason())
-                ->setName(($r['name']))
+                ->setName($r['name'])
                 ->setActive(true)
                 ->setCategory($this->getReference($r['category']));
             $manager->persist($activityReason);
-            $reference = 'activity_reason_' . $r['name']['en'];
+            $reference = 'activity_reason_'.$r['name']['en'];
             $this->addReference($reference, $activityReason);
             static::$references[] = $reference;
         }
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
index 63d9a2ee0..a78ae3972 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
@@ -34,13 +34,13 @@ class LoadActivityReasonCategory extends AbstractFixture implements OrderedFixtu
         ];
 
         foreach ($categs as $c) {
-            echo 'Creating activity reason category : ' . $c['name']['en'] . "\n";
+            echo 'Creating activity reason category : '.$c['name']['en']."\n";
             $activityReasonCategory = (new ActivityReasonCategory())
-                ->setName(($c['name']))
+                ->setName($c['name'])
                 ->setActive(true);
             $manager->persist($activityReasonCategory);
             $this->addReference(
-                'cat_' . $c['name']['en'],
+                'cat_'.$c['name']['en'],
                 $activityReasonCategory
             );
         }
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
index d0cd9d2be..891f2c979 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
@@ -54,14 +54,14 @@ class LoadActivityType extends Fixture implements OrderedFixtureInterface
         ];
 
         foreach ($types as $t) {
-            echo 'Creating activity type : ' . $t['name']['fr'] . ' (cat:' . $t['category'] . " \n";
+            echo 'Creating activity type : '.$t['name']['fr'].' (cat:'.$t['category']." \n";
             $activityType = (new ActivityType())
-                ->setName(($t['name']))
-                ->setCategory($this->getReference('activity_type_cat_' . $t['category']))
+                ->setName($t['name'])
+                ->setCategory($this->getReference('activity_type_cat_'.$t['category']))
                 ->setSocialIssuesVisible(1)
                 ->setSocialActionsVisible(1);
             $manager->persist($activityType);
-            $reference = 'activity_type_' . $t['name']['fr'];
+            $reference = 'activity_type_'.$t['name']['fr'];
             $this->addReference($reference, $activityType);
             static::$references[] = $reference;
         }
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
index 4fb5a3e38..2f15a2676 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
@@ -42,13 +42,13 @@ class LoadActivityTypeCategory extends Fixture implements OrderedFixtureInterfac
         ];
 
         foreach ($categories as $cat) {
-            echo 'Creating activity type category : ' . $cat['ref'] . "\n";
+            echo 'Creating activity type category : '.$cat['ref']."\n";
 
             $newCat = (new ActivityTypeCategory())
-                ->setName(($cat['name']));
+                ->setName($cat['name']);
 
             $manager->persist($newCat);
-            $reference = 'activity_type_cat_' . $cat['ref'];
+            $reference = 'activity_type_cat_'.$cat['ref'];
 
             $this->addReference($reference, $newCat);
             static::$references[] = $reference;
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
index 0ffb2ed0e..e7c893cd9 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
@@ -20,8 +20,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function in_array;
-
 /**
  * Add a role CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE for all groups except administrative,
  * and a role CHILL_ACTIVITY_SEE for administrative.
@@ -40,10 +38,10 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
 
             foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
-                //create permission group
+                // create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
-                        if ($scope->getName()['en'] === 'administrative') {
+                        if ('administrative' === $scope->getName()['en']) {
                             break 2; // we do not want any power on administrative
                         }
 
@@ -51,7 +49,7 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
 
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
+                        if (\in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             break 2; // we do not want any power on social or administrative
                         }
 
@@ -60,7 +58,7 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
 
                 printf(
                     'Adding CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE & CHILL_ACTIVITY_DELETE, and stats and list permissions to %s '
-                        . "permission group, scope '%s' \n",
+                        ."permission group, scope '%s' \n",
                     $permissionsGroup->getName(),
                     $scope->getName()['en']
                 );
diff --git a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
index 49b3927ed..15e7e7e4b 100644
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@@ -32,7 +32,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
 
         $container->setParameter('chill_activity.form.time_duration', $config['form']['time_duration']);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/export.yaml');
         $loader->load('services/repositories.yaml');
@@ -73,7 +73,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
      */
     public function prependRoutes(ContainerBuilder $container)
     {
-        //add routes for custom bundle
+        // add routes for custom bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
diff --git a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
index 57a1ec578..112d49f60 100644
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
@@ -13,7 +13,6 @@ namespace Chill\ActivityBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
-
 use function is_int;
 
 /**
@@ -59,7 +58,7 @@ class Configuration implements ConfigurationInterface
             ->info('The number of seconds of this duration. Must be an integer.')
             ->cannotBeEmpty()
             ->validate()
-            ->ifTrue(static fn ($data) => !is_int($data))->thenInvalid('The value %s is not a valid integer')
+            ->ifTrue(static fn ($data) => !\is_int($data))->thenInvalid('The value %s is not a valid integer')
             ->end()
             ->end()
             ->scalarNode('label')
diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index 1cf783e0b..9407aecbe 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -36,7 +36,6 @@ use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\SerializedName;
@@ -46,11 +45,15 @@ use Symfony\Component\Validator\Constraints as Assert;
  * Class Activity.
  *
  * @ORM\Entity(repositoryClass="Chill\ActivityBundle\Repository\ActivityRepository")
+ *
  * @ORM\Table(name="activity")
+ *
  * @ORM\HasLifecycleCallbacks
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "activity": Activity::class
  * })
+ *
  * @ActivityValidator\ActivityValidity
  *
  * TODO see if necessary
@@ -71,39 +74,48 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
+     *
      * @Groups({"read"})
      */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @SerializedName("activityType")
+     *
      * @ORM\JoinColumn(name="type_id")
      */
     private ActivityType $activityType;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
+     *
      * @Groups({"docgen:read"})
      */
     private ?ActivityPresence $attendee = null;
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
+     *
      * @Groups({"docgen:read"})
      */
     private CommentEmbeddable $comment;
 
     /**
      * @ORM\Column(type="datetime")
+     *
      * @Groups({"docgen:read"})
      */
-    private DateTime $date;
+    private \DateTime $date;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
+     *
      * @Assert\Valid(traverse=true)
+     *
      * @var Collection<StoredObject>
      */
     private Collection $documents;
@@ -111,24 +123,29 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     /**
      * @ORM\Column(type="time", nullable=true)
      */
-    private ?DateTime $durationTime = null;
+    private ?\DateTime $durationTime = null;
 
     /**
      * @ORM\Column(type="boolean", options={"default": false})
+     *
      * @Groups({"docgen:read"})
      */
     private bool $emergency = false;
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     *
      * @groups({"read", "docgen:read"})
      */
     private ?Location $location = null;
@@ -140,7 +157,9 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @var Collection<Person>
      */
     private Collection $persons;
@@ -152,42 +171,54 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
+     *
      * @Groups({"docgen:read"})
+     *
      * @var Collection<ActivityReason>
      */
     private Collection $reasons;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
+     *
      * @Groups({"docgen:read"})
      */
     private ?Scope $scope = null;
 
     /**
      * @ORM\Column(type="string", options={"default": ""})
+     *
      * @Groups({"docgen:read"})
      */
     private string $sentReceived = '';
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
+     *
      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @var Collection<SocialAction>
      */
     private Collection $socialActions;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
+     *
      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @var Collection<SocialIssue>
      */
     private Collection $socialIssues;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @var Collection<ThirdParty>
      */
     private Collection $thirdParties;
@@ -195,17 +226,20 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     /**
      * @ORM\Column(type="time", nullable=true)
      */
-    private ?DateTime $travelTime = null;
+    private ?\DateTime $travelTime = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @Groups({"docgen:read"})
      */
     private ?User $user = null;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @var Collection<User>
      */
     private Collection $users;
@@ -275,7 +309,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
             $this->socialIssues[] = $socialIssue;
         }
 
-        if ($this->getAccompanyingPeriod() !== null) {
+        if (null !== $this->getAccompanyingPeriod()) {
             $this->getAccompanyingPeriod()->addSocialIssue($socialIssue);
         }
 
@@ -341,7 +375,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->comment;
     }
 
-    public function getDate(): DateTime
+    public function getDate(): \DateTime
     {
         return $this->date;
     }
@@ -363,7 +397,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return (int) round(($this->durationTime->getTimestamp() + $this->durationTime->getOffset()) / 60.0, 0);
     }
 
-    public function getDurationTime(): ?DateTime
+    public function getDurationTime(): ?\DateTime
     {
         return $this->durationTime;
     }
@@ -417,7 +451,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
             // TODO better semantic with:  return $this->persons->filter(...);
             foreach ($this->persons as $person) {
-                if ($this->accompanyingPeriod->getOpenParticipationContainsPerson($person) === null) {
+                if (null === $this->accompanyingPeriod->getOpenParticipationContainsPerson($person)) {
                     $personsNotAssociated[] = $person;
                 }
             }
@@ -476,7 +510,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->thirdParties;
     }
 
-    public function getTravelTime(): ?DateTime
+    public function getTravelTime(): ?\DateTime
     {
         return $this->travelTime;
     }
@@ -587,7 +621,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setDate(DateTime $date): self
+    public function setDate(\DateTime $date): self
     {
         $this->date = $date;
 
@@ -601,7 +635,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setDurationTime(?DateTime $durationTime): self
+    public function setDurationTime(?\DateTime $durationTime): self
     {
         $this->durationTime = $durationTime;
 
@@ -671,7 +705,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setTravelTime(DateTime $travelTime): self
+    public function setTravelTime(\DateTime $travelTime): self
     {
         $this->travelTime = $travelTime;
 
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
index b0154e509..c181b7c6b 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
@@ -18,7 +18,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * Class ActivityPresence.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="activitytpresence")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class ActivityPresence
@@ -30,15 +32,20 @@ class ActivityPresence
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
index 99504f469..90d088f6f 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
@@ -17,7 +17,9 @@ use Doctrine\ORM\Mapping as ORM;
  * Class ActivityReason.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="activityreason")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class ActivityReason
@@ -28,7 +30,6 @@ class ActivityReason
     private bool $active = true;
 
     /**
-     * @var ActivityReasonCategory
      * @ORM\ManyToOne(
      *     targetEntity="Chill\ActivityBundle\Entity\ActivityReasonCategory",
      * inversedBy="reasons")
@@ -36,16 +37,15 @@ class ActivityReason
     private ?ActivityReasonCategory $category = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
     /**
-     * @var array
      * @ORM\Column(type="json")
      */
     private array $name;
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
index 65a414758..64d7f9672 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
@@ -19,7 +19,9 @@ use Doctrine\ORM\Mapping as ORM;
  * Class ActivityReasonCategory.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="activityreasoncategory")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class ActivityReasonCategory implements \Stringable
@@ -30,16 +32,17 @@ class ActivityReasonCategory implements \Stringable
     private bool $active = true;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
     /**
      * @var string
+     *
      * @ORM\Column(type="json")
      */
     private $name;
@@ -48,6 +51,7 @@ class ActivityReasonCategory implements \Stringable
      * Array of ActivityReason.
      *
      * @var Collection<ActivityReason>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\ActivityBundle\Entity\ActivityReason",
      * mappedBy="category")
@@ -62,12 +66,9 @@ class ActivityReasonCategory implements \Stringable
         $this->reasons = new ArrayCollection();
     }
 
-    /**
-     * @return string
-     */
     public function __toString(): string
     {
-        return 'ActivityReasonCategory(' . $this->getName('x') . ')';
+        return 'ActivityReasonCategory('.$this->getName('x').')';
     }
 
     /**
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
index aa6598b0b..c14c8292b 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use InvalidArgumentException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -22,7 +21,9 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
  * Class ActivityType.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="activitytype")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class ActivityType
@@ -35,18 +36,21 @@ class ActivityType
 
     /**
      * @deprecated not in use
+     *
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
     private string $accompanyingPeriodLabel = '';
 
     /**
      * @deprecated not in use
+     *
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
      */
     private int $accompanyingPeriodVisible = self::FIELD_INVISIBLE;
 
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Groups({"read"})
      */
     private bool $active = true;
@@ -118,8 +122,11 @@ class ActivityType
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Groups({"docgen:read"})
      */
     private ?int $id = null;
@@ -136,7 +143,9 @@ class ActivityType
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
@@ -158,6 +167,7 @@ class ActivityType
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     *
      * @Groups({"read"})
      */
     private int $personsVisible = self::FIELD_OPTIONAL;
@@ -238,6 +248,7 @@ class ActivityType
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     *
      * @Groups({"read"})
      */
     private int $thirdPartiesVisible = self::FIELD_INVISIBLE;
@@ -264,6 +275,7 @@ class ActivityType
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     *
      * @Groups({"read"})
      */
     private int $usersVisible = self::FIELD_OPTIONAL;
@@ -372,13 +384,13 @@ class ActivityType
 
     public function getLabel(string $field): ?string
     {
-        $property = $field . 'Label';
+        $property = $field.'Label';
 
         if (!property_exists($this, $property)) {
-            throw new InvalidArgumentException('Field "' . $field . '" not found');
+            throw new \InvalidArgumentException('Field "'.$field.'" not found');
         }
 
-        /** @phpstan-ignore-next-line  */
+        /* @phpstan-ignore-next-line */
         return $this->{$property};
     }
 
@@ -531,25 +543,25 @@ class ActivityType
 
     public function isRequired(string $field): bool
     {
-        $property = $field . 'Visible';
+        $property = $field.'Visible';
 
         if (!property_exists($this, $property)) {
-            throw new InvalidArgumentException('Field "' . $field . '" not found');
+            throw new \InvalidArgumentException('Field "'.$field.'" not found');
         }
 
-        /** @phpstan-ignore-next-line  */
+        /* @phpstan-ignore-next-line */
         return self::FIELD_REQUIRED === $this->{$property};
     }
 
     public function isVisible(string $field): bool
     {
-        $property = $field . 'Visible';
+        $property = $field.'Visible';
 
         if (!property_exists($this, $property)) {
-            throw new InvalidArgumentException('Field "' . $field . '" not found');
+            throw new \InvalidArgumentException('Field "'.$field.'" not found');
         }
 
-        /** @phpstan-ignore-next-line  */
+        /* @phpstan-ignore-next-line */
         return self::FIELD_INVISIBLE !== $this->{$property};
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php b/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
index 2cf6972c7..680a15fa7 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
@@ -15,7 +15,9 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="activitytypecategory")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class ActivityTypeCategory
@@ -27,7 +29,9 @@ class ActivityTypeCategory
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
diff --git a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
index d2ae3bf9b..31fac3be8 100644
--- a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
+++ b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
@@ -15,11 +15,8 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 
-use function in_array;
-
 class ActivityEntityListener
 {
     public function __construct(private readonly EntityManagerInterface $em, private readonly AccompanyingPeriodWorkRepository $workRepository) {}
@@ -31,11 +28,11 @@ class ActivityEntityListener
 
             $accompanyingCourseWorks = $this->workRepository->findByAccompanyingPeriod($period);
             $periodActions = [];
-            $now = new DateTimeImmutable();
+            $now = new \DateTimeImmutable();
 
             foreach ($accompanyingCourseWorks as $key => $work) {
                 // take only the actions which are still opened
-                if ($work->getEndDate() === null || $work->getEndDate() > ($activity->getDate() ?? $now)) {
+                if (null === $work->getEndDate() || $work->getEndDate() > ($activity->getDate() ?? $now)) {
                     $periodActions[$key] = spl_object_hash($work->getSocialAction());
                 }
             }
@@ -44,14 +41,14 @@ class ActivityEntityListener
             $associatedThirdparties = $activity->getThirdParties();
 
             foreach ($activity->getSocialActions() as $action) {
-                if (in_array(spl_object_hash($action), $periodActions, true)) {
+                if (\in_array(spl_object_hash($action), $periodActions, true)) {
                     continue;
                 }
                 $newAction = new AccompanyingPeriodWork();
                 $newAction->setSocialAction($action);
                 $period->addWork($newAction);
 
-                $date = DateTimeImmutable::createFromMutable($activity->getDate());
+                $date = \DateTimeImmutable::createFromMutable($activity->getDate());
                 $newAction->setStartDate($date);
 
                 foreach ($associatedPersons as $person) {
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
index c23db738e..e9e8fb474 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
@@ -27,7 +27,7 @@ class ByActivityNumberAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb
-            ->addSelect('(SELECT COUNT(activity.id) FROM ' . Activity::class . ' activity WHERE activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
+            ->addSelect('(SELECT COUNT(activity.id) FROM '.Activity::class.' activity WHERE activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
             ->addGroupBy('activity_by_number_aggregator');
     }
 
@@ -40,6 +40,7 @@ class ByActivityNumberAggregator implements AggregatorInterface
     {
         // No form needed
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
index 320152008..9282f92e4 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
@@ -17,7 +17,6 @@ use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class BySocialActionAggregator implements AggregatorInterface
 {
@@ -30,7 +29,7 @@ class BySocialActionAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
+        if (!\in_array('actsocialaction', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.socialActions', 'actsocialaction');
         }
 
@@ -47,6 +46,7 @@ class BySocialActionAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
index 240a555b5..bbdadf4d6 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
@@ -17,7 +17,6 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class BySocialIssueAggregator implements AggregatorInterface
 {
@@ -30,7 +29,7 @@ class BySocialIssueAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
+        if (!\in_array('actsocialissue', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.socialIssues', 'actsocialissue');
         }
 
@@ -47,6 +46,7 @@ class BySocialIssueAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityLocationAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityLocationAggregator.php
index 9103943e4..ab07afca7 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityLocationAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityLocationAggregator.php
@@ -12,14 +12,9 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\LocationRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class ActivityLocationAggregator implements AggregatorInterface
 {
@@ -32,7 +27,7 @@ final readonly class ActivityLocationAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actloc', $qb->getAllAliases(), true)) {
+        if (!\in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.location', 'actloc');
         }
         $qb->addSelect(sprintf('actloc.name AS %s', self::KEY));
@@ -48,12 +43,13 @@ final readonly class ActivityLocationAggregator implements AggregatorInterface
     {
         // no form required for this aggregator
     }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
index 4d0ad4ac1..fa658635b 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
@@ -15,10 +15,8 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class ActivityTypeAggregator implements AggregatorInterface
 {
@@ -33,7 +31,7 @@ class ActivityTypeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acttype', $qb->getAllAliases(), true)) {
+        if (!\in_array('acttype', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.activityType', 'acttype');
         }
 
@@ -50,12 +48,13 @@ class ActivityTypeAggregator implements AggregatorInterface
     {
         // no form required for this aggregator
     }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getLabels($key, array $values, $data): \Closure
     {
         // for performance reason, we load data from db only once
         $this->activityTypeRepository->findBy(['id' => $values]);
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
index 79ba09eb9..61452af22 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
@@ -15,7 +15,6 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -48,12 +47,13 @@ class ActivityUserAggregator implements AggregatorInterface
     {
         // nothing to add
     }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, $values, $data): Closure
+    public function getLabels($key, $values, $data): \Closure
     {
         return function ($value) {
             if ('_header' === $value) {
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php
index 3bad88f4e..cc4ab9d14 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class ActivityUsersAggregator implements AggregatorInterface
 {
@@ -30,7 +29,7 @@ class ActivityUsersAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+        if (!\in_array('actusers', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.users', 'actusers');
         }
 
@@ -48,6 +47,7 @@ class ActivityUsersAggregator implements AggregatorInterface
     {
         // nothing to add on the form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php
index af4ed7352..3628206ec 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php
@@ -39,7 +39,7 @@ class ActivityUsersJobAggregator implements AggregatorInterface
         $p = self::PREFIX;
 
         $qb
-            ->leftJoin("activity.users", "{$p}_user")
+            ->leftJoin('activity.users', "{$p}_user")
             ->leftJoin(
                 UserJobHistory::class,
                 "{$p}_history",
@@ -49,10 +49,10 @@ class ActivityUsersJobAggregator implements AggregatorInterface
             // job_at based on activity.date
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", "activity.date"),
+                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
                     $qb->expr()->orX(
                         $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", "activity.date")
+                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
                     )
                 )
             )
@@ -93,7 +93,7 @@ class ActivityUsersJobAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php
index aeb021cf1..bffce629f 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php
@@ -39,7 +39,7 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
         $p = self::PREFIX;
 
         $qb
-            ->leftJoin("activity.users", "{$p}_user")
+            ->leftJoin('activity.users', "{$p}_user")
             ->leftJoin(
                 UserScopeHistory::class,
                 "{$p}_history",
@@ -49,10 +49,10 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
             // scope_at based on activity.date
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", "activity.date"),
+                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
                     $qb->expr()->orX(
                         $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", "activity.date")
+                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
                     )
                 )
             )
@@ -93,7 +93,7 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ByCreatorAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ByCreatorAggregator.php
index 17fdaa7c0..09bdab89e 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ByCreatorAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ByCreatorAggregator.php
@@ -42,6 +42,7 @@ class ByCreatorAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ByThirdpartyAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ByThirdpartyAggregator.php
index 3190c6bda..13224bade 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ByThirdpartyAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ByThirdpartyAggregator.php
@@ -17,7 +17,6 @@ use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class ByThirdpartyAggregator implements AggregatorInterface
 {
@@ -30,7 +29,7 @@ class ByThirdpartyAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acttparty', $qb->getAllAliases(), true)) {
+        if (!\in_array('acttparty', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.thirdParties', 'acttparty');
         }
 
@@ -47,6 +46,7 @@ class ByThirdpartyAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php
index e2357bd7d..6641f0807 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php
@@ -39,7 +39,7 @@ class CreatorScopeAggregator implements AggregatorInterface
         $p = self::PREFIX;
 
         $qb
-            ->leftJoin("activity.createdBy", "{$p}_user")
+            ->leftJoin('activity.createdBy', "{$p}_user")
             ->leftJoin(
                 UserScopeHistory::class,
                 "{$p}_history",
@@ -49,10 +49,10 @@ class CreatorScopeAggregator implements AggregatorInterface
             // scope_at based on activity.date
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", "activity.date"),
+                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
                     $qb->expr()->orX(
                         $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", "activity.date")
+                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
                     )
                 )
             )
@@ -93,7 +93,7 @@ class CreatorScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/DateAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/DateAggregator.php
index f0a02dadd..f7315140e 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/DateAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/DateAggregator.php
@@ -14,10 +14,8 @@ namespace Chill\ActivityBundle\Export\Aggregator;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Doctrine\ORM\QueryBuilder;
-use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class DateAggregator implements AggregatorInterface
 {
@@ -56,7 +54,7 @@ class DateAggregator implements AggregatorInterface
                 break; // order DESC does not works !
 
             default:
-                throw new RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
+                throw new \RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
         }
 
         $qb->addSelect(sprintf("TO_CHAR(activity.date, '%s') AS date_aggregator", $fmt));
@@ -78,6 +76,7 @@ class DateAggregator implements AggregatorInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['frequency' => self::DEFAULT_CHOICE];
@@ -87,7 +86,7 @@ class DateAggregator implements AggregatorInterface
     {
         return static function ($value) use ($data): string {
             if ('_header' === $value) {
-                return 'by ' . $data['frequency'];
+                return 'by '.$data['frequency'];
             }
 
             if (null === $value) {
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/JobScopeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/JobScopeAggregator.php
index 251f67b36..e43f430d5 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/JobScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/JobScopeAggregator.php
@@ -13,7 +13,6 @@ namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\User\UserJobHistory;
-use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -40,7 +39,7 @@ class JobScopeAggregator implements AggregatorInterface
         $p = self::PREFIX;
 
         $qb
-            ->leftJoin("activity.createdBy", "{$p}_user")
+            ->leftJoin('activity.createdBy', "{$p}_user")
             ->leftJoin(
                 UserJobHistory::class,
                 "{$p}_history",
@@ -50,10 +49,10 @@ class JobScopeAggregator implements AggregatorInterface
             // job_at based on activity.date
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", "activity.date"),
+                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
                     $qb->expr()->orX(
                         $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", "activity.date")
+                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
                     )
                 )
             )
@@ -94,7 +93,7 @@ class JobScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/LocationTypeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/LocationTypeAggregator.php
index e302a2569..da2d74f64 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/LocationTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/LocationTypeAggregator.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Repository\LocationTypeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class LocationTypeAggregator implements AggregatorInterface
 {
@@ -30,7 +29,7 @@ class LocationTypeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actloc', $qb->getAllAliases(), true)) {
+        if (!\in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.location', 'actloc');
         }
 
@@ -47,6 +46,7 @@ class LocationTypeAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
index c83738c19..4b1f4894e 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
@@ -17,17 +17,12 @@ use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
-use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-use function count;
-use function in_array;
-
 class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
     public function __construct(protected ActivityReasonCategoryRepository $activityReasonCategoryRepository, protected ActivityReasonRepository $activityReasonRepository, protected TranslatableStringHelper $translatableStringHelper) {}
@@ -47,20 +42,20 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
             $elem = 'actreasoncat.id';
             $alias = 'activity_categories_id';
         } else {
-            throw new RuntimeException('The data provided are not recognized.');
+            throw new \RuntimeException('The data provided are not recognized.');
         }
 
-        $qb->addSelect($elem . ' as ' . $alias);
+        $qb->addSelect($elem.' as '.$alias);
 
         // make a jointure only if needed
-        if (!in_array('actreasons', $qb->getAllAliases(), true)) {
+        if (!\in_array('actreasons', $qb->getAllAliases(), true)) {
             $qb->innerJoin('activity.reasons', 'actreasons');
         }
 
         // join category if necessary
         if ('activity_categories_id' === $alias) {
             // add join only if needed
-            if (!in_array('actreasoncat', $qb->getAllAliases(), true)) {
+            if (!\in_array('actreasoncat', $qb->getAllAliases(), true)) {
                 $qb->join('actreasons.category', 'actreasoncat');
             }
         }
@@ -68,7 +63,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         // add the "group by" part
         $groupBy = $qb->getDQLPart('groupBy');
 
-        if (count($groupBy) > 0) {
+        if (\count($groupBy) > 0) {
             $qb->addGroupBy($alias);
         } else {
             $qb->groupBy($alias);
@@ -96,6 +91,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
             ]
         );
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -106,7 +102,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         match ($data['level']) {
             'reasons' => $this->activityReasonRepository->findBy(['id' => $values]),
             'categories' => $this->activityReasonCategoryRepository->findBy(['id' => $values]),
-            default => throw new RuntimeException(sprintf("The level data '%s' is invalid.", $data['level'])),
+            default => throw new \RuntimeException(sprintf("The level data '%s' is invalid.", $data['level'])),
         };
 
         return function ($value) use ($data) {
@@ -147,7 +143,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
             return ['activity_categories_id'];
         }
 
-        throw new RuntimeException('The data provided are not recognised.');
+        throw new \RuntimeException('The data provided are not recognised.');
     }
 
     public function getTitle()
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
index 379826ba0..774968544 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
@@ -14,7 +14,6 @@ namespace Chill\ActivityBundle\Export\Aggregator;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -42,6 +41,7 @@ class SentReceivedAggregator implements AggregatorInterface
     {
         // No form needed
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -66,7 +66,7 @@ class SentReceivedAggregator implements AggregatorInterface
                     return $this->translator->trans('export.aggregator.activity.by_sent_received.is received');
 
                 default:
-                    throw new LogicException(sprintf('The value %s is not valid', $value));
+                    throw new \LogicException(sprintf('The value %s is not valid', $value));
             }
         };
     }
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
index 352a67014..9cdbc183d 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
@@ -24,7 +24,6 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class AvgActivityDuration implements ExportInterface, GroupedExportInterface
@@ -38,6 +37,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
     }
 
     public function buildForm(FormBuilderInterface $builder) {}
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -61,7 +61,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_activity_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period duration' : $value;
@@ -101,8 +101,8 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
index 4101408cc..58ac6e829 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
@@ -24,7 +24,6 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterface
@@ -41,6 +40,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     {
         // TODO: Implement buildForm() method.
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -64,7 +64,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_activity_visit_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period visit duration' : $value;
@@ -104,8 +104,8 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
index 4926ecc33..39c79cf1f 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
@@ -24,7 +24,6 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountActivity implements ExportInterface, GroupedExportInterface
@@ -38,6 +37,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
     }
 
     public function buildForm(FormBuilderInterface $builder) {}
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -61,7 +61,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_count_activity' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Number of activities linked to an accompanying period' : $value;
@@ -98,8 +98,8 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
index 4d57a31ec..45233d97f 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
@@ -32,6 +32,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
     {
         $this->helper->buildForm($builder);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -44,7 +45,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function getDescription()
     {
-        return ListActivityHelper::MSG_KEY . 'List activities linked to an accompanying course';
+        return ListActivityHelper::MSG_KEY.'List activities linked to an accompanying course';
     }
 
     public function getGroup(): string
@@ -57,12 +58,12 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return match ($key) {
             'acpId' => static function ($value) {
                 if ('_header' === $value) {
-                    return ListActivityHelper::MSG_KEY . 'accompanying course id';
+                    return ListActivityHelper::MSG_KEY.'accompanying course id';
                 }
 
                 return $value ?? '';
             },
-            'scopesNames' => $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, ListActivityHelper::MSG_KEY . 'course circles'),
+            'scopesNames' => $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, ListActivityHelper::MSG_KEY.'course circles'),
             default => $this->helper->getLabels($key, $values, $data),
         };
     }
@@ -86,7 +87,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function getTitle()
     {
-        return ListActivityHelper::MSG_KEY . 'List activity linked to a course';
+        return ListActivityHelper::MSG_KEY.'List activity linked to a course';
     }
 
     public function getType()
@@ -110,7 +111,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
             ->andWhere(
                 $qb->expr()->exists(
                     'SELECT 1
-                    FROM ' . PersonCenterHistory::class . ' acl_count_person_history
+                    FROM '.PersonCenterHistory::class.' acl_count_person_history
                     WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
@@ -127,7 +128,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         // add select for this step
         $qb
             ->addSelect('acp.id AS acpId')
-            ->addSelect('(SELECT AGGREGATE(acpScope.name) FROM ' . Scope::class . ' acpScope WHERE acpScope MEMBER OF acp.scopes) AS scopesNames')
+            ->addSelect('(SELECT AGGREGATE(acpScope.name) FROM '.Scope::class.' acpScope WHERE acpScope MEMBER OF acp.scopes) AS scopesNames')
             ->addGroupBy('scopesNames');
 
         AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
index d9022f10e..a8d6f10fd 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
@@ -24,7 +24,6 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class SumActivityDuration implements ExportInterface, GroupedExportInterface
@@ -41,6 +40,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
     {
         // TODO: Implement buildForm() method.
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -64,7 +64,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_activity_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period duration' : $value;
@@ -104,8 +104,8 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
index 81cbddc8e..dae572ba5 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
@@ -24,7 +24,6 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
@@ -41,6 +40,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     {
         // TODO: Implement buildForm() method.
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -64,7 +64,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_activity_visit_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period visit duration' : $value;
@@ -104,8 +104,8 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
index d24385ea8..dbc7e3fde 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
@@ -19,7 +19,6 @@ use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountActivity implements ExportInterface, GroupedExportInterface
@@ -27,6 +26,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
     public function __construct(protected ActivityRepository $activityRepository) {}
 
     public function buildForm(FormBuilderInterface $builder) {}
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -50,7 +50,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_count_activity' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Number of activities linked to a person' : $value;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
index f31e3faf8..50b8ace2a 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
@@ -20,7 +20,6 @@ use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-use DateTime;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
@@ -30,10 +29,6 @@ use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-use function count;
-use function in_array;
-
 class ListActivity implements ListInterface, GroupedExportInterface
 {
     protected array $fields = [
@@ -61,7 +56,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
             'label' => 'Fields to include in export',
             'constraints' => [new Callback([
                 'callback' => static function ($selected, ExecutionContextInterface $context) {
-                    if (count($selected) === 0) {
+                    if (0 === \count($selected)) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
@@ -70,6 +65,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
             ])],
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -99,7 +95,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         return 'date';
                     }
 
-                    $date = DateTime::createFromFormat('Y-m-d H:i:s', $value);
+                    $date = \DateTime::createFromFormat('Y-m-d H:i:s', $value);
 
                     return $date->format('d-m-Y');
                 };
@@ -123,11 +119,11 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
                     $activity = $activityRepository->find($value);
 
-                    return implode(', ', array_map(fn (ActivityReason $r) => '"' .
+                    return implode(', ', array_map(fn (ActivityReason $r) => '"'.
                             $this->translatableStringHelper->localize($r->getCategory()->getName())
-                            . ' > ' .
+                            .' > '.
                             $this->translatableStringHelper->localize($r->getName())
-                            . '"', $activity->getReasons()->toArray()));
+                            .'"', $activity->getReasons()->toArray()));
                 };
 
             case 'circle_name':
@@ -184,7 +180,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         // throw an error if any fields are present
-        if (!array_key_exists('fields', $data)) {
+        if (!\array_key_exists('fields', $data)) {
             throw new InvalidArgumentException('Any fields have been checked.');
         }
 
@@ -208,7 +204,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
             ->setParameter('centers', $centers);
 
         foreach ($this->fields as $f) {
-            if (in_array($f, $data['fields'], true)) {
+            if (\in_array($f, $data['fields'], true)) {
                 switch ($f) {
                     case 'id':
                         $qb->addSelect('activity.id AS id');
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
index e4ecbc963..6f254bb08 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
@@ -20,7 +20,6 @@ use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
@@ -44,6 +43,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
     ) {}
 
     public function buildForm(FormBuilderInterface $builder) {}
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -60,7 +60,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
             return 'Sum activities linked to a person duration by various parameters.';
         }
 
-        throw new LogicException('this action is not supported: ' . $this->action);
+        throw new \LogicException('this action is not supported: '.$this->action);
     }
 
     public function getGroup(): string
@@ -71,7 +71,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_stat_activity' !== $key) {
-            throw new LogicException(sprintf('The key %s is not used by this export', $key));
+            throw new \LogicException(sprintf('The key %s is not used by this export', $key));
         }
 
         $header = self::SUM === $this->action ? 'Sum activities linked to a person duration' : false;
@@ -95,7 +95,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
             return 'Sum activity linked to a person duration';
         }
 
-        throw new LogicException('This action is not supported: ' . $this->action);
+        throw new \LogicException('This action is not supported: '.$this->action);
     }
 
     public function getType(): string
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php b/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
index ea43d387d..75d2c3fd0 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
@@ -23,10 +23,8 @@ use Chill\PersonBundle\Export\Helper\LabelPersonHelper;
 use Chill\ThirdPartyBundle\Export\Helper\LabelThirdPartyHelper;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use const SORT_NUMERIC;
 
 class ListActivityHelper
 {
@@ -88,7 +86,7 @@ class ListActivityHelper
         return match ($key) {
             'createdAt', 'updatedAt' => $this->dateTimeHelper->getLabel($key),
             'createdBy', 'updatedBy' => $this->userHelper->getLabel($key, $values, $key),
-            'date' => $this->dateTimeHelper->getLabel(self::MSG_KEY . $key),
+            'date' => $this->dateTimeHelper->getLabel(self::MSG_KEY.$key),
             'attendeeName' => function ($value) {
                 if ('_header' === $value) {
                     return 'Attendee';
@@ -112,13 +110,13 @@ class ListActivityHelper
 
                 return $this->translatableStringHelper->localize($type->getName());
             },
-            'usersNames' => $this->userHelper->getLabelMulti($key, $values, self::MSG_KEY . 'users name'),
+            'usersNames' => $this->userHelper->getLabelMulti($key, $values, self::MSG_KEY.'users name'),
             'usersIds', 'thirdPartiesIds', 'personsIds' => static function ($value) use ($key) {
                 if ('_header' === $value) {
                     return match ($key) {
-                        'usersIds' => self::MSG_KEY . 'users ids',
-                        'thirdPartiesIds' => self::MSG_KEY . 'third parties ids',
-                        'personsIds' => self::MSG_KEY . 'persons ids',
+                        'usersIds' => self::MSG_KEY.'users ids',
+                        'thirdPartiesIds' => self::MSG_KEY.'third parties ids',
+                        'personsIds' => self::MSG_KEY.'persons ids',
                     };
                 }
 
@@ -128,15 +126,15 @@ class ListActivityHelper
                     '|',
                     array_unique(
                         array_filter($decoded, static fn (?int $id) => null !== $id),
-                        SORT_NUMERIC
+                        \SORT_NUMERIC
                     )
                 );
             },
-            'personsNames' => $this->labelPersonHelper->getLabelMulti($key, $values, self::MSG_KEY . 'persons name'),
-            'thirdPartiesNames' => $this->labelThirdPartyHelper->getLabelMulti($key, $values, self::MSG_KEY . 'thirds parties'),
+            'personsNames' => $this->labelPersonHelper->getLabelMulti($key, $values, self::MSG_KEY.'persons name'),
+            'thirdPartiesNames' => $this->labelThirdPartyHelper->getLabelMulti($key, $values, self::MSG_KEY.'thirds parties'),
             'sentReceived' => function ($value) {
                 if ('_header' === $value) {
-                    return self::MSG_KEY . 'sent received';
+                    return self::MSG_KEY.'sent received';
                 }
 
                 if (null === $value) {
@@ -147,7 +145,7 @@ class ListActivityHelper
             },
             default => function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return self::MSG_KEY . $key;
+                    return self::MSG_KEY.$key;
                 }
 
                 if (null === $value) {
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
index bfa492fb9..31a29c2eb 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
@@ -37,7 +37,7 @@ class ActivityTypeFilter implements FilterInterface
     {
         $qb->andWhere(
             $qb->expr()->exists(
-                'SELECT 1 FROM ' . Activity::class . ' act_type_filter_activity
+                'SELECT 1 FROM '.Activity::class.' act_type_filter_activity
                 WHERE act_type_filter_activity.activityType IN (:act_type_filter_activity_types) AND act_type_filter_activity.accompanyingPeriod = acp'
             )
         );
@@ -54,13 +54,14 @@ class ActivityTypeFilter implements FilterInterface
         $builder->add('accepted_activitytypes', EntityType::class, [
             'class' => ActivityType::class,
             'choices' => $this->activityTypeRepository->findAllActive(),
-            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
+            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()).' > ' : '')
             .
             $this->translatableStringHelper->localize($aty->getName()),
             'multiple' => true,
             'expanded' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
index 067947b26..13349baa5 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
@@ -18,7 +18,6 @@ use Chill\PersonBundle\Form\Type\PickSocialActionType;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class BySocialActionFilter implements FilterInterface
 {
@@ -31,7 +30,7 @@ class BySocialActionFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
+        if (!\in_array('actsocialaction', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialActions', 'actsocialaction');
         }
 
@@ -55,6 +54,7 @@ class BySocialActionFilter implements FilterInterface
             'multiple' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
index a45253b2c..bef40290e 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
@@ -18,7 +18,6 @@ use Chill\PersonBundle\Form\Type\PickSocialIssueType;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class BySocialIssueFilter implements FilterInterface
 {
@@ -31,7 +30,7 @@ class BySocialIssueFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
+        if (!\in_array('actsocialissue', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialIssues', 'actsocialissue');
         }
 
@@ -55,6 +54,7 @@ class BySocialIssueFilter implements FilterInterface
             'multiple' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php
index ab7331a65..afd708d33 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php
@@ -18,7 +18,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Filter accompanying periods to keep only the one without any activity
+ * Filter accompanying periods to keep only the one without any activity.
  */
 class HasNoActivityFilter implements FilterInterface
 {
@@ -32,7 +32,7 @@ class HasNoActivityFilter implements FilterInterface
         $qb
             ->andWhere('
                 NOT EXISTS (
-                    SELECT 1 FROM ' . Activity::class . ' activity
+                    SELECT 1 FROM '.Activity::class.' activity
                     WHERE activity.accompanyingPeriod = acp
                 )
             ');
@@ -45,8 +45,9 @@ class HasNoActivityFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        //no form needed
+        // no form needed
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php
index 20d0452fa..2d3282ad1 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php
@@ -34,10 +34,10 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
     {
         $builder
             ->add('start_date', PickRollingDateType::class, [
-                'label' => 'export.filter.activity.course_having_activity_between_date.Receiving an activity after'
+                'label' => 'export.filter.activity.course_having_activity_between_date.Receiving an activity after',
             ])
             ->add('end_date', PickRollingDateType::class, [
-                'label' => 'export.filter.activity.course_having_activity_between_date.Receiving an activity before'
+                'label' => 'export.filter.activity.course_having_activity_between_date.Receiving an activity before',
             ]);
     }
 
@@ -45,7 +45,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
     {
         return [
             'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
-            'end_date' => new RollingDate(RollingDate::T_TODAY)
+            'end_date' => new RollingDate(RollingDate::T_TODAY),
         ];
     }
 
@@ -56,7 +56,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
             [
                 'from' => $this->rollingDateConverter->convert($data['start_date']),
                 'to' => $this->rollingDateConverter->convert($data['end_date']),
-            ]
+            ],
         ];
     }
 
@@ -73,7 +73,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
 
         $qb->andWhere(
             $qb->expr()->exists(
-                'SELECT 1 FROM ' . Activity::class . " {$alias} WHERE {$alias}.date >= :{$from} AND {$alias}.date < :{$to} AND {$alias}.accompanyingPeriod = acp"
+                'SELECT 1 FROM '.Activity::class." {$alias} WHERE {$alias}.date >= :{$from} AND {$alias}.date < :{$to} AND {$alias}.accompanyingPeriod = acp"
             )
         );
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
index a572f4a65..a67d0155d 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
@@ -90,14 +90,14 @@ class ActivityDateFilter implements FilterInterface
                 if (null === $date_from) {
                     $form->get('date_from')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')
+                        .'should not be empty')
                     ));
                 }
 
                 if (null === $date_to) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')
+                        .'should not be empty')
                     ));
                 }
 
@@ -108,13 +108,14 @@ class ActivityDateFilter implements FilterInterface
                 ) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This date should be after '
-                            . 'the date given in "Implied in an activity after '
-                            . 'this date" field')
+                            .'the date given in "Implied in an activity after '
+                            .'this date" field')
                     ));
                 }
             }
         });
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
index a0b121c3d..43f9ba0da 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -22,8 +22,6 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-use function count;
-
 class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInterface
 {
     public function __construct(
@@ -54,7 +52,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         $builder->add('types', EntityType::class, [
             'choices' => $this->activityTypeRepository->findAllActive(),
             'class' => ActivityType::class,
-            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
+            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()).' > ' : '')
             .
             $this->translatableStringHelper->localize($aty->getName()),
             'group_by' => function (ActivityType $type) {
@@ -71,6 +69,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
             ],
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -96,7 +95,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
 
     public function validateForm($data, ExecutionContextInterface $context)
     {
-        if (null === $data['types'] || count($data['types']) === 0) {
+        if (null === $data['types'] || 0 === \count($data['types'])) {
             $context
                 ->buildViolation('At least one type must be chosen')
                 ->addViolation();
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
index 5f1b1ee6b..56285c026 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
@@ -32,8 +32,8 @@ class ActivityUsersFilter implements FilterInterface
         $orX = $qb->expr()->orX();
 
         foreach ($data['accepted_users'] as $key => $user) {
-            $orX->add($qb->expr()->isMemberOf(':activity_users_filter_u' . $key, 'activity.users'));
-            $qb->setParameter('activity_users_filter_u' . $key, $user);
+            $orX->add($qb->expr()->isMemberOf(':activity_users_filter_u'.$key, 'activity.users'));
+            $qb->setParameter('activity_users_filter_u'.$key, $user);
         }
 
         $qb->andWhere($orX);
@@ -51,6 +51,7 @@ class ActivityUsersFilter implements FilterInterface
             'label' => 'Users',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php
index 285dc2e44..f75c5a817 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php
@@ -47,6 +47,7 @@ class ByCreatorFilter implements FilterInterface
             'multiple' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
index 43090391e..b74be2552 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
@@ -65,6 +65,7 @@ class EmergencyFilter implements FilterInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['accepted_emergency' => self::DEFAULT_CHOICE];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php
index f5c7b4d16..77b4ce20d 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php
@@ -14,7 +14,6 @@ namespace Chill\ActivityBundle\Export\Filter;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickUserLocationType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -46,6 +45,7 @@ class LocationFilter implements FilterInterface
             'label' => 'pick location',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php
index 8395ff579..771dfca30 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class LocationTypeFilter implements FilterInterface
 {
@@ -31,7 +30,7 @@ class LocationTypeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actloc', $qb->getAllAliases(), true)) {
+        if (!\in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->join('activity.location', 'actloc');
         }
 
@@ -57,9 +56,10 @@ class LocationTypeFilter implements FilterInterface
     {
         $builder->add('accepted_locationtype', PickLocationTypeType::class, [
             'multiple' => true,
-            //'label' => false,
+            // 'label' => false,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
index 6158e2b37..3f71add31 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
@@ -17,16 +17,12 @@ use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-use function count;
-use function in_array;
-
 class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInterface
 {
     public function __construct(protected TranslatableStringHelper $translatableStringHelper, protected ActivityReasonRepository $activityReasonRepository) {}
@@ -42,7 +38,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         $join = $qb->getDQLPart('join');
         $clause = $qb->expr()->in('actreasons', ':selected_activity_reasons');
 
-        if (!in_array('actreasons', $qb->getAllAliases(), true)) {
+        if (!\in_array('actreasons', $qb->getAllAliases(), true)) {
             $qb->join('activity.reasons', 'actreasons');
         }
 
@@ -72,6 +68,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
             'expanded' => false,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -81,7 +78,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
     {
         // collect all the reasons'name used in this filter in one array
         $reasonsNames = array_map(
-            fn (ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
+            fn (ActivityReason $r): string => '"'.$this->translatableStringHelper->localize($r->getName()).'"',
             $this->activityReasonRepository->findBy(['id' => $data['reasons']->toArray()])
         );
 
@@ -100,7 +97,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
 
     public function validateForm($data, ExecutionContextInterface $context)
     {
-        if (null === $data['reasons'] || count($data['reasons']) === 0) {
+        if (null === $data['reasons'] || 0 === \count($data['reasons'])) {
             $context
                 ->buildViolation('At least one reason must be chosen')
                 ->addViolation();
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
index 9cf6fa281..eb2312c0e 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
@@ -49,11 +49,11 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
 
         // add clause between date
         $sqb->where('activity_person_having_activity.date BETWEEN '
-            . ':person_having_activity_between_date_from'
-            . ' AND '
-            . ':person_having_activity_between_date_to'
-            . ' AND '
-            . '(person_person_having_activity.id = person.id OR person MEMBER OF activity_person_having_activity.persons)');
+            .':person_having_activity_between_date_from'
+            .' AND '
+            .':person_having_activity_between_date_to'
+            .' AND '
+            .'(person_person_having_activity.id = person.id OR person MEMBER OF activity_person_having_activity.persons)');
 
         if (isset($data['reasons']) && [] !== $data['reasons']) {
             // add clause activity reason
@@ -111,6 +111,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
             ]);
         }
     }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -132,7 +133,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
                 'reasons' => implode(
                     ', ',
                     array_map(
-                        fn (ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
+                        fn (ActivityReason $r): string => '"'.$this->translatableStringHelper->localize($r->getName()).'"',
                         $data['reasons']
                     )
                 ),
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
index c93158f2f..640f33592 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
@@ -66,6 +66,7 @@ class SentReceivedFilter implements FilterInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['accepted_sentreceived' => self::DEFAULT_CHOICE];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php
index 5fd08020e..6e6b745b9 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php
@@ -56,6 +56,7 @@ class UserFilter implements FilterInterface
             'label' => 'Creators',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/UserScopeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/UserScopeFilter.php
index d33ae1a10..d205e2d30 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UserScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UserScopeFilter.php
@@ -39,7 +39,7 @@ class UserScopeFilter implements FilterInterface
         $p = self::PREFIX;
 
         $qb
-            ->leftJoin("activity.user", "{$p}_user")  // createdBy ? cfr translation
+            ->leftJoin('activity.user', "{$p}_user")  // createdBy ? cfr translation
             ->leftJoin(
                 UserScopeHistory::class,
                 "{$p}_history",
@@ -49,10 +49,10 @@ class UserScopeFilter implements FilterInterface
             // scope_at based on activity.date
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", "activity.date"),
+                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
                     $qb->expr()->orX(
                         $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", "activity.date")
+                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
                     )
                 )
             )
@@ -61,7 +61,7 @@ class UserScopeFilter implements FilterInterface
             )
             ->setParameter(
                 "{$p}_scopes",
-                $data["scopes"],
+                $data['scopes'],
             );
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
index d787f30ea..b65994b9d 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
@@ -41,19 +41,19 @@ class UsersJobFilter implements FilterInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    "SELECT 1 FROM " . Activity::class . " {$p}_act "
-                    . "JOIN {$p}_act.users {$p}_user "
-                    . "JOIN " . UserJobHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user "
-                    . "WHERE {$p}_act = activity "
+                    'SELECT 1 FROM '.Activity::class." {$p}_act "
+                    ."JOIN {$p}_act.users {$p}_user "
+                    .'JOIN '.UserJobHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
+                    ."WHERE {$p}_act = activity "
                     // job_at based on activity.date
-                    . "AND {$p}_history.startDate <= activity.date "
-                    . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > activity.date) "
-                    . "AND {$p}_history.job IN ( :{$p}_jobs )"
+                    ."AND {$p}_history.startDate <= activity.date "
+                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > activity.date) "
+                    ."AND {$p}_history.job IN ( :{$p}_jobs )"
                 )
             )
             ->setParameter(
                 "{$p}_jobs",
-                $data["jobs"]
+                $data['jobs']
             );
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
index a1bcb958b..4c4a83c20 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
@@ -43,19 +43,19 @@ class UsersScopeFilter implements FilterInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    "SELECT 1 FROM " . Activity::class . " {$p}_act "
-                    . "JOIN {$p}_act.users {$p}_user "
-                    . "JOIN " . UserScopeHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user "
-                    . "WHERE {$p}_act = activity "
+                    'SELECT 1 FROM '.Activity::class." {$p}_act "
+                    ."JOIN {$p}_act.users {$p}_user "
+                    .'JOIN '.UserScopeHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
+                    ."WHERE {$p}_act = activity "
                     // scope_at based on activity.date
-                    . "AND {$p}_history.startDate <= activity.date "
-                    . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > activity.date) "
-                    . "AND {$p}_history.scope IN ( :{$p}_scopes )"
+                    ."AND {$p}_history.startDate <= activity.date "
+                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > activity.date) "
+                    ."AND {$p}_history.scope IN ( :{$p}_scopes )"
                 )
             )
             ->setParameter(
                 "{$p}_scopes",
-                $data["scopes"]
+                $data['scopes']
             );
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 89167219e..8ea117c4a 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -34,12 +34,8 @@ use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateInterval;
-use DateTime;
-use DateTimeZone;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectManager;
-use RuntimeException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
@@ -53,8 +49,6 @@ use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
-use function in_array;
-
 class ActivityType extends AbstractType
 {
     protected User $user;
@@ -69,7 +63,7 @@ class ActivityType extends AbstractType
         protected SocialActionRender $socialActionRender
     ) {
         if (!$tokenStorage->getToken()->getUser() instanceof User) {
-            throw new RuntimeException('you should have a valid user');
+            throw new \RuntimeException('you should have a valid user');
         }
 
         $this->user = $tokenStorage->getToken()->getUser();
@@ -102,16 +96,16 @@ class ActivityType extends AbstractType
             ]);
         }
 
-        /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
+        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod|null $accompanyingPeriod */
         $accompanyingPeriod = null;
 
         if ($options['accompanyingPeriod'] instanceof AccompanyingPeriod) {
             $accompanyingPeriod = $options['accompanyingPeriod'];
         }
 
-        if ($activityType->isVisible('socialIssues') && $accompanyingPeriod) {
+        if ($activityType->isVisible('socialIssues') && null !== $accompanyingPeriod) {
             $builder->add('socialIssues', HiddenType::class, [
-                'required' => $activityType->getSocialIssuesVisible() === 2,
+                'required' => 2 === $activityType->getSocialIssuesVisible(),
             ]);
             $builder->get('socialIssues')
                 ->addModelTransformer(new CallbackTransformer(
@@ -137,9 +131,9 @@ class ActivityType extends AbstractType
                 ));
         }
 
-        if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
+        if ($activityType->isVisible('socialActions') && null !== $accompanyingPeriod) {
             $builder->add('socialActions', HiddenType::class, [
-                'required' => $activityType->getSocialActionsVisible() === 2,
+                'required' => 2 === $activityType->getSocialActionsVisible(),
             ]);
             $builder->get('socialActions')
                 ->addModelTransformer(new CallbackTransformer(
@@ -323,7 +317,7 @@ class ActivityType extends AbstractType
 
         if ($activityType->isVisible('location')) {
             $builder->add('location', HiddenType::class, [
-                'required' => $activityType->getLocationVisible() === 2,
+                'required' => 2 === $activityType->getLocationVisible(),
             ])
                 ->get('location')
                 ->addModelTransformer(new CallbackTransformer(
@@ -374,16 +368,16 @@ class ActivityType extends AbstractType
                 ) {
                     // set the timezone to GMT, and fix the difference between current and GMT
                     // the datetimetransformer will then handle timezone as GMT
-                    $timezoneUTC = new DateTimeZone('GMT');
-                    /** @var DateTime $data */
-                    $data = $formEvent->getData() ?? DateTime::createFromFormat('U', '300');
+                    $timezoneUTC = new \DateTimeZone('GMT');
+                    /** @var \DateTime $data */
+                    $data = $formEvent->getData() ?? \DateTime::createFromFormat('U', '300');
                     $seconds = $data->getTimezone()->getOffset($data);
                     $data->setTimeZone($timezoneUTC);
-                    $data->add(new DateInterval('PT' . $seconds . 'S'));
+                    $data->add(new \DateInterval('PT'.$seconds.'S'));
 
                     // test if the timestamp is in the choices.
                     // If not, recreate the field with the new timestamp
-                    if (!in_array($data->getTimestamp(), $timeChoices, true)) {
+                    if (!\in_array($data->getTimestamp(), $timeChoices, true)) {
                         // the data are not in the possible values. add them
                         $timeChoices[$data->format('H:i')] = $data->getTimestamp();
                         $form = $builder->create($fieldName, ChoiceType::class, array_merge(
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
index 29b00e337..8e8ae51f7 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -56,8 +56,8 @@ class ActivityTypeType extends AbstractType
 
         foreach ($fields as $field) {
             $builder
-                ->add($field . 'Visible', ActivityFieldPresence::class)
-                ->add($field . 'Label', TextType::class, [
+                ->add($field.'Visible', ActivityFieldPresence::class)
+                ->add($field.'Label', TextType::class, [
                     'required' => false,
                     'empty_data' => '',
                 ]);
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php
index f04e6ac45..ee1417bfb 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php
@@ -31,7 +31,7 @@ class TranslatableActivityReasonCategoryType extends AbstractType
             [
                 'class' => ActivityReasonCategory::class,
                 'choice_label' => fn (ActivityReasonCategory $category) => $this->translatableStringHelper->localize($category->getName())
-                    . (!$category->getActive() ? ' (' . $this->translator->trans('inactive') . ')' : ''),
+                    .(!$category->getActive() ? ' ('.$this->translator->trans('inactive').')' : ''),
             ]
         );
     }
diff --git a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
index de789b9fe..8eb219fd2 100644
--- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
+++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
@@ -35,6 +35,6 @@ final readonly class ActivityNotificationHandler implements NotificationHandlerI
 
     public function supports(Notification $notification, array $options = []): bool
     {
-        return $notification->getRelatedEntityClass() === Activity::class;
+        return Activity::class === $notification->getRelatedEntityClass();
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
index d61e0999e..231ad5432 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -35,9 +35,6 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Security;
 
-use function count;
-use function in_array;
-
 final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInterface
 {
     public function __construct(
@@ -75,7 +72,6 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
         return $qb->getQuery()->getSingleScalarResult();
     }
 
-
     public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, array $orderBy = ['date' => 'DESC'], array $filters = []): array
     {
         $qb = $this->buildBaseQuery($filters);
@@ -83,7 +79,7 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
         $qb->andWhere('a.accompanyingPeriod = :period')->setParameter('period', $period);
 
         foreach ($orderBy as $field => $order) {
-            $qb->addOrderBy('a.' . $field, $order);
+            $qb->addOrderBy('a.'.$field, $order);
         }
 
         if (null !== $start) {
@@ -124,25 +120,25 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
                     $qb->expr()->orX(
                         $qb->expr()->exists(
                             sprintf(
-                                "SELECT 1 FROM %s ujh_creator WHERE ujh_creator.user = a.createdBy "
-                                . "AND ujh_creator.job IN (:jobs) AND a.createdAt > ujh_creator.startDate "
-                                . "AND (ujh_creator.endDate IS NULL or ujh_creator.endDate > a.date)",
+                                'SELECT 1 FROM %s ujh_creator WHERE ujh_creator.user = a.createdBy '
+                                .'AND ujh_creator.job IN (:jobs) AND a.createdAt > ujh_creator.startDate '
+                                .'AND (ujh_creator.endDate IS NULL or ujh_creator.endDate > a.date)',
                                 User\UserJobHistory::class
                             )
                         ),
                         $qb->expr()->exists(
                             sprintf(
-                                "SELECT 1 FROM %s ujh_u WHERE ujh_u.user = a.user "
-                                . "AND ujh_u.job IN (:jobs) AND a.createdAt > ujh_u.startDate "
-                                . "AND (ujh_u.endDate IS NULL or ujh_u.endDate > a.date)",
+                                'SELECT 1 FROM %s ujh_u WHERE ujh_u.user = a.user '
+                                .'AND ujh_u.job IN (:jobs) AND a.createdAt > ujh_u.startDate '
+                                .'AND (ujh_u.endDate IS NULL or ujh_u.endDate > a.date)',
                                 User\UserJobHistory::class
                             )
                         ),
                         $qb->expr()->exists(
                             sprintf(
-                                "SELECT 1 FROM %s ujh_users WHERE ujh_users.user MEMBER OF a.users "
-                                . "AND ujh_users.job IN (:jobs) AND a.createdAt > ujh_users.startDate "
-                                . "AND (ujh_users.endDate IS NULL or ujh_users.endDate > a.date)",
+                                'SELECT 1 FROM %s ujh_users WHERE ujh_users.user MEMBER OF a.users '
+                                .'AND ujh_users.job IN (:jobs) AND a.createdAt > ujh_users.startDate '
+                                .'AND (ujh_users.endDate IS NULL or ujh_users.endDate > a.date)',
                                 User\UserJobHistory::class
                             )
                         ),
@@ -163,7 +159,6 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
     }
 
     /**
-     * @param AccompanyingPeriod|Person $associated
      * @return array<ActivityType>
      */
     public function findActivityTypeByAssociated(AccompanyingPeriod|Person $associated): array
@@ -225,7 +220,6 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
         return $qb->getQuery()->getResult();
     }
 
-
     public function findByAccompanyingPeriodSimplified(AccompanyingPeriod $period, ?int $limit = 1000): array
     {
         $rsm = new ResultSetMappingBuilder($this->em);
@@ -313,7 +307,7 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
         $qb = $this->filterBaseQueryByPerson($qb, $person, $role);
 
         foreach ($orderBy as $field => $direction) {
-            $qb->addOrderBy('a.' . $field, $direction);
+            $qb->addOrderBy('a.'.$field, $direction);
         }
 
         if (null !== $start) {
@@ -340,7 +334,7 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
             $orX->add(sprintf('a.person = :person AND a.scope IN (:scopes_%d)', $counter));
             $qb->setParameter(sprintf('scopes_%d', $counter), $scopes);
             $qb->setParameter('person', $person);
-            $counter++;
+            ++$counter;
         }
 
         foreach ($person->getAccompanyingPeriodParticipations() as $participation) {
@@ -363,7 +357,7 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
                     ->setParameter(sprintf('participation_end_%d', $counter), $participation->getEndDate());
             }
             $orX->add($and);
-            $counter++;
+            ++$counter;
         }
 
         if (0 === $orX->count()) {
@@ -384,10 +378,10 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
 
         return [
             'id' => $metadataActivity->getTableName()
-                 . '.' . $metadataActivity->getColumnName('id'),
+                 .'.'.$metadataActivity->getColumnName('id'),
             'type' => 'activity',
             'date' => $metadataActivity->getTableName()
-                 . '.' . $metadataActivity->getColumnName('date'),
+                 .'.'.$metadataActivity->getColumnName('date'),
             'FROM' => $from,
             'WHERE' => $where,
             'parameters' => $parameters,
@@ -400,12 +394,12 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
         $metadataPerson = $this->em->getClassMetadata(Person::class);
         $associationMapping = $metadataActivity->getAssociationMapping('person');
 
-        return $metadataActivity->getTableName() . ' JOIN '
-            . $metadataPerson->getTableName() . ' ON '
-            . $metadataPerson->getTableName() . '.' .
+        return $metadataActivity->getTableName().' JOIN '
+            .$metadataPerson->getTableName().' ON '
+            .$metadataPerson->getTableName().'.'.
                 $associationMapping['joinColumns'][0]['referencedColumnName']
-            . ' = '
-            . $associationMapping['joinColumns'][0]['name'];
+            .' = '
+            .$associationMapping['joinColumns'][0]['name'];
     }
 
     private function getWhereClause(string $context, array $args): array
@@ -424,7 +418,7 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
             ActivityVoter::SEE
         );
 
-        if (count($reachableCenters) === 0) {
+        if (0 === \count($reachableCenters)) {
             // insert a dummy condition
             return 'FALSE = TRUE';
         }
@@ -441,7 +435,7 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
 
         foreach ($reachableCenters as $center) {
             // we pass if not in centers
-            if (!in_array($center, $args['centers'], true)) {
+            if (!\in_array($center, $args['centers'], true)) {
                 continue;
             }
             // we get all the reachable scopes for this center
@@ -463,7 +457,7 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
 
             // begin loop for scopes
             $where .= ' AND (';
-            $scopesI = 0; //like scope#i
+            $scopesI = 0; // like scope#i
 
             foreach ($reachablesScopesId as $scopeId) {
                 if (0 < $scopesI) {
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
index 474d8ad16..7c51afd63 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
@@ -22,8 +22,8 @@ interface ActivityACLAwareRepositoryInterface
     /**
      * Return all the activities associated to an accompanying period and that the user is allowed to apply the given role.
      *
-     *
      * @param array{my_activities?: bool, types?: array<ActivityType>, jobs?: array<UserJob>, after?: \DateTimeImmutable|null, before?: \DateTimeImmutable|null} $filters
+     *
      * @return array<Activity>
      */
     public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, array $orderBy = ['date' => 'DESC'], array $filters = []): array;
@@ -49,20 +49,20 @@ interface ActivityACLAwareRepositoryInterface
 
     /**
      * @param array{my_activities?: bool, types?: array<ActivityType>, jobs?: array<UserJob>, after?: \DateTimeImmutable|null, before?: \DateTimeImmutable|null} $filters
+     *
      * @return array<Activity>
      */
     public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, array $orderBy = ['date' => 'DESC'], array $filters = []): array;
 
-
     /**
-     * Return a list of the type for the activities associated to person or accompanying period
+     * Return a list of the type for the activities associated to person or accompanying period.
      *
      * @return array<ActivityType>
      */
     public function findActivityTypeByAssociated(AccompanyingPeriod|Person $associated): array;
 
     /**
-     * Return a list of the user job for the activities associated to person or accompanying period
+     * Return a list of the user job for the activities associated to person or accompanying period.
      *
      * Associated mean the job:
      * - of the creator;
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php
index 9cc57f93f..99e75f2da 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php
@@ -15,25 +15,15 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\ActivityBundle\Service\GenericDoc\Providers\AccompanyingPeriodActivityGenericDocProvider;
 use Chill\ActivityBundle\Service\GenericDoc\Providers\PersonActivityGenericDocProvider;
-use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\GenericDoc\FetchQuery;
 use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
-use Chill\DocStoreBundle\GenericDoc\Providers\PersonDocumentGenericDocProvider;
-use Chill\DocStoreBundle\Repository\PersonDocumentACLAwareRepositoryInterface;
-use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Mapping\MappingException;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\HttpKernel\HttpCache\Store;
 use Symfony\Component\Security\Core\Security;
 
 final readonly class ActivityDocumentACLAwareRepository implements ActivityDocumentACLAwareRepositoryInterface
@@ -45,14 +35,14 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
         private Security $security
     ) {}
 
-    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface
+    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface
     {
         $query = $this->buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext($person, $startDate, $endDate, $content);
 
         return $this->addFetchQueryByPersonACL($query, $person);
     }
 
-    public function buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
+    public function buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
         $activityMetadata = $this->em->getClassMetadata(Activity::class);
@@ -81,7 +71,7 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
         return $this->addWhereClauses($query, $startDate, $endDate, $content);
     }
 
-    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
+    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
         $activityMetadata = $this->em->getClassMetadata(Activity::class);
@@ -116,8 +106,8 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
                 $storedObjectMetadata->getColumnName('createdAt')
             );
             $orParams = [...$orParams, $participation->getAccompanyingPeriod()->getId(),
-                DateTimeImmutable::createFromInterface($participation->getStartDate()),
-                null === $participation->getEndDate() ? null : DateTimeImmutable::createFromInterface($participation->getEndDate())];
+                \DateTimeImmutable::createFromInterface($participation->getStartDate()),
+                null === $participation->getEndDate() ? null : \DateTimeImmutable::createFromInterface($participation->getEndDate())];
             $orTypes = [...$orTypes, Types::INTEGER, Types::DATE_IMMUTABLE, Types::DATE_IMMUTABLE];
         }
 
@@ -132,7 +122,7 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
         return $this->addWhereClauses($query, $startDate, $endDate, $content);
     }
 
-    private function addWhereClauses(FetchQuery $query, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
+    private function addWhereClauses(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
 
@@ -155,7 +145,7 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
         if (null !== $content and '' !== $content) {
             $query->addWhereClause(
                 'stored_obj.title ilike ?',
-                ['%' . $content . '%'],
+                ['%'.$content.'%'],
                 [Types::STRING]
             );
         }
@@ -172,7 +162,7 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
         foreach ($this->centerResolverManager->resolveCenters($person) as $center) {
             $reachableScopes = [
                 ...$reachableScopes,
-                ...$this->authorizationHelperForCurrentUser->getReachableScopes(ActivityVoter::SEE, $center)
+                ...$this->authorizationHelperForCurrentUser->getReachableScopes(ActivityVoter::SEE, $center),
             ];
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepositoryInterface.php
index 9f4a9c0f8..dcd45c016 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepositoryInterface.php
@@ -14,24 +14,23 @@ namespace Chill\ActivityBundle\Repository;
 use Chill\DocStoreBundle\GenericDoc\FetchQuery;
 use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 
 /**
- * Gives queries usable for fetching documents, with ACL aware
+ * Gives queries usable for fetching documents, with ACL aware.
  */
 interface ActivityDocumentACLAwareRepositoryInterface
 {
     /**
-     * Return a fetch query for querying document's activities for a person
+     * Return a fetch query for querying document's activities for a person.
      *
      * This method must check the rights to see a document: the user must be allowed to see the given activities
      */
-    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface;
+    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface;
 
     /**
-     * Return a fetch query for querying document's activities for an activity in accompanying periods, but for a given person
+     * Return a fetch query for querying document's activities for an activity in accompanying periods, but for a given person.
      *
      * This method must check the rights to see a document: the user must be allowed to see the given accompanying periods
      */
-    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery;
+    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery;
 }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepository.php
index 3ed96074b..ae3296e7f 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepository.php
@@ -34,7 +34,7 @@ class ActivityPresenceRepository implements ActivityPresenceRepositoryInterface
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepositoryInterface.php
index 228d70856..d2daa1d5d 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepositoryInterface.php
@@ -25,7 +25,7 @@ interface ActivityPresenceRepositoryInterface
     /**
      * @return array|ActivityPresence[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?ActivityPresence;
 
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
index 5a6e16cd5..a7025d4a9 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
@@ -62,7 +62,7 @@ class ActivityRepository extends ServiceEntityRepository
             ->setParameter('period', $period);
 
         foreach ($orderBy as $k => $dir) {
-            $qb->addOrderBy('a.' . $k, $dir);
+            $qb->addOrderBy('a.'.$k, $dir);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
@@ -90,7 +90,7 @@ class ActivityRepository extends ServiceEntityRepository
             ->setParameter('person', $person);
 
         foreach ($orderBy as $k => $dir) {
-            $qb->addOrderBy('a.' . $k, $dir);
+            $qb->addOrderBy('a.'.$k, $dir);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
index 49d3e2cd7..6f7453a74 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
@@ -11,13 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Repository;
 
-use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query\Expr\Join;
 
 final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
 {
@@ -52,7 +48,7 @@ final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
     /**
      * @return array|ActivityType[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php
index 574faea22..899535ad6 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php
@@ -12,8 +12,6 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
 use Doctrine\Persistence\ObjectRepository;
 
 interface ActivityTypeRepositoryInterface extends ObjectRepository
diff --git a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
index 06cbb7145..bf2ed78a0 100644
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
@@ -21,12 +21,9 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use RuntimeException;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Security;
 
-use function in_array;
-
 class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
     /**
@@ -145,11 +142,11 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
                     return $this->voterHelper->voteOnAttribute(self::CREATE_ACCOMPANYING_COURSE, $subject->getAccompanyingPeriod(), $token);
                 }
             } else {
-                throw new RuntimeException('Could not determine context of activity.');
+                throw new \RuntimeException('Could not determine context of activity.');
             }
         } elseif ($subject instanceof AccompanyingPeriod) {
             if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
-                if (in_array($attribute, [self::UPDATE, self::CREATE, self::DELETE], true)) {
+                if (\in_array($attribute, [self::UPDATE, self::CREATE, self::DELETE], true)) {
                     return false;
                 }
             }
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index f508d215a..46e466ae1 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -18,7 +18,6 @@ use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
 use Chill\DocStoreBundle\Entity\StoredObject;
-use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
@@ -127,7 +126,7 @@ class ActivityContext implements
                     'multiple' => false,
                     'required' => false,
                     'expanded' => true,
-                    'label' => $options[$key . 'Label'],
+                    'label' => $options[$key.'Label'],
                     'placeholder' => $this->translator->trans('Any person selected'),
                 ]);
             }
@@ -210,7 +209,7 @@ class ActivityContext implements
         if ($options['thirdParty']) {
             $data['thirdParty'] = $this->normalizer->normalize($contextGenerationData['thirdParty'], 'docgen', [
                 'docgen:expects' => ThirdParty::class,
-                'groups' => 'docgen:read'
+                'groups' => 'docgen:read',
             ]);
         }
 
@@ -253,7 +252,7 @@ class ActivityContext implements
     {
         $options = $template->getOptions();
 
-        return $options['mainPerson'] || $options['person1'] || $options['person2'] || $options ['thirdParty'];
+        return $options['mainPerson'] || $options['person1'] || $options['person2'] || $options['thirdParty'];
     }
 
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
index 2a953eebd..221d1f4b2 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
@@ -32,13 +32,11 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Service\DocGenerator\AccompanyingPeriodContext;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use DateTime;
 use libphonenumber\PhoneNumber;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use function in_array;
 
 /**
  * @implements DocGeneratorContextWithPublicFormInterface<AccompanyingPeriod>
@@ -122,7 +120,8 @@ class ListActivitiesByAccompanyingPeriodContext implements
                 $activities,
                 function ($activity) use ($user) {
                     $activityUsernames = array_map(static fn ($user) => $user['username'], $activity['users'] ?? []);
-                    return in_array($user->getUsername(), $activityUsernames, true);
+
+                    return \in_array($user->getUsername(), $activityUsernames, true);
                 }
             )
         );
@@ -139,7 +138,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
                 function ($work) use ($user) {
                     $workUsernames = array_map(static fn ($user) => $user['username'], $work['referrers'] ?? []);
 
-                    return in_array($user->getUsername(), $workUsernames, true);
+                    return \in_array($user->getUsername(), $workUsernames, true);
                 }
             )
         );
@@ -163,6 +162,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
         if ($myWorksOnly && isset($contextGenerationData['creator'])) {
             $data['course']['works'] = $this->filterWorksByUser($data['course']['works'], $contextGenerationData['creator']);
         }
+
         return $data;
     }
 
@@ -216,7 +216,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
             $activity = $row[0];
 
             $activity['date'] = $this->normalizer->normalize($activity['date'], 'docgen', [
-                AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => DateTime::class,
+                AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => \DateTime::class,
             ]);
 
             if (null === $activity['location']) {
@@ -229,8 +229,8 @@ class ListActivitiesByAccompanyingPeriodContext implements
                 $activity['location']['type'] = 'location';
 
                 foreach (['1', '2'] as $key) {
-                    $activity['location']['phonenumber' . $key] = $this->normalizer->normalize(
-                        $activity['location']['phonenumber' . $key],
+                    $activity['location']['phonenumber'.$key] = $this->normalizer->normalize(
+                        $activity['location']['phonenumber'.$key],
                         'docgen',
                         [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => PhoneNumber::class]
                     );
diff --git a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/AccompanyingPeriodActivityGenericDocProvider.php b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/AccompanyingPeriodActivityGenericDocProvider.php
index e85710797..2c6c9a691 100644
--- a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/AccompanyingPeriodActivityGenericDocProvider.php
+++ b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/AccompanyingPeriodActivityGenericDocProvider.php
@@ -22,10 +22,8 @@ use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Mapping\MappingException;
 use Symfony\Component\Security\Core\Security;
 
 final readonly class AccompanyingPeriodActivityGenericDocProvider implements GenericDocForAccompanyingPeriodProviderInterface, GenericDocForPersonProviderInterface
@@ -38,7 +36,7 @@ final readonly class AccompanyingPeriodActivityGenericDocProvider implements Gen
         private ActivityDocumentACLAwareRepositoryInterface $activityDocumentACLAwareRepository,
     ) {}
 
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
         $activityMetadata = $this->em->getClassMetadata(Activity::class);
@@ -83,7 +81,7 @@ final readonly class AccompanyingPeriodActivityGenericDocProvider implements Gen
         if (null !== $content) {
             $query->addWhereClause(
                 'doc_obj.title ilike ?',
-                ['%' . $content . '%'],
+                ['%'.$content.'%'],
                 [Types::STRING]
             );
         }
@@ -91,10 +89,6 @@ final readonly class AccompanyingPeriodActivityGenericDocProvider implements Gen
         return $query;
     }
 
-    /**
-     * @param AccompanyingPeriod $accompanyingPeriod
-     * @return bool
-     */
     public function isAllowedForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): bool
     {
         return $this->security->isGranted(ActivityVoter::SEE, $accompanyingPeriod);
@@ -105,7 +99,7 @@ final readonly class AccompanyingPeriodActivityGenericDocProvider implements Gen
         return $this->security->isGranted(AccompanyingPeriodVoter::SEE, $person);
     }
 
-    public function buildFetchQueryForPerson(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
     {
         return $this->activityDocumentACLAwareRepository
             ->buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext($person, $startDate, $endDate, $content);
diff --git a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/PersonActivityGenericDocProvider.php b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/PersonActivityGenericDocProvider.php
index f4a7c4afa..b84345375 100644
--- a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/PersonActivityGenericDocProvider.php
+++ b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/PersonActivityGenericDocProvider.php
@@ -11,15 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Service\GenericDoc\Providers;
 
-use Chill\ActivityBundle\Repository\ActivityDocumentACLAwareRepository;
 use Chill\ActivityBundle\Repository\ActivityDocumentACLAwareRepositoryInterface;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
 use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
-use Chill\DocStoreBundle\Repository\PersonDocumentACLAwareRepositoryInterface;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
-use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Security;
 
 final readonly class PersonActivityGenericDocProvider implements GenericDocForPersonProviderInterface
@@ -27,11 +23,11 @@ final readonly class PersonActivityGenericDocProvider implements GenericDocForPe
     public const KEY = 'person_activity_document';
 
     public function __construct(
-        private Security                                    $security,
+        private Security $security,
         private ActivityDocumentACLAwareRepositoryInterface $personActivityDocumentACLAwareRepository,
     ) {}
 
-    public function buildFetchQueryForPerson(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
     {
         return $this->personActivityDocumentACLAwareRepository->buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(
             $person,
@@ -41,10 +37,6 @@ final readonly class PersonActivityGenericDocProvider implements GenericDocForPe
         );
     }
 
-    /**
-     * @param Person $person
-     * @return bool
-     */
     public function isAllowedForPerson(Person $person): bool
     {
         return $this->security->isGranted(ActivityVoter::SEE, $person);
diff --git a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Renderers/AccompanyingPeriodActivityGenericDocRenderer.php b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Renderers/AccompanyingPeriodActivityGenericDocRenderer.php
index 4cfefd05d..93649cea8 100644
--- a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Renderers/AccompanyingPeriodActivityGenericDocRenderer.php
+++ b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Renderers/AccompanyingPeriodActivityGenericDocRenderer.php
@@ -17,7 +17,6 @@ use Chill\ActivityBundle\Service\GenericDoc\Providers\PersonActivityGenericDocPr
 use Chill\DocStoreBundle\GenericDoc\GenericDocDTO;
 use Chill\DocStoreBundle\GenericDoc\Twig\GenericDocRendererInterface;
 use Chill\DocStoreBundle\Repository\StoredObjectRepository;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 final readonly class AccompanyingPeriodActivityGenericDocRenderer implements GenericDocRendererInterface
 {
@@ -25,7 +24,7 @@ final readonly class AccompanyingPeriodActivityGenericDocRenderer implements Gen
 
     public function supports(GenericDocDTO $genericDocDTO, $options = []): bool
     {
-        return $genericDocDTO->key === AccompanyingPeriodActivityGenericDocProvider::KEY || $genericDocDTO->key === PersonActivityGenericDocProvider::KEY;
+        return AccompanyingPeriodActivityGenericDocProvider::KEY === $genericDocDTO->key || PersonActivityGenericDocProvider::KEY === $genericDocDTO->key;
     }
 
     public function getTemplate(GenericDocDTO $genericDocDTO, $options = []): string
diff --git a/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php b/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
index c60a8d286..aa7783d2d 100644
--- a/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
+++ b/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Templating\Entity;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Chill\MainBundle\Templating\Entity\BoxUtilsChillEntityRenderTrait;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -38,21 +37,21 @@ class ActivityReasonRender implements ChillEntityRenderInterface
     public function renderBox($entity, array $options): string
     {
         return
-            $this->getDefaultOpeningBox('activity-reason') .
-            '<span class="badge bg-chill-pink">' .
-            '<i class="fa fa-question-circle"></i>&nbsp;' .
-            '<span class="category">' .
+            $this->getDefaultOpeningBox('activity-reason').
+            '<span class="badge bg-chill-pink">'.
+            '<i class="fa fa-question-circle"></i>&nbsp;'.
+            '<span class="category">'.
             $this->translatableStringHelper->localize(
                 $entity->getCategory()->getName()
-            ) .
-            '</span>' .
-            '<span class="separator">&nbsp;>&nbsp;</span>' .
-            '<span class="reason">' .
+            ).
+            '</span>'.
+            '<span class="separator">&nbsp;>&nbsp;</span>'.
+            '<span class="reason">'.
             $this->translatableStringHelper->localize(
                 $entity->getName()
-            ) .
-            '</span>' .
-            '</span>' .
+            ).
+            '</span>'.
+            '</span>'.
             $this->getDefaultClosingBox();
     }
 
@@ -63,10 +62,10 @@ class ActivityReasonRender implements ChillEntityRenderInterface
         if (null !== $entity->getCategory()) {
             $category = $this->translatableStringHelper->localize(
                 $entity->getCategory()->getName()
-            ) . ' > ';
+            ).' > ';
         }
 
-        return $category .
+        return $category.
             $this->translatableStringHelper->localize(
                 $entity->getName()
             );
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
index 4b5d25514..38aa49cdf 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
@@ -12,14 +12,12 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Tests\Controller;
 
 use Chill\ActivityBundle\Entity\ActivityType;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Security\Core\Role\Role;
-use function count;
-use function in_array;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityControllerTest extends WebTestCase
@@ -206,19 +204,19 @@ final class ActivityControllerTest extends WebTestCase
         $container = self::$kernel->getContainer();
         $em = $container->get('doctrine.orm.entity_manager');
 
-        //get the social PermissionGroup, and remove CHILL_ACTIVITY_*
+        // get the social PermissionGroup, and remove CHILL_ACTIVITY_*
         $socialPermissionGroup = $em
             ->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)
             ->findOneByName('social');
         $withoutActivityPermissionGroup = (new \Chill\MainBundle\Entity\PermissionsGroup())
             ->setName('social without activity');
-        //copy role scopes where ACTIVITY is not present
+        // copy role scopes where ACTIVITY is not present
         foreach ($socialPermissionGroup->getRoleScopes() as $roleScope) {
             if (!strpos((string) $roleScope->getRole(), 'ACTIVITY')) {
                 $withoutActivityPermissionGroup->addRoleScope($roleScope);
             }
         }
-        //create groupCenter
+        // create groupCenter
         $groupCenter = new \Chill\MainBundle\Entity\GroupCenter();
         $groupCenter->setCenter($em->getRepository(\Chill\MainBundle\Entity\Center::class)
             ->findOneBy(['name' => 'Center A']))
@@ -226,7 +224,7 @@ final class ActivityControllerTest extends WebTestCase
         $em->persist($withoutActivityPermissionGroup);
         $em->persist($groupCenter);
 
-        //create user
+        // create user
         $faker = \Faker\Factory::create();
         $username = $faker->name;
         $user = new \Chill\MainBundle\Entity\User();
@@ -251,9 +249,8 @@ final class ActivityControllerTest extends WebTestCase
         $activities = $em->getRepository(\Chill\ActivityBundle\Entity\Activity::class)
             ->findBy(['person' => $person]);
 
-        if (count($activities) === 0) {
-            throw new RuntimeException('We need activities associated with this '
-                    . 'person. Did you forget to add fixtures ?');
+        if (0 === \count($activities)) {
+            throw new \RuntimeException('We need activities associated with this person. Did you forget to add fixtures ?');
         }
 
         return $activities;
@@ -285,8 +282,7 @@ final class ActivityControllerTest extends WebTestCase
             ]);
 
         if (null === $person) {
-            throw new RuntimeException('We need a person with firstname Gérard and'
-                  . ' lastname Depardieu. Did you add fixtures ?');
+            throw new \RuntimeException('We need a person with firstname Gérard and lastname Depardieu. Did you add fixtures ?');
         }
 
         return $person;
@@ -306,7 +302,7 @@ final class ActivityControllerTest extends WebTestCase
 
         $reason = $reasons[array_rand($reasons)];
 
-        if (in_array($reason->getId(), $excludeIds, true)) {
+        if (\in_array($reason->getId(), $excludeIds, true)) {
             return $this->getRandomActivityReason($excludeIds);
         }
 
@@ -340,8 +336,7 @@ final class ActivityControllerTest extends WebTestCase
             ->findOneByUsername($username);
 
         if (null === $user) {
-            throw new RuntimeException("The user with username {$username} "
-                  . 'does not exists in database. Did you add fixtures ?');
+            throw new \RuntimeException("The user with username {$username} ".'does not exists in database. Did you add fixtures ?');
         }
 
         $center = self::$kernel->getContainer()
@@ -369,13 +364,12 @@ final class ActivityControllerTest extends WebTestCase
             array_map(static fn ($s) => $s->getId(), $reachableScopesUpdate)
         );
 
-        if (count($reachableScopesId) === 0) {
-            throw new RuntimeException('there are not scope reachable for '
-                  . 'both CHILL_ACTIVITY_UPDATE and CHILL_ACTIVITY_DELETE');
+        if (0 === \count($reachableScopesId)) {
+            throw new \RuntimeException('there are not scope reachable for both CHILL_ACTIVITY_UPDATE and CHILL_ACTIVITY_DELETE');
         }
 
         foreach ($reachableScopesUpdate as $scope) {
-            if (in_array($scope->getId(), $reachableScopesId, true)) {
+            if (\in_array($scope->getId(), $reachableScopesId, true)) {
                 $reachableScopes[] = $scope;
             }
         }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php
index cea8482dc..81378b5ef 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityReasonCategoryControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php
index 338e92c87..ce37d3fb7 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityReasonControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php
index 911198b1e..23de2d17c 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityTypeControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php
index 3d91c3da9..6610b64ff 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php
@@ -22,6 +22,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityTest extends TestCase
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
index 657c9441e..6cb0eb299 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BySocialActionAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
index 86c999cf3..583e950a6 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BySocialIssueAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
index 7fbe4a91d..bb0906be6 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Export\Aggregator\ActivityTypeAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
@@ -22,6 +21,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
  * Add tests for ActivityTypeAggregator.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
index a0df16868..0cd7fe14d 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
@@ -21,6 +21,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
  * Add tests for ActivityUsernAggregator.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityUserAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByThirdpartyAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByThirdpartyAggregatorTest.php
index e3bec0c06..0558c3f2b 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByThirdpartyAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByThirdpartyAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ByThirdpartyAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByUserAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByUserAggregatorTest.php
index 04a2d68bf..3e8359ab8 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByUserAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByUserAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ByUserAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorScopeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorScopeAggregatorTest.php
index ca4d0baa5..49c1d746f 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorScopeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorScopeAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CreatorScopeAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/DateAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/DateAggregatorTest.php
index 586edb86f..db3a3ff76 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/DateAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/DateAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DateAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/JobScopeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/JobScopeAggregatorTest.php
index 3771e6e32..69d511ace 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/JobScopeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/JobScopeAggregatorTest.php
@@ -12,18 +12,19 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\CreatorScopeAggregator;
 use Chill\ActivityBundle\Export\Aggregator\JobScopeAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class JobScopeAggregatorTest extends AbstractAggregatorTest
 {
     private JobScopeAggregator $aggregator;
+
     protected function setUp(): void
     {
         self::bootKernel();
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php
index 299f28b77..663901edd 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LocationTypeAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
index 426a3929f..004de0b99 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
@@ -19,6 +19,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php
index 2eb2176b0..5f9b635ee 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AvgActivityDurationTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php
index 59b4384cf..b15462912 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AvgActivityVisitDurationTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php
index f03bbb956..46279ebd8 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CountActivityTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php
index 24a5133b6..c4f91f52e 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SumActivityDurationTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php
index 1940140ac..6bd7e9d19 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SumActivityVisitDurationTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php
index 864ff55ba..61ae15604 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CountActivityTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php
index afa3da111..f474b1fe6 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php
@@ -17,6 +17,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ListActivityTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php
index 44d327ffd..11fb84a9a 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
  * Test the "sum" part of StatActivityDuration.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class StatActivityDurationTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php
index 92257f6ce..347d7466f 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php
@@ -13,7 +13,6 @@ namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Export\Filter\ActivityTypeFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -22,6 +21,7 @@ use Doctrine\ORM\Query\Expr;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityTypeFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php
index 225949e2c..0b0c1f029 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ByCreatorFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php
index 48bd32455..e6ec47666 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BySocialActionFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php
index ee2360a4e..47f45ceb5 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php
@@ -20,6 +20,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BySocialIssueFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php
index 88bcc9bb7..4cefb136a 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php
@@ -15,11 +15,11 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Filter\ActivityDateFilter;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityDateFilterTest extends AbstractFilterTest
@@ -54,10 +54,9 @@ final class ActivityDateFilterTest extends AbstractFilterTest
 
         $em = self::$container->get(EntityManagerInterface::class);
 
-        yield
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity');
+        yield $em->createQueryBuilder()
+            ->select('count(activity.id)')
+            ->from(Activity::class, 'activity');
 
         self::ensureKernelShutdown();
     }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
index 6282200de..3d1f1fa2d 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityReasonFilterTest extends AbstractFilterTest
@@ -56,7 +57,7 @@ final class ActivityReasonFilterTest extends AbstractFilterTest
             ->get(EntityManagerInterface::class);
 
         $reasons = $em->createQuery('SELECT reason '
-                . 'FROM ChillActivityBundle:ActivityReason reason')
+                .'FROM ChillActivityBundle:ActivityReason reason')
             ->getResult();
 
         // generate an array of 5 different combination of results
@@ -76,11 +77,11 @@ final class ActivityReasonFilterTest extends AbstractFilterTest
         yield $em->createQueryBuilder()
             ->select('count(activity.id)')
             ->from('ChillActivityBundle:Activity', 'activity');
-        yield    $em->createQueryBuilder()
+        yield $em->createQueryBuilder()
             ->select('count(activity.id)')
             ->from('ChillActivityBundle:Activity', 'activity')
             ->join('activity.reasons', 'reasons');
-        yield    $em->createQueryBuilder()
+        yield $em->createQueryBuilder()
             ->select('count(activity.id)')
             ->from('ChillActivityBundle:Activity', 'activity')
             ->join('activity.reasons', 'reasons')
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php
index e0b590e75..5f94b4579 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php
@@ -20,6 +20,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityTypeFilterTest extends AbstractFilterTest
@@ -67,10 +68,9 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
 
         $em = self::$container->get(EntityManagerInterface::class);
 
-        yield
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity');
+        yield $em->createQueryBuilder()
+            ->select('count(activity.id)')
+            ->from(Activity::class, 'activity');
 
         self::ensureKernelShutdown();
     }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php
index 2a00bc2aa..d5073b625 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ByCreatorFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php
index 22b109207..5ef1879a7 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EmergencyFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php
index 94537acb2..bf52ceee1 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LocationTypeFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php
index 6c28b846e..6ad78579e 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php
@@ -20,6 +20,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityReasonFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php
index df14c2baf..34a9c8303 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php
@@ -15,11 +15,11 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
@@ -54,8 +54,8 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
 
         foreach ($array as $a) {
             $data[] = [
-                'date_from' => DateTime::createFromFormat('Y-m-d', '2021-07-01'),
-                'date_to' => DateTime::createFromFormat('Y-m-d', '2022-07-01'),
+                'date_from' => \DateTime::createFromFormat('Y-m-d', '2021-07-01'),
+                'date_to' => \DateTime::createFromFormat('Y-m-d', '2022-07-01'),
                 'reasons' => [$a],
             ];
         }
@@ -75,8 +75,7 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
-                ->join('activity.person', 'person')
-            ,
+                ->join('activity.person', 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
index 1552b951f..a2ea7c158 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
@@ -14,15 +14,14 @@ namespace Chill\ActivityBundle\Tests\Export\Filter;
 use Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
-use function array_slice;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
@@ -51,8 +50,8 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
 
     public function getFormData()
     {
-        $date_from = DateTime::createFromFormat('Y-m-d', '2015-01-15');
-        $date_to = new DateTime(); // today
+        $date_from = \DateTime::createFromFormat('Y-m-d', '2015-01-15');
+        $date_to = new \DateTime(); // today
         $reasons = $this->getActivityReasons();
 
         $data = [];
@@ -61,7 +60,7 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
             $data[] = [
                 'date_from' => $date_from,
                 'date_to' => $date_to,
-                'reasons' => array_slice($reasons, 0, 1 + $i),
+                'reasons' => \array_slice($reasons, 0, 1 + $i),
             ];
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php
index 2c87b00ce..f368e69fa 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SentReceivedFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php
index d49739c7e..ef8f4c6b2 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class UserFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserScopeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserScopeFilterTest.php
index 0e38e92a6..858931327 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserScopeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserScopeFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class UserScopeFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
index bdaef0bbf..3d1b31f08 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
@@ -13,14 +13,13 @@ namespace Chill\ActivityBundle\Tests\Form;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Form\ActivityType;
-use DateTime;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Security\Core\Authentication\Token\AbstractToken;
-use Symfony\Component\Security\Core\Role\Role;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityTypeTest extends KernelTestCase
@@ -140,7 +139,7 @@ final class ActivityTypeTest extends KernelTestCase
     public function testFormWithActivityHavingDifferentTime()
     {
         $activity = new Activity();
-        $activity->setDurationTime(DateTime::createFromFormat('U', 60));
+        $activity->setDurationTime(\DateTime::createFromFormat('U', 60));
 
         $builder = $this->container
             ->get('form.factory')
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
index 1bfa2878c..014c3ae9f 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\Form\Test\TypeTestCase;
  * Test translatableActivityReason.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class TranslatableActivityReasonTest extends TypeTestCase
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
index 313d77617..80779d909 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Form\Extension\Core\Type\FormType;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class TranslatableActivityTypeTest extends KernelTestCase
diff --git a/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityACLAwareRepositoryTest.php b/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityACLAwareRepositoryTest.php
index e7b2117d4..88eb3e7f8 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityACLAwareRepositoryTest.php
@@ -33,6 +33,7 @@ use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class ActivityACLAwareRepositoryTest extends KernelTestCase
@@ -182,7 +183,7 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
         if (null === $person = $this->entityManager->createQueryBuilder()
             ->select('p')->from(Person::class, 'p')->setMaxResults(1)
             ->getQuery()->getSingleResult()) {
-            throw new \RuntimeException("person not found");
+            throw new \RuntimeException('person not found');
         }
 
         /** @var AccompanyingPeriod $period1 */
@@ -193,7 +194,7 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
             ->setMaxResults(1)
             ->getQuery()
             ->getSingleResult()) {
-            throw new \RuntimeException("no period found");
+            throw new \RuntimeException('no period found');
         }
 
         /** @var AccompanyingPeriod $period2 */
@@ -206,7 +207,7 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
             ->setMaxResults(1)
             ->getQuery()
             ->getSingleResult()) {
-            throw new \RuntimeException("no second period found");
+            throw new \RuntimeException('no second period found');
         }
         // add a period
         $period1->addPerson($person);
@@ -222,7 +223,7 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
             ->setMaxResults(2)
             ->getQuery()
             ->getResult()) {
-            throw new \RuntimeException("no types");
+            throw new \RuntimeException('no types');
         }
 
         if ([] === $jobs = $this->entityManager
@@ -233,7 +234,7 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
             ->getQuery()
             ->getResult()
         ) {
-            throw new \RuntimeException("no jobs found");
+            throw new \RuntimeException('no jobs found');
         }
 
         if (null === $user = $this->entityManager
@@ -244,19 +245,19 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
             ->getQuery()
             ->getSingleResult()
         ) {
-            throw new \RuntimeException("no user found");
+            throw new \RuntimeException('no user found');
         }
 
         if ([] === $centers = $this->entityManager->createQueryBuilder()
             ->select('c')->from(Center::class, 'c')->setMaxResults(2)->getQuery()
             ->getResult()) {
-            throw new \RuntimeException("no centers found");
+            throw new \RuntimeException('no centers found');
         }
 
         if ([] === $scopes = $this->entityManager->createQueryBuilder()
             ->select('s')->from(Scope::class, 's')->setMaxResults(2)->getQuery()
             ->getResult()) {
-            throw new \RuntimeException("no scopes found");
+            throw new \RuntimeException('no scopes found');
         }
 
         yield [$person, $user, $centers, $scopes, ActivityVoter::SEE, 0, 5, ['date' => 'DESC'], []];
@@ -279,7 +280,7 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
             ->setMaxResults(1)
             ->getQuery()
             ->getSingleResult()) {
-            throw new \RuntimeException("no period found");
+            throw new \RuntimeException('no period found');
         }
 
         if ([] === $types = $this->entityManager
@@ -289,7 +290,7 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
             ->setMaxResults(2)
             ->getQuery()
             ->getResult()) {
-            throw new \RuntimeException("no types");
+            throw new \RuntimeException('no types');
         }
 
         if ([] === $jobs = $this->entityManager
@@ -300,7 +301,7 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
             ->getQuery()
             ->getResult()
         ) {
-            throw new \RuntimeException("no jobs found");
+            throw new \RuntimeException('no jobs found');
         }
 
         if (null === $user = $this->entityManager
@@ -311,7 +312,7 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
             ->getQuery()
             ->getSingleResult()
         ) {
-            throw new \RuntimeException("no user found");
+            throw new \RuntimeException('no user found');
         }
 
         yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], []];
diff --git a/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityDocumentACLAwareRepositoryTest.php b/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityDocumentACLAwareRepositoryTest.php
index 74f1d2bd0..c32714641 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityDocumentACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityDocumentACLAwareRepositoryTest.php
@@ -20,7 +20,6 @@ use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
-use phpseclib3\Math\BinaryField;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -28,6 +27,7 @@ use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class ActivityDocumentACLAwareRepositoryTest extends KernelTestCase
@@ -104,22 +104,22 @@ class ActivityDocumentACLAwareRepositoryTest extends KernelTestCase
     {
         $this->setUp();
 
-        if (null === $person = $this->entityManager->createQuery("SELECT p FROM " . Person::class . " p WHERE SIZE(p.accompanyingPeriodParticipations) > 0 ")
+        if (null === $person = $this->entityManager->createQuery('SELECT p FROM '.Person::class.' p WHERE SIZE(p.accompanyingPeriodParticipations) > 0 ')
             ->setMaxResults(1)
             ->getSingleResult()) {
-            throw new \RuntimeException("no person in dtabase");
+            throw new \RuntimeException('no person in dtabase');
         }
 
-        if ([] === $scopes = $this->entityManager->createQuery("SELECT s FROM " . Scope::class . " s ")->setMaxResults(5)->getResult()) {
-            throw new \RuntimeException("no scopes in database");
+        if ([] === $scopes = $this->entityManager->createQuery('SELECT s FROM '.Scope::class.' s ')->setMaxResults(5)->getResult()) {
+            throw new \RuntimeException('no scopes in database');
         }
 
         yield [$person, [], true, null, null, null];
         yield [$person, $scopes, true, null, null, null];
-        yield [$person, $scopes, true, new \DateTimeImmutable("1 month ago"), null, null];
-        yield [$person, $scopes, true, new \DateTimeImmutable("1 month ago"), new \DateTimeImmutable("1 week ago"), null];
-        yield [$person, $scopes, true, new \DateTimeImmutable("1 month ago"), new \DateTimeImmutable("1 week ago"), "content"];
-        yield [$person, $scopes, true, null, new \DateTimeImmutable("1 week ago"), "content"];
-        yield [$person, [], true, new \DateTimeImmutable("1 month ago"), new \DateTimeImmutable("1 week ago"), "content"];
+        yield [$person, $scopes, true, new \DateTimeImmutable('1 month ago'), null, null];
+        yield [$person, $scopes, true, new \DateTimeImmutable('1 month ago'), new \DateTimeImmutable('1 week ago'), null];
+        yield [$person, $scopes, true, new \DateTimeImmutable('1 month ago'), new \DateTimeImmutable('1 week ago'), 'content'];
+        yield [$person, $scopes, true, null, new \DateTimeImmutable('1 week ago'), 'content'];
+        yield [$person, [], true, new \DateTimeImmutable('1 month ago'), new \DateTimeImmutable('1 week ago'), 'content'];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php b/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
index 1fb90a4ae..b907363a3 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
@@ -24,6 +24,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityVoterTest extends KernelTestCase
@@ -127,7 +128,7 @@ final class ActivityVoterTest extends KernelTestCase
     /**
      * @dataProvider dataProvider_testVoteAction
      *
-     * @param type $expectedResult
+     * @param type   $expectedResult
      * @param string $attribute
      * @param string $message
      */
@@ -156,11 +157,11 @@ final class ActivityVoterTest extends KernelTestCase
      *
      * @return \Symfony\Component\Security\Core\Authentication\Token\TokenInterface
      */
-    protected function prepareToken(?User $user = null)
+    protected function prepareToken(User $user = null)
     {
         $token = $this->prophet->prophesize();
         $token
-            ->willImplement('\\' . \Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
+            ->willImplement('\\'.\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
 
         if (null === $user) {
             $token->getUser()->willReturn(null);
diff --git a/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php
index 989565262..b7796c9ba 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class TimelineProviderTest extends WebTestCase
diff --git a/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php b/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
index 5e1e84595..23a75e9fe 100644
--- a/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
+++ b/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
@@ -19,16 +19,9 @@ use Chill\MainBundle\Timeline\TimelineProviderInterface;
 use Chill\MainBundle\Timeline\TimelineSingleQuery;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
-use LogicException;
-use RuntimeException;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\User\UserInterface;
 
-use function implode;
-use function in_array;
-use function strtr;
-
 class TimelineActivityProvider implements TimelineProviderInterface
 {
     private const SUPPORTED_CONTEXTS = ['center', 'person'];
@@ -42,7 +35,7 @@ class TimelineActivityProvider implements TimelineProviderInterface
         protected ActivityACLAwareRepository $aclAwareRepository
     ) {
         if (!$storage->getToken()->getUser() instanceof User) {
-            throw new RuntimeException('A user should be authenticated !');
+            throw new \RuntimeException('A user should be authenticated !');
         }
 
         $this->user = $storage->getToken()->getUser();
@@ -61,10 +54,10 @@ class TimelineActivityProvider implements TimelineProviderInterface
 
         return TimelineSingleQuery::fromArray([
             'id' => $metadataActivity->getTableName()
-                 . '.' . $metadataActivity->getColumnName('id'),
+                 .'.'.$metadataActivity->getColumnName('id'),
             'type' => 'activity',
             'date' => $metadataActivity->getTableName()
-                 . '.' . $metadataActivity->getColumnName('date'),
+                 .'.'.$metadataActivity->getColumnName('date'),
             'FROM' => $this->getFromClausePerson(),
             'WHERE' => $where,
             'parameters' => $parameters,
@@ -106,17 +99,12 @@ class TimelineActivityProvider implements TimelineProviderInterface
     /**
      * Check if the context is supported.
      *
-     * @throws LogicException if the context is not supported
+     * @throws \LogicException if the context is not supported
      */
     private function checkContext(string $context)
     {
-        if (false === in_array($context, self::SUPPORTED_CONTEXTS, true)) {
-            throw new LogicException(
-                sprintf(
-                    "The context '%s' is not supported. Currently only 'person' is supported",
-                    $context
-                )
-            );
+        if (false === \in_array($context, self::SUPPORTED_CONTEXTS, true)) {
+            throw new \LogicException(sprintf("The context '%s' is not supported. Currently only 'person' is supported", $context));
         }
     }
 
@@ -151,8 +139,8 @@ class TimelineActivityProvider implements TimelineProviderInterface
 
         // loop on reachable scopes
         foreach ($reachableScopes as $scope) {
-            /** @phpstan-ignore-next-line  */
-            if (in_array($scope->getId(), $scopes_ids, true)) {
+            /* @phpstan-ignore-next-line */
+            if (\in_array($scope->getId(), $scopes_ids, true)) {
                 continue;
             }
             $scopes_ids[] = '?';
@@ -160,13 +148,13 @@ class TimelineActivityProvider implements TimelineProviderInterface
         }
 
         return [
-            strtr(
+            \strtr(
                 $whereClause,
                 [
                     '{activity.person_id}' => $associationMapping['joinColumns'][0]['name'],
-                    '{activity.scope_id}' => $metadataActivity->getTableName() . '.' .
+                    '{activity.scope_id}' => $metadataActivity->getTableName().'.'.
                         $metadataActivity->getAssociationMapping('scope')['joinColumns'][0]['name'],
-                    '{scopes_ids}' => implode(', ', $scopes_ids),
+                    '{scopes_ids}' => \implode(', ', $scopes_ids),
                 ]
             ),
             $parameters,
diff --git a/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php
index bb1dbc9d3..aafe5f9b5 100644
--- a/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php
+++ b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php
@@ -39,6 +39,6 @@ class ActivityValidity extends Constraint
 
     public function makeIsRequiredMessage(string $property)
     {
-        return self::ROOT_MESSAGE . $property . self::IS_REQUIRED_MESSAGE;
+        return self::ROOT_MESSAGE.$property.self::IS_REQUIRED_MESSAGE;
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
index 11b4b61e0..21ee6185e 100644
--- a/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
+++ b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
@@ -18,9 +18,6 @@ use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
-use function array_merge;
-use function count;
-
 class ActivityValidityValidator extends ConstraintValidator
 {
     public function validate($activity, Constraint $constraint)
@@ -33,106 +30,106 @@ class ActivityValidityValidator extends ConstraintValidator
             throw new UnexpectedValueException($activity, Activity::class);
         }
 
-        if ($activity->getActivityType()->getPersonsVisible() === 2 && count($activity->getPersons()) === 0) {
+        if (2 === $activity->getActivityType()->getPersonsVisible() && 0 === \count($activity->getPersons())) {
             $this->context
                 ->buildViolation($constraint->noPersonsMessage)
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getUsersVisible() === 2 && count($activity->getUsers()) === 0) {
+        if (2 === $activity->getActivityType()->getUsersVisible() && 0 === \count($activity->getUsers())) {
             $this->context
                 ->buildViolation($constraint->noUsersMessage)
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getThirdPartiesVisible() === 2 && count($activity->getThirdParties()) === 0) {
+        if (2 === $activity->getActivityType()->getThirdPartiesVisible() && 0 === \count($activity->getThirdParties())) {
             $this->context
                 ->buildViolation($constraint->noThirdPartiesMessage)
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getUserVisible() === 2 && null === $activity->getUser()) {
+        if (2 === $activity->getActivityType()->getUserVisible() && null === $activity->getUser()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('user'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getDateVisible() === 2 && null === $activity->getDate()) {
+        if (2 === $activity->getActivityType()->getDateVisible() && null === $activity->getDate()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('date'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getLocationVisible() === 2 && null === $activity->getLocation()) {
+        if (2 === $activity->getActivityType()->getLocationVisible() && null === $activity->getLocation()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('location'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getDurationTimeVisible() === 2 && null === $activity->getDurationTime()) {
+        if (2 === $activity->getActivityType()->getDurationTimeVisible() && null === $activity->getDurationTime()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('duration time'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getTravelTimeVisible() === 2 && null === $activity->getTravelTime()) {
+        if (2 === $activity->getActivityType()->getTravelTimeVisible() && null === $activity->getTravelTime()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('travel time'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getAttendeeVisible() === 2 && null === $activity->getAttendee()) {
+        if (2 === $activity->getActivityType()->getAttendeeVisible() && null === $activity->getAttendee()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('attendee'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getReasonsVisible() === 2 && null === $activity->getReasons()) {
+        if (2 === $activity->getActivityType()->getReasonsVisible() && null === $activity->getReasons()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('reasons'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getCommentVisible() === 2 && null === $activity->getComment()) {
+        if (2 === $activity->getActivityType()->getCommentVisible() && null === $activity->getComment()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('comment'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getSentReceivedVisible() === 2 && null === $activity->getSentReceived()) {
+        if (2 === $activity->getActivityType()->getSentReceivedVisible() && null === $activity->getSentReceived()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('sent/received'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getDocumentsVisible() === 2 && null === $activity->getDocuments()) {
+        if (2 === $activity->getActivityType()->getDocumentsVisible() && null === $activity->getDocuments()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('document'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getEmergencyVisible() === 2 && null === $activity->getEmergency()) {
+        if (2 === $activity->getActivityType()->getEmergencyVisible() && null === $activity->getEmergency()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('emergency'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getSocialIssuesVisible() === 2 && $activity->getSocialIssues()->count() === 0) {
+        if (2 === $activity->getActivityType()->getSocialIssuesVisible() && 0 === $activity->getSocialIssues()->count()) {
             $this->context
                 ->buildViolation($constraint->socialIssuesMessage)
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getSocialActionsVisible() === 2 && $activity->getSocialActions()->count() === 0) {
+        if (2 === $activity->getActivityType()->getSocialActionsVisible() && 0 === $activity->getSocialActions()->count()) {
             // check if a social action may be added
             $actions = [];
 
             foreach ($activity->getSocialIssues() as $socialIssue) {
                 /** @var SocialIssue $socialIssue */
-                $actions = array_merge($actions, $socialIssue->getRecursiveSocialActions()->toArray());
+                $actions = \array_merge($actions, $socialIssue->getRecursiveSocialActions()->toArray());
             }
 
-            if (0 < count($actions)) {
+            if (0 < \count($actions)) {
                 $this->context
                     ->buildViolation($constraint->socialActionsMessage)
                     ->addViolation();
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php b/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php
index f96762748..5a050035a 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php
@@ -22,7 +22,7 @@ class Version20150701091248 extends AbstractMigration
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE Activity DROP CONSTRAINT FK_55026B0C59BB1592');
         $this->addSql('ALTER TABLE ActivityReason DROP CONSTRAINT FK_654A2FCD12469DE2');
@@ -40,7 +40,7 @@ class Version20150701091248 extends AbstractMigration
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE Activity_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE ActivityReason_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php b/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php
index f8dc40e95..053e4ecc8 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php
@@ -22,7 +22,7 @@ class Version20150702093317 extends AbstractMigration
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE ActivityReasonCategory DROP COLUMN name;');
         $this->addSql('ALTER TABLE ActivityReasonCategory ADD COLUMN label VARCHAR(255) NOT NULL;');
@@ -35,7 +35,7 @@ class Version20150702093317 extends AbstractMigration
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE ActivityReasonCategory DROP COLUMN label;');
         $this->addSql('ALTER TABLE ActivityReasonCategory ADD COLUMN name JSON;');
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php b/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php
index 6509701cc..78204fa67 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php
@@ -22,7 +22,7 @@ class Version20150704091347 extends AbstractMigration
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE Activity ALTER COLUMN remark SET NOT NULL;');
         $this->addSql('ALTER TABLE Activity ALTER COLUMN attendee DROP NOT NULL;');
@@ -31,7 +31,7 @@ class Version20150704091347 extends AbstractMigration
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE Activity ALTER COLUMN remark DROP NOT NULL;');
         $this->addSql('ALTER TABLE Activity ALTER COLUMN attendee DROP NOT NULL;');
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php b/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php
index 1531230c1..ceb0e59e6 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php
@@ -25,14 +25,14 @@ class Version20160222103457 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
         $this->addSql('ALTER TABLE Activity ADD reason_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE Activity ADD CONSTRAINT '
-                . 'fk_55026b0c59bb1592 FOREIGN KEY (reason_id) '
-                . 'REFERENCES activityreason (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'fk_55026b0c59bb1592 FOREIGN KEY (reason_id) '
+                .'REFERENCES activityreason (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX idx_55026b0c59bb1592 ON Activity (reason_id)');
 
         // try to keep at least on activity reason...
@@ -52,29 +52,29 @@ class Version20160222103457 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
         // create the new table activity reason
         $this->addSql(
             'CREATE TABLE activity_activityreason ('
-                . 'activity_id INT NOT NULL, '
-                . 'activityreason_id INT NOT NULL, '
-                . 'PRIMARY KEY(activity_id, activityreason_id))'
+                .'activity_id INT NOT NULL, '
+                .'activityreason_id INT NOT NULL, '
+                .'PRIMARY KEY(activity_id, activityreason_id))'
         );
         $this->addSql('CREATE INDEX IDX_338A864381C06096 ON activity_activityreason (activity_id)');
         $this->addSql('CREATE INDEX IDX_338A8643D771E0FC ON activity_activityreason (activityreason_id)');
         $this->addSql('ALTER TABLE activity_activityreason '
-                . 'ADD CONSTRAINT FK_338A864381C06096 FOREIGN KEY (activity_id) '
-                . 'REFERENCES Activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_338A864381C06096 FOREIGN KEY (activity_id) '
+                .'REFERENCES Activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE activity_activityreason '
-                . 'ADD CONSTRAINT FK_338A8643D771E0FC FOREIGN KEY (activityreason_id) '
-                . 'REFERENCES ActivityReason (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_338A8643D771E0FC FOREIGN KEY (activityreason_id) '
+                .'REFERENCES ActivityReason (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
 
         // migrate old data to new table
         $this->addSql('INSERT INTO activity_activityreason (activity_id, activityreason_id) '
-                . 'SELECT id, reason_id FROM activity WHERE reason_id IS NOT NULL');
+                .'SELECT id, reason_id FROM activity WHERE reason_id IS NOT NULL');
 
         // remove old column
         $this->addSql('ALTER TABLE activity DROP CONSTRAINT fk_55026b0c59bb1592');
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php b/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php
index ec321faa7..9be59b2b9 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php
@@ -14,8 +14,6 @@ namespace Chill\Migrations\Activity;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-use function count;
-
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
@@ -49,8 +47,8 @@ final class Version20210422073711 extends AbstractMigration
             'Domicile erronéee',
         ];
 
-        for ($i = 1; count($list) >= $i; ++$i) {
-            $this->addSql('INSERT INTO activitytpresence VALUES(' . $i . ", json_build_object('fr', '" . $list[$i - 1] . "'), true)");
+        for ($i = 1; \count($list) >= $i; ++$i) {
+            $this->addSql('INSERT INTO activitytpresence VALUES('.$i.", json_build_object('fr', '".$list[$i - 1]."'), true)");
         }
 
         $this->addSql('ALTER TABLE activity ADD emergency BOOLEAN NOT NULL DEFAULT false');
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php b/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php
index 18711bad0..110ca24b2 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php
@@ -58,7 +58,7 @@ final class Version20210422123846 extends AbstractMigration
         $this->addSql('ALTER TABLE activity_thirdparty ADD CONSTRAINT FK_C6F0DE0381C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE activity_thirdparty ADD CONSTRAINT FK_C6F0DE03C7D3A8E6 FOREIGN KEY (thirdparty_id) REFERENCES chill_3party.third_party (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE activity_document ADD CONSTRAINT FK_78633A7881C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        //$this->addSql('ALTER TABLE activity_document ADD CONSTRAINT FK_78633A78C33F7837 FOREIGN KEY (document_id) REFERENCES Document (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        // $this->addSql('ALTER TABLE activity_document ADD CONSTRAINT FK_78633A78C33F7837 FOREIGN KEY (document_id) REFERENCES Document (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE activity_user ADD CONSTRAINT FK_8E570DDB81C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE activity_user ADD CONSTRAINT FK_8E570DDBA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php
index 009a9f2c8..602ef1204 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php
@@ -23,7 +23,7 @@ class AsideActivityCategoryController extends CRUDController
 {
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var QueryBuilder $query */
+        /* @var QueryBuilder $query */
         $query->addOrderBy('e.ordering', 'ASC');
 
         return $query;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
index 64301151b..c29a5a6dc 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
@@ -16,7 +16,6 @@ use Chill\AsideActivityBundle\Repository\AsideActivityCategoryRepository;
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
-use DateTime;
 use Symfony\Component\HttpFoundation\Request;
 
 final class AsideActivityController extends CRUDController
@@ -31,7 +30,7 @@ final class AsideActivityController extends CRUDController
         $asideActivity->setLocation($this->getUser()->getCurrentLocation());
 
         $duration = $request->query->get('duration', '300');
-        $duration = DateTime::createFromFormat('U', $duration);
+        $duration = \DateTime::createFromFormat('U', $duration);
         $asideActivity->setDuration($duration);
 
         $categoryId = $request->query->get('type', 7);
@@ -48,7 +47,7 @@ final class AsideActivityController extends CRUDController
         return $asideActivity;
     }
 
-    protected function buildQueryEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null)
+    protected function buildQueryEntities(string $action, Request $request, FilterOrderHelper $filterOrder = null)
     {
         $qb = parent::buildQueryEntities($action, $request);
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
index 4c11c25ef..12c82be00 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
@@ -14,14 +14,10 @@ namespace Chill\AsideActivityBundle\DataFixtures\ORM;
 use Chill\AsideActivityBundle\Entity\AsideActivity;
 use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
 use Chill\MainBundle\Repository\UserRepository;
-use DateInterval;
-use DateTimeImmutable;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function random_int;
-
 class LoadAsideActivity extends Fixture implements DependentFixtureInterface
 {
     public function __construct(private readonly UserRepository $userRepository) {}
@@ -42,15 +38,15 @@ class LoadAsideActivity extends Fixture implements DependentFixtureInterface
             $activity = new AsideActivity();
             $activity
                 ->setAgent($user)
-                ->setCreatedAt(new DateTimeImmutable('now'))
+                ->setCreatedAt(new \DateTimeImmutable('now'))
                 ->setCreatedBy($user)
-                ->setUpdatedAt(new DateTimeImmutable('now'))
+                ->setUpdatedAt(new \DateTimeImmutable('now'))
                 ->setUpdatedBy($user)
                 ->setType(
                     $this->getReference('aside_activity_category_0')
                 )
-                ->setDate((new DateTimeImmutable('today'))
-                    ->sub(new DateInterval('P' . random_int(1, 100) . 'D')));
+                ->setDate((new \DateTimeImmutable('today'))
+                    ->sub(new \DateInterval('P'.\random_int(1, 100).'D')));
 
             $manager->persist($activity);
         }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
index 1d15adbc1..3e6b4247a 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
@@ -27,7 +27,7 @@ class LoadAsideActivityCategory extends \Doctrine\Bundle\FixturesBundle\Fixture
             $category = new AsideActivityCategory();
             $category->setTitle(['fr' => $label]);
             $manager->persist($category);
-            $this->setReference('aside_activity_category_' . $key, $category);
+            $this->setReference('aside_activity_category_'.$key, $category);
         }
 
         $manager->flush();
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
index 927de1845..056f29ba1 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
@@ -26,7 +26,7 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
 
         $container->setParameter('chill_aside_activity.form.time_duration', $config['form']['time_duration']);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/form.yaml');
         $loader->load('services/menu.yaml');
@@ -100,7 +100,7 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
 
     protected function prependRoute(ContainerBuilder $container)
     {
-        //declare routes for task bundle
+        // declare routes for task bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
index 2e2398c3e..241a545a8 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
@@ -14,8 +14,6 @@ namespace Chill\AsideActivityBundle\DependencyInjection;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
-use function is_int;
-
 class Configuration implements ConfigurationInterface
 {
     public function getConfigTreeBuilder()
@@ -132,7 +130,7 @@ class Configuration implements ConfigurationInterface
             ->info('The number of seconds of this duration. Must be an integer.')
             ->cannotBeEmpty()
             ->validate()
-            ->ifTrue(static fn ($data) => !is_int($data))->thenInvalid('The value %s is not a valid integer')
+            ->ifTrue(static fn ($data) => !\is_int($data))->thenInvalid('The value %s is not a valid integer')
             ->end()
             ->end()
             ->scalarNode('label')
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
index 3841811eb..2bb8a985d 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
@@ -15,19 +15,21 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Location;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(schema="chill_asideactivity")
  */
 class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
 {
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Assert\NotBlank
      */
     private \Chill\MainBundle\Entity\User $agent;
@@ -39,6 +41,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private \Chill\MainBundle\Entity\User $createdBy;
@@ -51,17 +54,20 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="time", nullable=true)
      */
-    private ?DateTimeInterface $duration = null;
+    private ?\DateTimeInterface $duration = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Location::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?Location $location = null;
@@ -73,6 +79,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="asideActivities")
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private ?\Chill\AsideActivityBundle\Entity\AsideActivityCategory $type = null;
@@ -92,7 +99,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this->agent;
     }
 
-    public function getCreatedAt(): ?DateTimeInterface
+    public function getCreatedAt(): ?\DateTimeInterface
     {
         return $this->createdAt;
     }
@@ -102,12 +109,12 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this->createdBy;
     }
 
-    public function getDate(): ?DateTimeInterface
+    public function getDate(): ?\DateTimeInterface
     {
         return $this->date;
     }
 
-    public function getDuration(): ?DateTimeInterface
+    public function getDuration(): ?\DateTimeInterface
     {
         return $this->duration;
     }
@@ -132,7 +139,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this->type;
     }
 
-    public function getUpdatedAt(): ?DateTimeInterface
+    public function getUpdatedAt(): ?\DateTimeInterface
     {
         return $this->updatedAt;
     }
@@ -149,7 +156,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setCreatedAt(DateTimeInterface $createdAt): self
+    public function setCreatedAt(\DateTimeInterface $createdAt): self
     {
         $this->createdAt = $createdAt;
 
@@ -163,14 +170,14 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setDate(DateTimeInterface $date): self
+    public function setDate(\DateTimeInterface $date): self
     {
         $this->date = $date;
 
         return $this;
     }
 
-    public function setDuration(?DateTimeInterface $duration): self
+    public function setDuration(?\DateTimeInterface $duration): self
     {
         $this->duration = $duration;
 
@@ -198,7 +205,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setUpdatedAt(DateTimeInterface $updatedAt): self
+    public function setUpdatedAt(\DateTimeInterface $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
index 44777f110..be71d73f9 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
@@ -19,19 +19,23 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(schema="chill_asideactivity")
  */
 class AsideActivityCategory
 {
     /**
      * @ORM\OneToMany(targetEntity=AsideActivityCategory::class, mappedBy="parent")
+     *
      * @var Collection<AsideActivityCategory>
      */
     private Collection $children;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private int $id;
@@ -50,6 +54,7 @@ class AsideActivityCategory
 
     /**
      * @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="children")
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?AsideActivityCategory $parent = null;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php
index 614b0ec79..4271ae118 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php
@@ -45,6 +45,7 @@ class ByActivityTypeAggregator implements AggregatorInterface
     {
         // No form needed
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php
index cbf732274..b5ca1022b 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php
@@ -14,7 +14,6 @@ namespace Chill\AsideActivityBundle\Export\Aggregator;
 use Chill\AsideActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\LocationRepository;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -22,25 +21,16 @@ class ByLocationAggregator implements AggregatorInterface
 {
     public function __construct(private readonly LocationRepository $locationRepository) {}
 
-    /**
-     * @inheritDoc
-     */
     public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
@@ -55,42 +45,27 @@ class ByLocationAggregator implements AggregatorInterface
         };
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getQueryKeys($data): array
     {
         return ['by_aside_activity_location_aggregator'];
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getTitle(): string
     {
         return 'export.aggregator.Group by aside activity location';
     }
 
-    /**
-     * @inheritDoc
-     */
     public function addRole(): ?string
     {
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb->addSelect('IDENTITY(aside.location) AS by_aside_activity_location_aggregator')
             ->addGroupBy('by_aside_activity_location_aggregator');
     }
 
-    /**
-     * @inheritDoc
-     */
     public function applyOn(): string
     {
         return Declarations::ASIDE_ACTIVITY_TYPE;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php
index ae4fb8477..c3883b18a 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php
@@ -39,7 +39,7 @@ class ByUserJobAggregator implements AggregatorInterface
         $p = self::PREFIX;
 
         $qb
-            ->leftJoin("aside.agent", "{$p}_user")
+            ->leftJoin('aside.agent', "{$p}_user")
             ->leftJoin(
                 UserJobHistory::class,
                 "{$p}_history",
@@ -49,10 +49,10 @@ class ByUserJobAggregator implements AggregatorInterface
             // job_at based on aside.date
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", "aside.date"),
+                    $qb->expr()->lte("{$p}_history.startDate", 'aside.date'),
                     $qb->expr()->orX(
                         $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", "aside.date")
+                        $qb->expr()->gt("{$p}_history.endDate", 'aside.date')
                     )
                 )
             )
@@ -93,7 +93,7 @@ class ByUserJobAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php
index 6c9690791..a99d2b75f 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php
@@ -39,7 +39,7 @@ class ByUserScopeAggregator implements AggregatorInterface
         $p = self::PREFIX;
 
         $qb
-            ->leftJoin("aside.agent", "{$p}_user")
+            ->leftJoin('aside.agent', "{$p}_user")
             ->leftJoin(
                 UserScopeHistory::class,
                 "{$p}_history",
@@ -48,10 +48,10 @@ class ByUserScopeAggregator implements AggregatorInterface
             )
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", "aside.date"),
+                    $qb->expr()->lte("{$p}_history.startDate", 'aside.date'),
                     $qb->expr()->orX(
                         $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", "aside.date")
+                        $qb->expr()->gt("{$p}_history.endDate", 'aside.date')
                     )
                 )
             )
@@ -92,7 +92,7 @@ class ByUserScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/AvgAsideActivityDuration.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/AvgAsideActivityDuration.php
index b3c3f0eb2..70922b6ae 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/AvgAsideActivityDuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/AvgAsideActivityDuration.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class AvgAsideActivityDuration implements ExportInterface, GroupedExportInterface
@@ -50,7 +49,7 @@ class AvgAsideActivityDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_aside_activity_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Average duration aside activities' : $value;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php
index cfe5082aa..6d1eed5fe 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountAsideActivity implements ExportInterface, GroupedExportInterface
@@ -26,6 +25,7 @@ class CountAsideActivity implements ExportInterface, GroupedExportInterface
     public function __construct(private readonly AsideActivityRepository $repository) {}
 
     public function buildForm(FormBuilderInterface $builder) {}
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -49,7 +49,7 @@ class CountAsideActivity implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         $labels = array_combine($values, $values);
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
index 0981c6bf8..33155c62f 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
@@ -26,11 +26,8 @@ use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\LocationRepository;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use DateTimeInterface;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 final readonly class ListAsideActivity implements ListInterface, GroupedExportInterface
@@ -74,28 +71,28 @@ final readonly class ListAsideActivity implements ListInterface, GroupedExportIn
         return match ($key) {
             'id', 'note' => static function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.aside_activity.' . $key;
+                    return 'export.aside_activity.'.$key;
                 }
 
                 return $value ?? '';
             },
             'duration' => static function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.aside_activity.' . $key;
+                    return 'export.aside_activity.'.$key;
                 }
 
                 if (null === $value) {
                     return '';
                 }
 
-                if ($value instanceof DateTimeInterface) {
+                if ($value instanceof \DateTimeInterface) {
                     return $value->format('H:i:s');
                 }
 
                 return $value;
             },
-            'createdAt', 'updatedAt', 'date' => $this->dateTimeHelper->getLabel('export.aside_activity.' . $key),
-            'agent_id', 'creator_id' => $this->userHelper->getLabel($key, $values, 'export.aside_activity.' . $key),
+            'createdAt', 'updatedAt', 'date' => $this->dateTimeHelper->getLabel('export.aside_activity.'.$key),
+            'agent_id', 'creator_id' => $this->userHelper->getLabel($key, $values, 'export.aside_activity.'.$key),
             'aside_activity_type' => function ($value) {
                 if ('_header' === $value) {
                     return 'export.aside_activity.aside_activity_type';
@@ -135,13 +132,13 @@ final readonly class ListAsideActivity implements ListInterface, GroupedExportIn
                 }
 
                 if (null === $value || '' === $value || null === $c = $this->centerRepository->find($value)) {
-                    /** @var Center $c */
+                    /* @var Center $c */
                     return '';
                 }
 
                 return $c->getName();
             },
-            default => throw new LogicException('this key is not supported : ' . $key),
+            default => throw new \LogicException('this key is not supported : '.$key),
         };
     }
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumAsideActivityDuration.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumAsideActivityDuration.php
index 316dedc45..0fd318902 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumAsideActivityDuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumAsideActivityDuration.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class SumAsideActivityDuration implements ExportInterface, GroupedExportInterface
@@ -26,6 +25,7 @@ class SumAsideActivityDuration implements ExportInterface, GroupedExportInterfac
     public function __construct(private readonly AsideActivityRepository $repository) {}
 
     public function buildForm(FormBuilderInterface $builder) {}
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -49,7 +49,7 @@ class SumAsideActivityDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_aside_activity_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Sum duration aside activities' : $value;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php
index 5b2bb49ae..b78640d49 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php
@@ -66,6 +66,7 @@ class ByActivityTypeFilter implements FilterInterface
                 },
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
index 99e79b028..8f3c9c305 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
@@ -82,14 +82,14 @@ class ByDateFilter implements FilterInterface
                 if (null === $date_from) {
                     $form->get('date_from')->addError(new FormError(
                         $this->translator->trans('This field '
-                            . 'should not be empty')
+                            .'should not be empty')
                     ));
                 }
 
                 if (null === $date_to) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This field '
-                            . 'should not be empty')
+                            .'should not be empty')
                     ));
                 }
 
@@ -100,13 +100,14 @@ class ByDateFilter implements FilterInterface
                 ) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('export.filter.This date should be after '
-                            . 'the date given in "Implied in an aside activity after '
-                            . 'this date" field')
+                            .'the date given in "Implied in an aside activity after '
+                            .'this date" field')
                     ));
                 }
             }
         });
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php
index a1f51273c..0be041dc9 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php
@@ -16,9 +16,7 @@ use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickUserLocationType;
-use Chill\MainBundle\Repository\LocationRepository;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Security;
 
@@ -28,26 +26,17 @@ final readonly class ByLocationFilter implements FilterInterface
         private Security $security
     ) {}
 
-    /**
-     * @inheritDoc
-     */
     public function getTitle(): string
     {
         return 'export.filter.Filter by aside activity location';
     }
 
-    /**
-     * @inheritDoc
-     */
     public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('locations', PickUserLocationType::class);
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getFormDefaultData(): array
     {
         $user = $this->security->getUser();
@@ -63,9 +52,6 @@ final readonly class ByLocationFilter implements FilterInterface
         ];
     }
 
-    /**
-     * @inheritDoc
-     */
     public function describeAction($data, $format = 'string'): array
     {
         $locations = $data['locations']->map(fn (Location $l): string => $l->getName());
@@ -75,17 +61,11 @@ final readonly class ByLocationFilter implements FilterInterface
         ]];
     }
 
-    /**
-     * @inheritDoc
-     */
     public function addRole(): ?string
     {
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function alterQuery(QueryBuilder $qb, $data): void
     {
         $clause = $qb->expr()->in('aside.location', ':locations');
@@ -94,9 +74,6 @@ final readonly class ByLocationFilter implements FilterInterface
         $qb->setParameter('locations', $data['locations']);
     }
 
-    /**
-     * @inheritDoc
-     */
     public function applyOn(): string
     {
         return Declarations::ASIDE_ACTIVITY_TYPE;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
index a46bad3b5..8dd1a8eac 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
@@ -48,6 +48,7 @@ class ByUserFilter implements FilterInterface
             'label' => 'Creators',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php
index 69aaa376f..3d5bb6530 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php
@@ -41,19 +41,19 @@ class ByUserJobFilter implements FilterInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    "SELECT 1 FROM " . AsideActivity::class . " {$p}_act "
-                    . "JOIN {$p}_act.agent {$p}_user "
-                    . "JOIN " . UserJobHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user "
-                    . "WHERE {$p}_act = aside "
+                    'SELECT 1 FROM '.AsideActivity::class." {$p}_act "
+                    ."JOIN {$p}_act.agent {$p}_user "
+                    .'JOIN '.UserJobHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
+                    ."WHERE {$p}_act = aside "
                     // job_at based on aside.date
-                    . "AND {$p}_history.startDate <= aside.date "
-                    . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > aside.date) "
-                    . "AND {$p}_history.job IN ( :{$p}_jobs )"
+                    ."AND {$p}_history.startDate <= aside.date "
+                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > aside.date) "
+                    ."AND {$p}_history.job IN ( :{$p}_jobs )"
                 )
             )
             ->setParameter(
                 "{$p}_jobs",
-                $data["jobs"],
+                $data['jobs'],
             );
     }
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php
index bcaabdcea..846814785 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php
@@ -43,19 +43,19 @@ class ByUserScopeFilter implements FilterInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    "SELECT 1 FROM " . AsideActivity::class . " {$p}_act "
-                    . "JOIN {$p}_act.agent {$p}_user "
-                    . "JOIN " . UserScopeHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user "
-                    . "WHERE {$p}_act = aside "
+                    'SELECT 1 FROM '.AsideActivity::class." {$p}_act "
+                    ."JOIN {$p}_act.agent {$p}_user "
+                    .'JOIN '.UserScopeHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
+                    ."WHERE {$p}_act = aside "
                     // scope_at based on aside.date
-                    . "AND {$p}_history.startDate <= aside.date "
-                    . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > aside.date) "
-                    . "AND {$p}_history.scope IN ( :{$p}_scopes )"
+                    ."AND {$p}_history.startDate <= aside.date "
+                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > aside.date) "
+                    ."AND {$p}_history.scope IN ( :{$p}_scopes )"
                 )
             )
             ->setParameter(
                 "{$p}_scopes",
-                $data["scopes"],
+                $data['scopes'],
             );
     }
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
index d1be3adcf..d6fcb821c 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -13,16 +13,10 @@ namespace Chill\AsideActivityBundle\Form;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
 use Chill\AsideActivityBundle\Form\Type\PickAsideActivityCategoryType;
-use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Form\Type\PickUserLocationType;
-use DateInterval;
-use DateTime;
-use DateTimeImmutable;
-use DateTimeZone;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
@@ -32,8 +26,6 @@ use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-use function in_array;
-
 final class AsideActivityFormType extends AbstractType
 {
     private readonly array $timeChoices;
@@ -68,7 +60,7 @@ final class AsideActivityFormType extends AbstractType
                 ChillDateType::class,
                 [
                     'label' => 'date',
-                    'data' => new DateTime(),
+                    'data' => new \DateTime(),
                     'required' => true,
                 ]
             )
@@ -98,16 +90,16 @@ final class AsideActivityFormType extends AbstractType
                 ) {
                     // set the timezone to GMT, and fix the difference between current and GMT
                     // the datetimetransformer will then handle timezone as GMT
-                    $timezoneUTC = new DateTimeZone('GMT');
-                    /** @var DateTimeImmutable $data */
-                    $data = $formEvent->getData() ?? DateTime::createFromFormat('U', '300');
+                    $timezoneUTC = new \DateTimeZone('GMT');
+                    /** @var \DateTimeImmutable $data */
+                    $data = $formEvent->getData() ?? \DateTime::createFromFormat('U', '300');
                     $seconds = $data->getTimezone()->getOffset($data);
                     $data->setTimeZone($timezoneUTC);
-                    $data->add(new DateInterval('PT' . $seconds . 'S'));
+                    $data->add(new \DateInterval('PT'.$seconds.'S'));
 
                     // test if the timestamp is in the choices.
                     // If not, recreate the field with the new timestamp
-                    if (!in_array($data->getTimestamp(), $timeChoices, true)) {
+                    if (!\in_array($data->getTimestamp(), $timeChoices, true)) {
                         // the data are not in the possible values. add them
                         $timeChoices[$data->format('H:i')] = $data->getTimestamp();
                         $form = $builder->create($fieldName, ChoiceType::class, [...$durationTimeOptions, 'choices' => $timeChoices, 'auto_initialize' => false]);
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
index 2bdff5a1c..a32d52303 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
@@ -23,9 +23,6 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
     public function __construct(protected TranslatorInterface $translator, public AuthorizationCheckerInterface $authorizationChecker) {}
 
-    /**
-     * @param $menuId
-     */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         if ($this->authorizationChecker->isGranted('ROLE_USER')) {
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php b/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php
index 6735606ce..533e567b4 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php
@@ -49,7 +49,7 @@ class AsideActivityCategoryRepository implements ObjectRepository
      *
      * @return AsideActivityCategory[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php b/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
index 2c485f066..2598c4e01 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
@@ -14,7 +14,6 @@ namespace Chill\AsideActivityBundle\Templating\Entity;
 use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Component\Templating\EngineInterface;
 
 /**
  * @implements ChillEntityRenderInterface<AsideActivityCategory>
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php b/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
index bce883126..4a772775f 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
@@ -14,13 +14,11 @@ namespace Chill\AsideActivityBundle\Tests\Controller;
 use Chill\AsideActivityBundle\Entity\AsideActivity;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use function array_pop;
-use function shuffle;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AsideActivityControllerTest extends WebTestCase
@@ -49,13 +47,13 @@ final class AsideActivityControllerTest extends WebTestCase
             ->getQuery()
             ->getResult();
 
-        shuffle($asideActivityIds);
+        \shuffle($asideActivityIds);
 
-        yield [array_pop($asideActivityIds)['id']];
+        yield [\array_pop($asideActivityIds)['id']];
 
-        yield [array_pop($asideActivityIds)['id']];
+        yield [\array_pop($asideActivityIds)['id']];
 
-        yield [array_pop($asideActivityIds)['id']];
+        yield [\array_pop($asideActivityIds)['id']];
 
         self::ensureKernelShutdown();
     }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/ListAsideActivityTest.php b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/ListAsideActivityTest.php
index 6bd29ef1d..29ea8d1f6 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/ListAsideActivityTest.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/ListAsideActivityTest.php
@@ -12,12 +12,12 @@ declare(strict_types=1);
 namespace Chill\AsideActivityBundle\Tests\Export\Export;
 
 use Chill\AsideActivityBundle\Export\Export\ListAsideActivity;
-use Chill\MainBundle\Test\Export\AbstractExportTest;
 use Doctrine\ORM\AbstractQuery;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class ListAsideActivityTest extends KernelTestCase
@@ -38,6 +38,6 @@ class ListAsideActivityTest extends KernelTestCase
 
         $results = $qb->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY);
 
-        self::assertIsArray($results, "smoke test: test that the result is an array");
+        self::assertIsArray($results, 'smoke test: test that the result is an array');
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
index 2662b896a..3b5a687a6 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
@@ -17,7 +17,7 @@ use Chill\BudgetBundle\Entity\Resource;
 interface CalculatorInterface
 {
     /**
-     * @param array<Charge|Resource> $elements
+     * @param array<Charge|resource> $elements
      */
     public function calculate(array $elements): ?CalculatorResult;
 
diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
index 7987bdfdf..477f23189 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
@@ -11,14 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\BudgetBundle\Calculator;
 
-use Chill\BudgetBundle\Entity\AbstractElement;
 use Chill\BudgetBundle\Entity\Charge;
 use Chill\BudgetBundle\Entity\Resource;
-use OutOfBoundsException;
-
-use function array_key_exists;
-use function array_keys;
-use function implode;
 
 class CalculatorManager
 {
@@ -42,7 +36,7 @@ class CalculatorManager
     }
 
     /**
-     * @param array<Resource|Charge> $elements
+     * @param array<resource|Charge> $elements
      *
      * @return CalculatorResult[]
      */
@@ -63,9 +57,8 @@ class CalculatorManager
 
     public function getCalculator(string $alias): CalculatorInterface
     {
-        if (false === array_key_exists($alias, $this->calculators)) {
-            throw new OutOfBoundsException("The calculator with alias '{$alias}' does "
-                . 'not exists. Possible values are ' . implode(', ', array_keys($this->calculators)));
+        if (false === \array_key_exists($alias, $this->calculators)) {
+            throw new \OutOfBoundsException("The calculator with alias '{$alias}' does ".'not exists. Possible values are '.\implode(', ', \array_keys($this->calculators)));
         }
 
         return $this->calculators[$alias];
diff --git a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php b/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
index 27fc65dec..38d4d82f5 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
@@ -23,8 +23,6 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function get_class;
-
 abstract class AbstractElementController extends AbstractController
 {
     public function __construct(protected EntityManagerInterface $em, protected TranslatorInterface $translator, protected LoggerInterface $chillMainLogger) {}
@@ -38,7 +36,7 @@ abstract class AbstractElementController extends AbstractController
     protected function _delete(AbstractElement $element, Request $request, mixed $template, mixed $flashMessage): Response
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::DELETE, $element, 'You are not '
-            . 'allowed to delete this item');
+            .'allowed to delete this item');
 
         $form = $this->createDeleteForm();
 
@@ -50,7 +48,7 @@ abstract class AbstractElementController extends AbstractController
             $indexPage = 'chill_budget_elements_household_index';
         }
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isSubmitted() && $form->isValid()) {
diff --git a/src/Bundle/ChillBudgetBundle/Controller/Admin/ChargeKindController.php b/src/Bundle/ChillBudgetBundle/Controller/Admin/ChargeKindController.php
index e1989176d..642b7cc61 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/Admin/ChargeKindController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/Admin/ChargeKindController.php
@@ -20,7 +20,7 @@ class ChargeKindController extends CRUDController
 {
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var QueryBuilder $query */
+        /* @var QueryBuilder $query */
         $query->addOrderBy('e.ordering', 'ASC');
 
         return $query;
diff --git a/src/Bundle/ChillBudgetBundle/Controller/Admin/ResourceKindController.php b/src/Bundle/ChillBudgetBundle/Controller/Admin/ResourceKindController.php
index 90b8e750a..0762f8252 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/Admin/ResourceKindController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/Admin/ResourceKindController.php
@@ -20,7 +20,7 @@ class ResourceKindController extends CRUDController
 {
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var QueryBuilder $query */
+        /* @var QueryBuilder $query */
         $query->addOrderBy('e.ordering', 'ASC');
 
         return $query;
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
index 4f057a939..39e96d4a8 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
@@ -15,14 +15,13 @@ use Chill\BudgetBundle\Entity\Charge;
 use Chill\BudgetBundle\Form\ChargeType;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Component\HttpFoundation\Request;
 
 class ChargeController extends AbstractElementController
 {
     /**
-     *
      * @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)
@@ -36,8 +35,8 @@ class ChargeController extends AbstractElementController
     }
 
     /**
-     *
      * @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)
@@ -51,8 +50,8 @@ class ChargeController extends AbstractElementController
     }
 
     /**
-     *
      * @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)
@@ -66,8 +65,8 @@ class ChargeController extends AbstractElementController
     }
 
     /**
-     *
      * @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)
@@ -81,8 +80,8 @@ class ChargeController extends AbstractElementController
     }
 
     /**
-     *
      * @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 3e8b36f6c..26acbf8a5 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
@@ -12,22 +12,12 @@ declare(strict_types=1);
 namespace Chill\BudgetBundle\Controller;
 
 use Chill\BudgetBundle\Calculator\CalculatorManager;
-use Chill\BudgetBundle\Entity\Charge;
-use Chill\BudgetBundle\Entity\Resource;
 use Chill\BudgetBundle\Repository\ChargeRepository;
 use Chill\BudgetBundle\Repository\ResourceRepository;
 use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
-use Doctrine\ORM\EntityManagerInterface;
-use Psr\Log\LoggerInterface;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-use function array_merge;
-use function count;
 
 class ElementController extends AbstractController
 {
@@ -43,9 +33,9 @@ class ElementController extends AbstractController
         $charges = $this->chargeRepository->findAllByEntity($person);
         $resources = $this->resourceRepository->findAllByEntity($person);
 
-        $elements = array_merge($charges, $resources);
+        $elements = \array_merge($charges, $resources);
 
-        if (count($elements) > 0) {
+        if (\count($elements) > 0) {
             $results = $this->calculator->calculateDefault($elements);
         }
 
@@ -67,9 +57,9 @@ class ElementController extends AbstractController
         $charges = $this->chargeRepository->findAllByEntity($household);
         $resources = $this->resourceRepository->findAllByEntity($household);
 
-        $elements = array_merge($charges, $resources);
+        $elements = \array_merge($charges, $resources);
 
-        if (count($elements) > 0) {
+        if (\count($elements) > 0) {
             $results = $this->calculator->calculateDefault($elements);
         }
 
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
index eb02c3635..f67d92a43 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
@@ -15,7 +15,6 @@ use Chill\BudgetBundle\Entity\Resource;
 use Chill\BudgetBundle\Form\ResourceType;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php
index 57976f846..6a8842b64 100644
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php
@@ -34,7 +34,7 @@ class ChillBudgetExtension extends Extension implements PrependExtensionInterfac
         $configuration = $this->getConfiguration($configs, $container);
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services/form.yaml');
         $loader->load('services/repository.yaml');
         $loader->load('services/security.yaml');
@@ -60,7 +60,7 @@ class ChillBudgetExtension extends Extension implements PrependExtensionInterfac
      */
     public function prependRoutes(ContainerBuilder $container)
     {
-        //add routes for custom bundle
+        // add routes for custom bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
diff --git a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
index 619a6cdd7..52a52c99f 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
@@ -14,8 +14,6 @@ namespace Chill\BudgetBundle\Entity;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Ramsey\Uuid\Type\Decimal;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -29,9 +27,11 @@ abstract class AbstractElement
 {
     /**
      * @ORM\Column(name="amount", type="decimal", precision=10, scale=2)
+     *
      * @Assert\GreaterThan(
      *     value=0
      * )
+     *
      * @Assert\NotNull(
      *     message="The amount cannot be empty"
      * )
@@ -45,12 +45,13 @@ abstract class AbstractElement
 
     /**
      * @ORM\Column(name="endDate", type="datetime_immutable", nullable=true)
+     *
      * @Assert\GreaterThan(
      *     propertyPath="startDate",
      *     message="The budget element's end date must be after the start date"
      * )
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\ManyToOne(
@@ -68,16 +69,17 @@ abstract class AbstractElement
 
     /**
      * @ORM\Column(name="startDate", type="datetime_immutable")
+     *
      * @Assert\Date
      */
-    private DateTimeImmutable $startDate;
+    private \DateTimeImmutable $startDate;
 
     /**
      * @ORM\Column(name="type", type="string", length=255)
      */
     private string $type = '';
 
-    /*Getters and Setters */
+    /* Getters and Setters */
 
     public function getAmount(): float
     {
@@ -89,7 +91,7 @@ abstract class AbstractElement
         return $this->comment;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -104,7 +106,7 @@ abstract class AbstractElement
         return $this->person;
     }
 
-    public function getStartDate(): DateTimeImmutable
+    public function getStartDate(): \DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -130,17 +132,17 @@ abstract class AbstractElement
         return $this;
     }
 
-    public function setComment(?string $comment = null): self
+    public function setComment(string $comment = null): self
     {
         $this->comment = $comment;
 
         return $this;
     }
 
-    public function setEndDate(?DateTimeInterface $endDate = null): self
+    public function setEndDate(\DateTimeInterface $endDate = null): self
     {
-        if ($endDate instanceof DateTime) {
-            $this->endDate = DateTimeImmutable::createFromMutable($endDate);
+        if ($endDate instanceof \DateTime) {
+            $this->endDate = \DateTimeImmutable::createFromMutable($endDate);
         } elseif (null === $endDate) {
             $this->endDate = null;
         } else {
@@ -164,10 +166,10 @@ abstract class AbstractElement
         return $this;
     }
 
-    public function setStartDate(DateTimeInterface $startDate): self
+    public function setStartDate(\DateTimeInterface $startDate): self
     {
-        if ($startDate instanceof DateTime) {
-            $this->startDate = DateTimeImmutable::createFromMutable($startDate);
+        if ($startDate instanceof \DateTime) {
+            $this->startDate = \DateTimeImmutable::createFromMutable($startDate);
         } elseif (null === $startDate) {
             $this->startDate = null;
         } else {
diff --git a/src/Bundle/ChillBudgetBundle/Entity/Charge.php b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
index 6040cb328..68ee65d19 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/Charge.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
@@ -13,13 +13,13 @@ namespace Chill\BudgetBundle\Entity;
 
 use Chill\MainBundle\Entity\HasCentersInterface;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Charge.
  *
  * @ORM\Table(name="chill_budget.charge")
+ *
  * @ORM\Entity(repositoryClass="Chill\BudgetBundle\Repository\ChargeRepository")
  */
 class Charge extends AbstractElement implements HasCentersInterface
@@ -41,6 +41,7 @@ class Charge extends AbstractElement implements HasCentersInterface
 
     /**
      * @ORM\ManyToOne(targetEntity=ChargeKind::class, inversedBy="AbstractElement")
+     *
      * @ORM\JoinColumn
      */
     private ?ChargeKind $charge = null;
@@ -52,14 +53,16 @@ class Charge extends AbstractElement implements HasCentersInterface
 
     /**
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\Id
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
     public function __construct()
     {
-        $this->setStartDate(new DateTimeImmutable('today'));
+        $this->setStartDate(new \DateTimeImmutable('today'));
     }
 
     public function getCenters(): array
diff --git a/src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php b/src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php
index b6ebcf347..308575677 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php
@@ -21,14 +21,18 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Table(name="chill_budget.charge_type",
  *     uniqueConstraints={@ORM\UniqueConstraint(name="charge_kind_unique_type_idx", fields={"kind"})}
  * )
+ *
  * @ORM\Entity
+ *
  * @UniqueEntity(fields={"kind"})
  */
 class ChargeKind
 {
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -40,7 +44,9 @@ class ChargeKind
 
     /**
      * @ORM\Column(type="string", length=255, options={"default": ""}, nullable=false)
+     *
      * @Assert\Regex(pattern="/^[a-z0-9\-_]{1,}$/", message="budget.admin.form.kind.only_alphanumeric")
+     *
      * @Assert\Length(min=3)
      */
     private string $kind = '';
diff --git a/src/Bundle/ChillBudgetBundle/Entity/Resource.php b/src/Bundle/ChillBudgetBundle/Entity/Resource.php
index 28b8645e0..c4845ed1b 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/Resource.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Resource.php
@@ -13,33 +13,36 @@ namespace Chill\BudgetBundle\Entity;
 
 use Chill\MainBundle\Entity\HasCentersInterface;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Resource.
  *
  * @ORM\Table(name="chill_budget.resource")
+ *
  * @ORM\Entity(repositoryClass="Chill\BudgetBundle\Repository\ResourceRepository")
  */
 class Resource extends AbstractElement implements HasCentersInterface
 {
     /**
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\Id
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=ResourceKind::class, inversedBy="AbstractElement")
+     *
      * @ORM\JoinColumn
      */
     private ?ResourceKind $resource = null;
 
     public function __construct()
     {
-        $this->setStartDate(new DateTimeImmutable('today'));
+        $this->setStartDate(new \DateTimeImmutable('today'));
     }
 
     public function getCenters(): array
diff --git a/src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php b/src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php
index 4b90be5e1..78e0e6a32 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php
@@ -19,16 +19,21 @@ use Symfony\Component\Validator\Constraints as Assert;
  * Type of resource.
  *
  * @ORM\Table(name="chill_budget.resource_type", uniqueConstraints={
+ *
  *     @ORM\UniqueConstraint(name="resource_kind_unique_type_idx", fields={"kind"})
  * })
+ *
  * @ORM\Entity
+ *
  * @UniqueEntity(fields={"kind"})
  */
 class ResourceKind
 {
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -40,7 +45,9 @@ class ResourceKind
 
     /**
      * @ORM\Column(type="string", length=255, nullable=false, options={"default": ""})
+     *
      * @Assert\Regex(pattern="/^[a-z0-9\-_]{1,}$/", message="budget.admin.form.kind.only_alphanumeric")
+     *
      * @Assert\Length(min=3)
      */
     private string $kind = '';
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
index a0c23a4ad..577be07db 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
@@ -66,7 +66,7 @@ final class ChargeKindRepository implements ChargeKindRepositoryInterface
      *
      * @return array<ChargeKind>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php
index f92851eba..7a930bea8 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php
@@ -34,12 +34,9 @@ interface ChargeKindRepositoryInterface extends ObjectRepository
     public function findAllByType(string $type): array;
 
     /**
-     * @param int|null $limit
-     * @param int|null $offset
-     *
      * @return array<ChargeKind>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?ChargeKind;
 
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
index 475657f68..3154a772d 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
@@ -14,7 +14,6 @@ namespace Chill\BudgetBundle\Repository;
 use Chill\BudgetBundle\Entity\Charge;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
@@ -46,7 +45,7 @@ class ChargeRepository extends ServiceEntityRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findByEntityAndDate($entity, DateTime $date, $sort = null)
+    public function findByEntityAndDate($entity, \DateTime $date, $sort = null)
     {
         $qb = $this->createQueryBuilder('c');
 
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
index 1ac419e30..e10913195 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
@@ -54,7 +54,7 @@ final class ResourceKindRepository implements ResourceKindRepositoryInterface
 
     public function findOneByKind(string $kind): ?ResourceKind
     {
-        return $this->repository->findOneBy(['kind' => $kind]) ;
+        return $this->repository->findOneBy(['kind' => $kind]);
     }
 
     /**
@@ -71,7 +71,7 @@ final class ResourceKindRepository implements ResourceKindRepositoryInterface
      *
      * @return list<ResourceKind>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepositoryInterface.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepositoryInterface.php
index dac46ff35..d639d54ee 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepositoryInterface.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepositoryInterface.php
@@ -34,12 +34,9 @@ interface ResourceKindRepositoryInterface extends ObjectRepository
     public function findAllByType(string $type): array;
 
     /**
-     * @param int|null $limit
-     * @param int|null $offset
-     *
      * @return list<ResourceKind>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?ResourceKind;
 
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
index 6ecf13d28..2ba95e340 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
@@ -14,9 +14,7 @@ namespace Chill\BudgetBundle\Repository;
 use Chill\BudgetBundle\Entity\Resource;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
@@ -33,7 +31,7 @@ class ResourceRepository extends ServiceEntityRepository
     }
 
     /**
-     * @return Resource[]
+     * @return resource[]
      */
     public function findAllByEntity(Household|Person $entity): array
     {
@@ -47,7 +45,7 @@ class ResourceRepository extends ServiceEntityRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findByEntityAndDate(Household|Person $entity, DateTime $date, $sort = null)
+    public function findByEntityAndDate(Household|Person $entity, \DateTime $date, $sort = null)
     {
         $qb = $this->createQueryBuilder('c');
 
diff --git a/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php b/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
index 11d465421..f2340b8b9 100644
--- a/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
+++ b/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
@@ -20,8 +20,6 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
-use UnexpectedValueException;
-
 class BudgetElementVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
     final public const CREATE = 'CHILL_BUDGET_ELEMENT_CREATE';
@@ -91,6 +89,6 @@ class BudgetElementVoter extends AbstractChillVoter implements ProvideRoleHierar
             return false;
         }
 
-        throw new UnexpectedValueException('This subject is not supported, or is an element not associated with person or household');
+        throw new \UnexpectedValueException('This subject is not supported, or is an element not associated with person or household');
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
index b1357680b..a57f7fb29 100644
--- a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
+++ b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
@@ -20,9 +20,6 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\ResultSetMapping;
-use LogicException;
-use RuntimeException;
-use function count;
 
 /**
  * Helps to find a summary of the budget: the sum of resources and charges.
@@ -49,7 +46,7 @@ final readonly class SummaryBudget implements SummaryBudgetInterface
         }
 
         $personIds = $household->getCurrentPersons()->map(static fn (Person $p) => $p->getId());
-        $ids = implode(', ', array_fill(0, count($personIds), '?'));
+        $ids = implode(', ', array_fill(0, \count($personIds), '?'));
 
         $parameters = [...$personIds, $household->getId()];
 
@@ -127,7 +124,7 @@ final readonly class SummaryBudget implements SummaryBudgetInterface
                     $chargeKind = $this->chargeKindRepository->find($row['kind_id']);
 
                     if (null === $chargeKind) {
-                        throw new RuntimeException('charge kind not found: ' . $row['kind_id']);
+                        throw new \RuntimeException('charge kind not found: '.$row['kind_id']);
                     }
                     $result[$chargeKind->getKind()] = [
                         'sum' => (float) $row['sum'],
@@ -143,7 +140,7 @@ final readonly class SummaryBudget implements SummaryBudgetInterface
                     $resourceKind = $this->resourceKindRepository->find($row['kind_id']);
 
                     if (null === $resourceKind) {
-                        throw new RuntimeException('charge kind not found: ' . $row['kind_id']);
+                        throw new \RuntimeException('charge kind not found: '.$row['kind_id']);
                     }
 
                     $result[$resourceKind->getKind()] = [
@@ -156,7 +153,7 @@ final readonly class SummaryBudget implements SummaryBudgetInterface
                 return $result;
 
             default:
-                throw new LogicException();
+                throw new \LogicException();
         }
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Templating/BudgetElementTypeRender.php b/src/Bundle/ChillBudgetBundle/Templating/BudgetElementTypeRender.php
index c9c592a31..26871b0f4 100644
--- a/src/Bundle/ChillBudgetBundle/Templating/BudgetElementTypeRender.php
+++ b/src/Bundle/ChillBudgetBundle/Templating/BudgetElementTypeRender.php
@@ -15,7 +15,6 @@ use Chill\BudgetBundle\Entity\ChargeKind;
 use Chill\BudgetBundle\Entity\ResourceKind;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Symfony\Component\Templating\EngineInterface;
 
 /**
  * @implements ChillEntityRenderInterface<ResourceKind|ChargeKind>
diff --git a/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php b/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
index 6cdafa2c3..52fae812e 100644
--- a/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
+++ b/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ElementControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php b/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
index 7d90bf575..7fb437e05 100644
--- a/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
+++ b/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
@@ -20,15 +20,12 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use ReflectionClass;
-use RuntimeException;
 
 /**
  * @internal
@@ -74,7 +71,7 @@ final class SummaryBudgetTest extends TestCase
                     return $queryCharges->reveal();
                 }
 
-                throw new RuntimeException('this query does not have a stub counterpart: ' . $args[0]);
+                throw new \RuntimeException('this query does not have a stub counterpart: '.$args[0]);
             });
 
         $chargeRepository = $this->prophesize(ChargeKindRepositoryInterface::class);
@@ -99,18 +96,18 @@ final class SummaryBudgetTest extends TestCase
         $translatableStringHelper->localize(Argument::type('array'))->will(static fn ($arg) => $arg[0]['fr']);
 
         $person = new Person();
-        $personReflection = new ReflectionClass($person);
+        $personReflection = new \ReflectionClass($person);
         $personIdReflection = $personReflection->getProperty('id');
         $personIdReflection->setAccessible(true);
         $personIdReflection->setValue($person, 1);
 
         $household = new Household();
-        $householdReflection = new ReflectionClass($household);
+        $householdReflection = new \ReflectionClass($household);
         $householdId = $householdReflection->getProperty('id');
         $householdId->setAccessible(true);
         $householdId->setValue($household, 1);
         $householdMember = (new HouseholdMember())->setPerson($person)
-            ->setStartDate(new DateTimeImmutable('1 month ago'));
+            ->setStartDate(new \DateTimeImmutable('1 month ago'));
         $household->addMember($householdMember);
 
         $summaryBudget = new SummaryBudget(
diff --git a/src/Bundle/ChillBudgetBundle/migrations/Version20221207105407.php b/src/Bundle/ChillBudgetBundle/migrations/Version20221207105407.php
index cfe3a0089..1d2707120 100644
--- a/src/Bundle/ChillBudgetBundle/migrations/Version20221207105407.php
+++ b/src/Bundle/ChillBudgetBundle/migrations/Version20221207105407.php
@@ -32,7 +32,7 @@ final class Version20221207105407 extends AbstractMigration implements Container
         return 'Use new budget admin entities';
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
     }
diff --git a/src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php b/src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php
index 110adccdc..c9bf020b1 100644
--- a/src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php
+++ b/src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php
@@ -66,8 +66,8 @@ class AzureGrantAdminConsentAndAcquireToken extends Command
 
         $output->writeln('Token information:');
         $output->writeln($token->getToken());
-        $output->writeln('Expires at: ' . $token->getExpires());
-        $output->writeln('To inspect the token content, go to https://jwt.ms/#access_token=' . urlencode($token->getToken()));
+        $output->writeln('Expires at: '.$token->getExpires());
+        $output->writeln('To inspect the token content, go to https://jwt.ms/#access_token='.urlencode($token->getToken()));
 
         return 0;
     }
diff --git a/src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php b/src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php
index 193b04934..4964f0064 100644
--- a/src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php
+++ b/src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php
@@ -21,11 +21,8 @@ namespace Chill\CalendarBundle\Command;
 use Chill\CalendarBundle\Exception\UserAbsenceSyncException;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\EventsOnUserSubscriptionCreator;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MapCalendarToUser;
-use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSGraphUserRepository;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSUserAbsenceSync;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
-use DateInterval;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
@@ -48,19 +45,19 @@ final class MapAndSubscribeUserCalendarCommand extends Command
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        $this->logger->info(self::class . ' execute command');
+        $this->logger->info(self::class.' execute command');
 
         $limit = 50;
         $offset = 0;
-        /** @var DateInterval $interval the interval before the end of the expiration */
-        $interval = new DateInterval('P1D');
-        $expiration = (new DateTimeImmutable('now'))->add(new DateInterval($input->getOption('subscription-duration')));
+        /** @var \DateInterval $interval the interval before the end of the expiration */
+        $interval = new \DateInterval('P1D');
+        $expiration = (new \DateTimeImmutable('now'))->add(new \DateInterval($input->getOption('subscription-duration')));
         $users = $this->userRepository->findAllAsArray('fr');
         $created = 0;
         $renewed = 0;
 
-        $this->logger->info(self::class . ' start user to get - renew', [
-            'expiration' => $expiration->format(DateTimeImmutable::ATOM),
+        $this->logger->info(self::class.' start user to get - renew', [
+            'expiration' => $expiration->format(\DateTimeImmutable::ATOM),
         ]);
 
         foreach ($users as $u) {
@@ -73,8 +70,8 @@ final class MapAndSubscribeUserCalendarCommand extends Command
             $user = $this->userRepository->find($u['id']);
 
             if (null === $user) {
-                $this->logger->error("could not find user by id", ['uid' => $u['id']]);
-                $output->writeln("could not find user by id : " . $u['id']);
+                $this->logger->error('could not find user by id', ['uid' => $u['id']]);
+                $output->writeln('could not find user by id : '.$u['id']);
                 continue;
             }
 
@@ -83,8 +80,8 @@ final class MapAndSubscribeUserCalendarCommand extends Command
 
                 // if user still does not have userid, continue
                 if (!$this->mapCalendarToUser->hasUserId($user)) {
-                    $this->logger->warning("user does not have a counterpart on ms api", ['userId' => $user->getId(), 'email' => $user->getEmail()]);
-                    $output->writeln(sprintf("giving up for user with email %s and id %s", $user->getEmail(), $user->getId()));
+                    $this->logger->warning('user does not have a counterpart on ms api', ['userId' => $user->getId(), 'email' => $user->getEmail()]);
+                    $output->writeln(sprintf('giving up for user with email %s and id %s', $user->getEmail(), $user->getId()));
 
                     continue;
                 }
@@ -94,15 +91,15 @@ final class MapAndSubscribeUserCalendarCommand extends Command
             try {
                 $this->userAbsenceSync->syncUserAbsence($user);
             } catch (UserAbsenceSyncException $e) {
-                $this->logger->error("could not sync user absence", ['userId' => $user->getId(), 'email' => $user->getEmail(), 'exception' => $e->getTraceAsString(), "message" => $e->getMessage()]);
-                $output->writeln(sprintf("Could not sync user absence: id: %s and email: %s", $user->getId(), $user->getEmail()));
+                $this->logger->error('could not sync user absence', ['userId' => $user->getId(), 'email' => $user->getEmail(), 'exception' => $e->getTraceAsString(), 'message' => $e->getMessage()]);
+                $output->writeln(sprintf('Could not sync user absence: id: %s and email: %s', $user->getId(), $user->getEmail()));
                 throw $e;
             }
 
             // we first try to renew an existing subscription, if any.
             // if not, or if it fails, we try to create a new one
             if ($this->mapCalendarToUser->hasActiveSubscription($user)) {
-                $this->logger->debug(self::class . ' renew a subscription for', [
+                $this->logger->debug(self::class.' renew a subscription for', [
                     'userId' => $user->getId(),
                     'username' => $user->getUsernameCanonical(),
                 ]);
@@ -114,7 +111,7 @@ final class MapAndSubscribeUserCalendarCommand extends Command
                 if (0 !== $expirationTs) {
                     ++$renewed;
                 } else {
-                    $this->logger->warning(self::class . ' could not renew subscription for a user', [
+                    $this->logger->warning(self::class.' could not renew subscription for a user', [
                         'userId' => $user->getId(),
                         'username' => $user->getUsernameCanonical(),
                     ]);
@@ -122,7 +119,7 @@ final class MapAndSubscribeUserCalendarCommand extends Command
             }
 
             if (!$this->mapCalendarToUser->hasActiveSubscription($user)) {
-                $this->logger->debug(self::class . ' create a subscription for', [
+                $this->logger->debug(self::class.' create a subscription for', [
                     'userId' => $user->getId(),
                     'username' => $user->getUsernameCanonical(),
                 ]);
@@ -134,14 +131,13 @@ final class MapAndSubscribeUserCalendarCommand extends Command
                 if (0 !== $expirationTs) {
                     ++$created;
                 } else {
-                    $this->logger->warning(self::class . ' could not create subscription for a user', [
+                    $this->logger->warning(self::class.' could not create subscription for a user', [
                         'userId' => $user->getId(),
                         'username' => $user->getUsernameCanonical(),
                     ]);
                 }
             }
 
-
             if (0 === $offset % $limit) {
                 $this->em->flush();
                 $this->em->clear();
@@ -151,12 +147,12 @@ final class MapAndSubscribeUserCalendarCommand extends Command
         $this->em->flush();
         $this->em->clear();
 
-        $this->logger->warning(self::class . ' process executed', [
+        $this->logger->warning(self::class.' process executed', [
             'created' => $created,
             'renewed' => $renewed,
         ]);
 
-        $output->writeln("users synchronized");
+        $output->writeln('users synchronized');
 
         return 0;
     }
diff --git a/src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php b/src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
index e39ff2d75..bfbdd2abd 100644
--- a/src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
+++ b/src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
@@ -26,8 +26,6 @@ use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Service\ShortMessage\ShortMessageTransporterInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
-use DateInterval;
-use DateTimeImmutable;
 use libphonenumber\PhoneNumber;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberType;
@@ -38,8 +36,6 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Question\Question;
-use UnexpectedValueException;
-use function count;
 
 class SendTestShortMessageOnCalendarCommand extends Command
 {
@@ -74,20 +70,20 @@ class SendTestShortMessageOnCalendarCommand extends Command
 
         // start date
         $question = new Question('When will start the appointment ? (default: "1 hour") ', '1 hour');
-        $startDate = new DateTimeImmutable($helper->ask($input, $output, $question));
+        $startDate = new \DateTimeImmutable($helper->ask($input, $output, $question));
 
         if (false === $startDate) {
-            throw new UnexpectedValueException('could not create a date with this date and time');
+            throw new \UnexpectedValueException('could not create a date with this date and time');
         }
 
         $calendar->setStartDate($startDate);
 
         // end date
         $question = new Question('How long will last the appointment ? (default: "PT30M") ', 'PT30M');
-        $interval = new DateInterval($helper->ask($input, $output, $question));
+        $interval = new \DateInterval($helper->ask($input, $output, $question));
 
         if (false === $interval) {
-            throw new UnexpectedValueException('could not create the interval');
+            throw new \UnexpectedValueException('could not create the interval');
         }
 
         $calendar->setEndDate($calendar->getStartDate()->add($interval));
@@ -97,17 +93,17 @@ class SendTestShortMessageOnCalendarCommand extends Command
         $question
             ->setValidator(function ($answer): Person {
                 if (!is_numeric($answer)) {
-                    throw new UnexpectedValueException('the answer must be numeric');
+                    throw new \UnexpectedValueException('the answer must be numeric');
                 }
 
                 if (0 >= (int) $answer) {
-                    throw new UnexpectedValueException('the answer must be greater than zero');
+                    throw new \UnexpectedValueException('the answer must be greater than zero');
                 }
 
                 $person = $this->personRepository->find((int) $answer);
 
                 if (null === $person) {
-                    throw new UnexpectedValueException('The person is not found');
+                    throw new \UnexpectedValueException('The person is not found');
                 }
 
                 return $person;
@@ -121,17 +117,17 @@ class SendTestShortMessageOnCalendarCommand extends Command
         $question
             ->setValidator(function ($answer): User {
                 if (!is_numeric($answer)) {
-                    throw new UnexpectedValueException('the answer must be numeric');
+                    throw new \UnexpectedValueException('the answer must be numeric');
                 }
 
                 if (0 >= (int) $answer) {
-                    throw new UnexpectedValueException('the answer must be greater than zero');
+                    throw new \UnexpectedValueException('the answer must be greater than zero');
                 }
 
                 $user = $this->userRepository->find((int) $answer);
 
                 if (null === $user) {
-                    throw new UnexpectedValueException('The user is not found');
+                    throw new \UnexpectedValueException('The user is not found');
                 }
 
                 return $user;
@@ -150,13 +146,13 @@ class SendTestShortMessageOnCalendarCommand extends Command
 
         $question->setNormalizer(function ($answer): PhoneNumber {
             if (null === $answer) {
-                throw new UnexpectedValueException('The person is not found');
+                throw new \UnexpectedValueException('The person is not found');
             }
 
             $phone = $this->phoneNumberUtil->parse($answer, 'BE');
 
             if (!$this->phoneNumberUtil->isPossibleNumberForType($phone, PhoneNumberType::MOBILE)) {
-                throw new UnexpectedValueException('Phone number si not a mobile');
+                throw new \UnexpectedValueException('Phone number si not a mobile');
             }
 
             return $phone;
@@ -169,7 +165,7 @@ class SendTestShortMessageOnCalendarCommand extends Command
 
         $messages = $this->messageForCalendarBuilder->buildMessageForCalendar($calendar);
 
-        if (0 === count($messages)) {
+        if (0 === \count($messages)) {
             $output->writeln('no message to send to this user');
         }
 
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
index 8d315b02f..1729c215b 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
@@ -15,7 +15,6 @@ use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Serializer\Model\Collection;
-use DateTimeImmutable;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -40,8 +39,8 @@ class CalendarAPIController extends ApiController
             throw new BadRequestHttpException('You must provide a dateFrom parameter');
         }
 
-        if (false === $dateFrom = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::ATOM,
+        if (false === $dateFrom = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::ATOM,
             $request->query->get('dateFrom')
         )) {
             throw new BadRequestHttpException('dateFrom not parsable');
@@ -51,8 +50,8 @@ class CalendarAPIController extends ApiController
             throw new BadRequestHttpException('You must provide a dateTo parameter');
         }
 
-        if (false === $dateTo = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::ATOM,
+        if (false === $dateTo = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::ATOM,
             $request->query->get('dateTo')
         )) {
             throw new BadRequestHttpException('dateTo not parsable');
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index b80d298a4..f4694614f 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -30,11 +30,8 @@ use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTimeImmutable;
-use Exception;
 use http\Exception\UnexpectedValueException;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Form;
@@ -82,12 +79,12 @@ class CalendarController extends AbstractController
             $view = '@ChillCalendar/Calendar/confirm_deleteByPerson.html.twig';
             $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_person', ['id' => $person->getId()]);
         } else {
-            throw new RuntimeException('nor person or accompanying period');
+            throw new \RuntimeException('nor person or accompanying period');
         }
 
         $form = $this->createDeleteForm($entity);
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -138,7 +135,7 @@ class CalendarController extends AbstractController
             $view = '@ChillCalendar/Calendar/editByPerson.html.twig';
             $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_person', ['id' => $person->getId()]);
         } else {
-            throw new RuntimeException('no person nor accompanying period');
+            throw new \RuntimeException('no person nor accompanying period');
         }
 
         $form = $this->createForm(CalendarType::class, $entity)
@@ -148,7 +145,7 @@ class CalendarController extends AbstractController
         $templates = $this->docGeneratorTemplateRepository->findByEntity(Calendar::class);
 
         foreach ($templates as $template) {
-            $form->add('save_and_generate_doc_' . $template->getId(), SubmitType::class, [
+            $form->add('save_and_generate_doc_'.$template->getId(), SubmitType::class, [
                 'label' => $this->translatableStringHelper->localize($template->getName()),
             ]);
         }
@@ -165,7 +162,7 @@ class CalendarController extends AbstractController
             }
 
             foreach ($templates as $template) {
-                if ($form->get('save_and_generate_doc_' . $template->getId())->isClicked()) {
+                if ($form->get('save_and_generate_doc_'.$template->getId())->isClicked()) {
                     return $this->redirectToRoute('chill_docgenerator_generate_from_template', [
                         'entityClassName' => Calendar::class,
                         'entityId' => $entity->getId(),
@@ -327,7 +324,7 @@ class CalendarController extends AbstractController
         $form->add('save_and_upload_doc', SubmitType::class);
 
         foreach ($templates as $template) {
-            $form->add('save_and_generate_doc_' . $template->getId(), SubmitType::class, [
+            $form->add('save_and_generate_doc_'.$template->getId(), SubmitType::class, [
                 'label' => $this->translatableStringHelper->localize($template->getName()),
             ]);
         }
@@ -342,12 +339,12 @@ class CalendarController extends AbstractController
 
             if ($form->get('save_and_upload_doc')->isClicked()) {
                 return $this->redirectToRoute('chill_calendar_calendardoc_new', [
-                    'id' => $entity->getId()
+                    'id' => $entity->getId(),
                 ]);
             }
 
             foreach ($templates as $template) {
-                if ($form->get('save_and_generate_doc_' . $template->getId())->isClicked()) {
+                if ($form->get('save_and_generate_doc_'.$template->getId())->isClicked()) {
                     return $this->redirectToRoute('chill_docgenerator_generate_from_template', [
                         'entityClassName' => Calendar::class,
                         'entityId' => $entity->getId(),
@@ -392,7 +389,7 @@ class CalendarController extends AbstractController
      */
     public function showAction(Request $request, int $id): Response
     {
-        throw new Exception('not implemented');
+        throw new \Exception('not implemented');
         $view = null;
         $em = $this->getDoctrine()->getManager();
 
@@ -453,7 +450,7 @@ class CalendarController extends AbstractController
             'entity' => $entity,
             'user' => $user,
             'activityData' => $activityData,
-            //'delete_form' => $deleteForm->createView(),
+            // 'delete_form' => $deleteForm->createView(),
         ]);
     }
 
@@ -498,12 +495,12 @@ class CalendarController extends AbstractController
             'returnPath' => $request->query->get('returnPath', null),
         ];
 
-        if ($calendar->getContext() === 'accompanying_period') {
+        if ('accompanying_period' === $calendar->getContext()) {
             $routeParams['accompanying_period_id'] = $calendar->getAccompanyingPeriod()->getId();
-        } elseif ($calendar->getContext() === 'person') {
+        } elseif ('person' === $calendar->getContext()) {
             $routeParams['person_id'] = $calendar->getPerson()->getId();
         } else {
-            throw new RuntimeException('context not found for this calendar');
+            throw new \RuntimeException('context not found for this calendar');
         }
 
         return $this->redirectToRoute('chill_activity_activity_new', $routeParams);
@@ -512,7 +509,7 @@ class CalendarController extends AbstractController
     private function buildListFilterOrder(): FilterOrderHelper
     {
         $filterOrder = $this->filterOrderHelperFactory->create(self::class);
-        $filterOrder->addDateRange('startDate', null, new DateTimeImmutable('3 days ago'), null);
+        $filterOrder->addDateRange('startDate', null, new \DateTimeImmutable('3 days ago'), null);
 
         return $filterOrder->build();
     }
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php
index 6582fac28..d0f5e623d 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php
@@ -16,7 +16,6 @@ use Chill\CalendarBundle\Entity\CalendarDoc;
 use Chill\CalendarBundle\Form\CalendarDocCreateType;
 use Chill\CalendarBundle\Form\CalendarDocEditType;
 use Chill\CalendarBundle\Security\Voter\CalendarDocVoter;
-use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormFactoryInterface;
@@ -27,9 +26,6 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Templating\EngineInterface;
-use UnexpectedValueException;
 
 final readonly class CalendarDocController
 {
@@ -69,7 +65,7 @@ final readonly class CalendarDocController
                 break;
 
             default:
-                throw new UnexpectedValueException('Unsupported context');
+                throw new \UnexpectedValueException('Unsupported context');
         }
 
         $calendarDocDTO = new CalendarDoc\CalendarDocCreateDTO();
@@ -186,7 +182,7 @@ final readonly class CalendarDocController
                 break;
 
             default:
-                throw new UnexpectedValueException('Unsupported context');
+                throw new \UnexpectedValueException('Unsupported context');
         }
 
         $calendarDocEditDTO = new CalendarDoc\CalendarDocEditDTO($calendarDoc);
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
index e7e688ae3..459d8f6aa 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
@@ -15,12 +15,10 @@ use Chill\CalendarBundle\Repository\CalendarRangeRepository;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Serializer\Model\Collection;
-use DateTimeImmutable;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-
 use Symfony\Component\Routing\Annotation\Route;
 
 class CalendarRangeAPIController extends ApiController
@@ -35,15 +33,15 @@ class CalendarRangeAPIController extends ApiController
      */
     public function availableRanges(User $user, Request $request, string $_format): JsonResponse
     {
-        //return new JsonResponse(['ok' => true], 200, [], false);
+        // return new JsonResponse(['ok' => true], 200, [], false);
         $this->denyAccessUnlessGranted('ROLE_USER');
 
         if (!$request->query->has('dateFrom')) {
             throw new BadRequestHttpException('You must provide a dateFrom parameter');
         }
 
-        if (false === $dateFrom = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::ATOM,
+        if (false === $dateFrom = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::ATOM,
             $request->query->get('dateFrom')
         )) {
             throw new BadRequestHttpException('dateFrom not parsable');
@@ -53,8 +51,8 @@ class CalendarRangeAPIController extends ApiController
             throw new BadRequestHttpException('You must provide a dateTo parameter');
         }
 
-        if (false === $dateTo = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::ATOM,
+        if (false === $dateTo = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::ATOM,
             $request->query->get('dateTo')
         )) {
             throw new BadRequestHttpException('dateTo not parsable');
diff --git a/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php b/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php
index a3069044b..784a6f6ce 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php
@@ -31,7 +31,6 @@ use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
-use function in_array;
 
 class InviteApiController
 {
@@ -58,7 +57,7 @@ class InviteApiController
             throw new AccessDeniedHttpException('not allowed to answer on this invitation');
         }
 
-        if (!in_array($answer, Invite::STATUSES, true)) {
+        if (!\in_array($answer, Invite::STATUSES, true)) {
             throw new BadRequestHttpException('answer not valid');
         }
 
diff --git a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php
index 20b7a4a55..e7d423abd 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php
@@ -19,13 +19,11 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\Messenger\Message\MSGraphChangeNotificationMessage;
-use JsonException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
-use const JSON_THROW_ON_ERROR;
 
 class RemoteCalendarMSGraphSyncController
 {
@@ -44,8 +42,8 @@ class RemoteCalendarMSGraphSyncController
         }
 
         try {
-            $body = json_decode($request->getContent(), true, 512, JSON_THROW_ON_ERROR);
-        } catch (JsonException $e) {
+            $body = json_decode($request->getContent(), true, 512, \JSON_THROW_ON_ERROR);
+        } catch (\JsonException $e) {
             throw new BadRequestHttpException('could not decode json', $e);
         }
 
diff --git a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php
index e4b030c40..673912c0a 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php
@@ -22,14 +22,12 @@ use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterfa
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Serializer\Model\Collection;
-use DateTimeImmutable;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\SerializerInterface;
-use function count;
 
 /**
  * Contains method to get events (Calendar) from remote calendar.
@@ -47,8 +45,8 @@ class RemoteCalendarProxyController
             throw new BadRequestHttpException('You must provide a dateFrom parameter');
         }
 
-        if (false === $dateFrom = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::ATOM,
+        if (false === $dateFrom = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::ATOM,
             $request->query->get('dateFrom')
         )) {
             throw new BadRequestHttpException('dateFrom not parsable');
@@ -58,8 +56,8 @@ class RemoteCalendarProxyController
             throw new BadRequestHttpException('You must provide a dateTo parameter');
         }
 
-        if (false === $dateTo = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::ATOM,
+        if (false === $dateTo = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::ATOM,
             $request->query->get('dateTo')
         )) {
             throw new BadRequestHttpException('dateTo not parsable');
@@ -87,8 +85,8 @@ class RemoteCalendarProxyController
 
         // in some case, we cannot paginate: we have to fetch all the items at once. We must avoid
         // further requests by forcing the number of items returned.
-        if (count($events) > $paginator->getItemsPerPage()) {
-            $paginator->setItemsPerPage(count($events));
+        if (\count($events) > $paginator->getItemsPerPage()) {
+            $paginator->setItemsPerPage(\count($events));
         }
 
         $collection = new Collection($events, $paginator);
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php
index 6915f2e89..2ef7365ca 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php
@@ -28,7 +28,7 @@ class LoadCalendarACL extends Fixture implements OrderedFixtureInterface
         foreach ([
             CalendarVoter::CREATE,
             CalendarVoter::DELETE,
-            CalendarVoter::DELETE
+            CalendarVoter::DELETE,
         ] as $role) {
             $roleScopes[] = $r = (new RoleScope())
                 ->setRole($role);
@@ -51,5 +51,4 @@ class LoadCalendarACL extends Fixture implements OrderedFixtureInterface
     {
         return 16000;
     }
-
 }
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
index bddf70866..f222823bf 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Repository\UserRepository;
-use DateTimeImmutable;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
@@ -63,7 +62,7 @@ class LoadCalendarRange extends Fixture implements FixtureGroupInterface, Ordere
         $manager->persist($type);
         $manager->persist($location);
 
-        $now =  new DateTimeImmutable();
+        $now =  new \DateTimeImmutable();
 
         $days = [
             '2021-08-23',
@@ -74,8 +73,8 @@ class LoadCalendarRange extends Fixture implements FixtureGroupInterface, Ordere
             '2021-08-31',
             '2021-09-01',
             '2021-09-02',
-            (new DateTimeImmutable('tomorrow'))->format('Y-m-d'),
-            (new DateTimeImmutable('today'))->format('Y-m-d'),
+            (new \DateTimeImmutable('tomorrow'))->format('Y-m-d'),
+            (new \DateTimeImmutable('today'))->format('Y-m-d'),
             $now->add(new \DateInterval('P7D'))->format('Y-m-d'),
             $now->add(new \DateInterval('P8D'))->format('Y-m-d'),
             $now->add(new \DateInterval('P9D'))->format('Y-m-d'),
@@ -92,9 +91,9 @@ class LoadCalendarRange extends Fixture implements FixtureGroupInterface, Ordere
         foreach ($users as $u) {
             foreach ($days as $d) {
                 foreach ($hours as $h) {
-                    $event = $d . ' ' . $h;
-                    $startEvent = new DateTimeImmutable($event);
-                    $endEvent = new DateTimeImmutable($event . ' + 1 hours');
+                    $event = $d.' '.$h;
+                    $startEvent = new \DateTimeImmutable($event);
+                    $endEvent = new \DateTimeImmutable($event.' + 1 hours');
                     $calendarRange = (new CalendarRange())
                         ->setUser($u)
                         ->setStartDate($startEvent)
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
index bc5de7f70..d7e552d5d 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
@@ -39,12 +39,12 @@ class LoadCancelReason extends Fixture implements FixtureGroupInterface
         ];
 
         foreach ($arr as $a) {
-            echo 'Creating calendar cancel reason : ' . $a['name'] . "\n";
+            echo 'Creating calendar cancel reason : '.$a['name']."\n";
             $cancelReason = (new CancelReason())
                 ->setCanceledBy($a['name'])
                 ->setActive(true);
             $manager->persist($cancelReason);
-            $reference = 'CancelReason_' . $a['name'];
+            $reference = 'CancelReason_'.$a['name'];
             $this->addReference($reference, $cancelReason);
             static::$references[] = $reference;
         }
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
index ba325e296..f677a4283 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
@@ -46,12 +46,12 @@ class LoadInvite extends Fixture implements FixtureGroupInterface
         ];
 
         foreach ($arr as $a) {
-            echo 'Creating calendar invite : ' . $a['name']['fr'] . "\n";
+            echo 'Creating calendar invite : '.$a['name']['fr']."\n";
             $invite = (new Invite())
                 ->setStatus($a['status'])
                 ->setUser($this->getRandomUser());
             $manager->persist($invite);
-            $reference = 'Invite_' . $a['name']['fr'];
+            $reference = 'Invite_'.$a['name']['fr'];
             $this->addReference($reference, $invite);
             static::$references[] = $reference;
         }
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
index c848366bb..5aa8d8507 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
@@ -31,7 +31,7 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
         $loader->load('services/exports.yaml');
         $loader->load('services/controller.yml');
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index dd61dd39a..32308a50c 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -24,29 +24,26 @@ use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateInterval;
-use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\ReadableCollection;
 use Doctrine\Common\Collections\Selectable;
 use Doctrine\ORM\Mapping as ORM;
-use LogicException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Constraints\NotBlank;
-
 use Symfony\Component\Validator\Constraints\Range;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
-use function in_array;
 
 /**
  * @ORM\Table(
  *     name="chill_calendar.calendar",
  *     uniqueConstraints={@ORM\UniqueConstraint(name="idx_calendar_remote", columns={"remoteId"}, options={"where": "remoteId <> ''"})}
  * )
+ *
  * @ORM\Entity
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "chill_calendar_calendar": Calendar::class
  * })
@@ -94,6 +91,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod", inversedBy="calendars")
+     *
      * @Serializer\Groups({"calendar:read", "read"})
      */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
@@ -105,6 +103,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     /**
      * @ORM\OneToOne(targetEntity="CalendarRange", inversedBy="calendar")
+     *
      * @Serializer\Groups({"calendar:read", "read"})
      */
     private ?CalendarRange $calendarRange = null;
@@ -116,6 +115,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     /**
      * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="comment_")
+     *
      * @Serializer\Groups({"calendar:read", "read", "docgen:read"})
      */
     private CommentEmbeddable $comment;
@@ -127,21 +127,27 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     /**
      * @var Collection<CalendarDoc>
+     *
      * @ORM\OneToMany(targetEntity=CalendarDoc::class, mappedBy="calendar", orphanRemoval=true)
      */
     private Collection $documents;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=false)
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
+     *
      * @Assert\NotNull(message="calendar.An end date is required")
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
      */
     private ?int $id = null;
@@ -153,60 +159,80 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
      *     orphanRemoval=true,
      *     cascade={"persist", "remove", "merge", "detach"}
      * )
+     *
      * @ORM\JoinTable(name="chill_calendar.calendar_to_invites")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @var Collection&Selectable<int, Invite>
      */
     private Collection&Selectable $invites;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Assert\NotNull(message="calendar.A location is required")
      */
     private ?Location $location = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
+     *
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
+     *
      * @Assert\NotNull(message="calendar.A main user is mandatory")
      */
     private ?User $mainUser = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?Person $person = null;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person", inversedBy="calendars")
+     *
      * @ORM\JoinTable(name="chill_calendar.calendar_to_persons")
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
+     *
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
+     *
      * @Assert\Count(min=1, minMessage="calendar.At least {{ limit }} person is required.")
+     *
      * @var Collection<Person>
      */
     private Collection $persons;
 
     /**
      * @ORM\Embedded(class=PrivateCommentEmbeddable::class, columnPrefix="privateComment_")
+     *
      * @Serializer\Groups({"calendar:read"})
      */
     private PrivateCommentEmbeddable $privateComment;
 
     /**
      * @var Collection<ThirdParty>
+     *
      * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
+     *
      * @ORM\JoinTable(name="chill_calendar.calendar_to_thirdparties")
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
+     *
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
      */
     private Collection $professionals;
 
     /**
      * @ORM\Column(type="boolean", nullable=true)
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?bool $sendSMS = false;
@@ -218,21 +244,27 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=false)
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
+     *
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
+     *
      * @Assert\NotNull(message="calendar.A start date is required")
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=false, options={"default": "valid"})
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light"})
+     *
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
      */
     private string $status = self::STATUS_VALID;
 
     /**
      * @ORM\Column(type="boolean", nullable=true)
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?bool $urgent = false;
@@ -265,7 +297,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     public function addInvite(Invite $invite): self
     {
         if ($invite->getCalendar() instanceof Calendar && $invite->getCalendar() !== $this) {
-            throw new LogicException('Not allowed to move an invitation to another Calendar');
+            throw new \LogicException('Not allowed to move an invitation to another Calendar');
         }
 
         $this->invites[] = $invite;
@@ -324,7 +356,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         return match ($this->getContext()) {
             'person' => [$this->getPerson()->getCenter()],
             'accompanying_period' => $this->getAccompanyingPeriod()->getCenters(),
-            default => throw new LogicException('context not supported: ' . $this->getContext()),
+            default => throw new \LogicException('context not supported: '.$this->getContext()),
         };
     }
 
@@ -338,11 +370,11 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
      */
     public function getContext(): ?string
     {
-        if ($this->getAccompanyingPeriod() !== null) {
+        if (null !== $this->getAccompanyingPeriod()) {
             return 'accompanying_period';
         }
 
-        if ($this->getPerson() !== null) {
+        if (null !== $this->getPerson()) {
             return 'person';
         }
 
@@ -365,16 +397,16 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     /**
      * @Serializer\Groups({"docgen:read"})
      */
-    public function getDuration(): ?DateInterval
+    public function getDuration(): ?\DateInterval
     {
-        if ($this->getStartDate() === null || $this->getEndDate() === null) {
+        if (null === $this->getStartDate() || null === $this->getEndDate()) {
             return null;
         }
 
         return $this->getStartDate()->diff($this->getEndDate());
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -453,7 +485,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
             $personsNotAssociated = [];
 
             foreach ($this->persons as $person) {
-                if (!in_array($person, $this->getPersonsAssociated(), true)) {
+                if (!\in_array($person, $this->getPersonsAssociated(), true)) {
                     $personsNotAssociated[] = $person;
                 }
             }
@@ -487,7 +519,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         return $this->smsStatus;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -509,6 +541,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     /**
      * @return ReadableCollection<(int|string), User>
+     *
      * @Serializer\Groups({"calendar:read", "read"})
      */
     public function getUsers(): ReadableCollection
@@ -558,7 +591,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     public function removeDocument(CalendarDoc $calendarDoc): self
     {
         if ($calendarDoc->getCalendar() !== $this) {
-            throw new LogicException('cannot remove document of another calendar');
+            throw new \LogicException('cannot remove document of another calendar');
         }
 
         return $this;
@@ -652,7 +685,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         return $this;
     }
 
-    public function setEndDate(DateTimeImmutable $endDate): self
+    public function setEndDate(\DateTimeImmutable $endDate): self
     {
         if (null === $this->endDate || $this->endDate->getTimestamp() !== $endDate->getTimestamp()) {
             $this->increaseaDatetimeVersion();
@@ -710,7 +743,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         return $this;
     }
 
-    public function setStartDate(DateTimeImmutable $startDate): self
+    public function setStartDate(\DateTimeImmutable $startDate): self
     {
         if (null === $this->startDate || $this->startDate->getTimestamp() !== $startDate->getTimestamp()) {
             $this->increaseaDatetimeVersion();
@@ -725,7 +758,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     {
         $this->status = $status;
 
-        if (self::STATUS_CANCELED === $status && $this->getSmsStatus() === self::SMS_SENT) {
+        if (self::STATUS_CANCELED === $status && self::SMS_SENT === $this->getSmsStatus()) {
             $this->setSmsStatus(self::SMS_CANCEL_PENDING);
         }
 
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc.php
index 763488560..5ea958fab 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc.php
@@ -22,6 +22,7 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_calendar.calendar_doc",
  * )
@@ -34,6 +35,7 @@ class CalendarDoc implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\ManyToOne(targetEntity=Calendar::class, inversedBy="documents")
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private Calendar $calendar;
@@ -45,7 +47,9 @@ class CalendarDoc implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -57,9 +61,10 @@ class CalendarDoc implements TrackCreationInterface, TrackUpdateInterface
 
     public function __construct(Calendar $calendar, /**
      * @ORM\ManyToOne(targetEntity=StoredObject::class, cascade={"persist"})
+     *
      * @ORM\JoinColumn(nullable=false)
      */
-        private ?\Chill\DocStoreBundle\Entity\StoredObject $storedObject)
+        private ?StoredObject $storedObject)
     {
         $this->setCalendar($calendar);
         $this->datetimeVersion = $calendar->getDateTimeVersion();
@@ -108,8 +113,6 @@ class CalendarDoc implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @internal use @see{Calendar::removeDocument} instead
-     *
-     * @param Calendar $calendar
      */
     public function setCalendar(?Calendar $calendar): CalendarDoc
     {
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocCreateDTO.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocCreateDTO.php
index b7209e46f..ff4e10402 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocCreateDTO.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocCreateDTO.php
@@ -18,12 +18,14 @@ class CalendarDocCreateDTO
 {
     /**
      * @Assert\NotNull
+     *
      * @Assert\Valid
      */
     public ?StoredObject $doc = null;
 
     /**
      * @Assert\NotBlank
+     *
      * @Assert\NotNull
      */
     public ?string $title = '';
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocEditDTO.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocEditDTO.php
index ff57d9876..2e8970db6 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocEditDTO.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocEditDTO.php
@@ -24,6 +24,7 @@ class CalendarDocEditDTO
 
     /**
      * @Assert\NotBlank
+     *
      * @Assert\NotNull
      */
     public ?string $title = '';
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
index 6bd44aeca..0c46db57c 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -27,6 +26,7 @@ use Symfony\Component\Validator\Constraints as Assert;
  *     name="chill_calendar.calendar_range",
  *     uniqueConstraints={@ORM\UniqueConstraint(name="idx_calendar_range_remote", columns={"remoteId"}, options={"where": "remoteId <> ''"})}
  * )
+ *
  * @ORM\Entity
  */
 class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
@@ -44,37 +44,49 @@ class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=false)
+     *
      * @Groups({"read", "write", "calendar:read"})
+     *
      * @Assert\NotNull
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Groups({"read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Location::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Groups({"read", "write", "calendar:read"})
+     *
      * @Assert\NotNull
      */
     private ?Location $location = null;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=false)
+     *
      * @groups({"read", "write", "calendar:read"})
+     *
      * @Assert\NotNull
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @Groups({"read", "write", "calendar:read"})
+     *
      * @Assert\NotNull
      */
     private ?User $user = null;
@@ -84,7 +96,7 @@ class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
         return $this->calendar;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -99,7 +111,7 @@ class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
         return $this->location;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -117,7 +129,7 @@ class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
         $this->calendar = $calendar;
     }
 
-    public function setEndDate(DateTimeImmutable $endDate): self
+    public function setEndDate(\DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
 
@@ -131,7 +143,7 @@ class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setStartDate(DateTimeImmutable $startDate): self
+    public function setStartDate(\DateTimeImmutable $startDate): self
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
index 6ed74e8d9..cff54e70b 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
@@ -16,6 +16,7 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table(name="chill_calendar.cancel_reason")
+ *
  * @ORM\Entity(repositoryClass=CancelReasonRepository::class)
  */
 class CancelReason
@@ -38,7 +39,9 @@ class CancelReason
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Invite.php b/src/Bundle/ChillCalendarBundle/Entity/Invite.php
index da1b9bb9e..48fe865b0 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Invite.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Invite.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
-use LogicException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
@@ -30,6 +29,7 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  *     name="chill_calendar.invite",
  *     uniqueConstraints={@ORM\UniqueConstraint(name="idx_calendar_invite_remote", columns={"remoteId"}, options={"where": "remoteId <> ''"})}
  * )
+ *
  * @ORM\Entity
  */
 class Invite implements TrackUpdateInterface, TrackCreationInterface
@@ -65,21 +65,27 @@ class Invite implements TrackUpdateInterface, TrackCreationInterface
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups(groups={"calendar:read", "read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": "pending"})
+     *
      * @Serializer\Groups(groups={"calendar:read", "read", "docgen:read"})
      */
     private string $status = self::PENDING;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Serializer\Groups(groups={"calendar:read", "read", "docgen:read"})
      */
     private ?User $user = null;
@@ -122,7 +128,7 @@ class Invite implements TrackUpdateInterface, TrackCreationInterface
     public function setUser(?User $user): self
     {
         if ($user instanceof User && $this->user instanceof User && $user !== $this->user) {
-            throw new LogicException('Not allowed to associate an invite to a different user');
+            throw new \LogicException('Not allowed to associate an invite to a different user');
         }
 
         $this->user = $user;
diff --git a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
index fab77afc4..82c76eea4 100644
--- a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
+++ b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
@@ -15,8 +15,6 @@ use Chill\ActivityBundle\Entity\Activity;
 use Doctrine\Persistence\Event\LifecycleEventArgs;
 use Symfony\Component\HttpFoundation\RequestStack;
 
-use function array_key_exists;
-
 class ListenToActivityCreate
 {
     public function __construct(private readonly RequestStack $requestStack) {}
@@ -33,7 +31,7 @@ class ListenToActivityCreate
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
 
-            if (array_key_exists('calendarId', $activityData)) {
+            if (\array_key_exists('calendarId', $activityData)) {
                 $calendarId = $activityData['calendarId'];
 
                 // Attach the activity to the calendar
diff --git a/src/Bundle/ChillCalendarBundle/Exception/UserAbsenceSyncException.php b/src/Bundle/ChillCalendarBundle/Exception/UserAbsenceSyncException.php
index a5e5a679a..dd2c0b9c2 100644
--- a/src/Bundle/ChillCalendarBundle/Exception/UserAbsenceSyncException.php
+++ b/src/Bundle/ChillCalendarBundle/Exception/UserAbsenceSyncException.php
@@ -13,7 +13,7 @@ namespace Chill\CalendarBundle\Exception;
 
 class UserAbsenceSyncException extends \LogicException
 {
-    public function __construct(string $message = "", int $code = 20_230_706, ?\Throwable $previous = null)
+    public function __construct(string $message = '', int $code = 20_230_706, \Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
index be389b5f0..5e2091fac 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
@@ -15,10 +15,8 @@ use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class AgentAggregator implements AggregatorInterface
 {
@@ -31,7 +29,7 @@ final readonly class AgentAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('caluser', $qb->getAllAliases(), true)) {
+        if (!\in_array('caluser', $qb->getAllAliases(), true)) {
             $qb->join('cal.mainUser', 'caluser');
         }
 
@@ -48,12 +46,13 @@ final readonly class AgentAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
index 66e94b8e7..7c84653d2 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
@@ -15,10 +15,8 @@ use Chill\CalendarBundle\Export\Declarations;
 use Chill\CalendarBundle\Repository\CancelReasonRepository;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class CancelReasonAggregator implements AggregatorInterface
 {
@@ -32,7 +30,7 @@ class CancelReasonAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         // TODO: still needs to take into account calendars without a cancel reason somehow
-        if (!in_array('calcancel', $qb->getAllAliases(), true)) {
+        if (!\in_array('calcancel', $qb->getAllAliases(), true)) {
             $qb->join('cal.cancelReason', 'calcancel');
         }
 
@@ -49,12 +47,13 @@ class CancelReasonAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
index 189d70130..76cbe5cd8 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserJobRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -50,10 +49,10 @@ final readonly class JobAggregator implements AggregatorInterface
             // job_at based on cal.startDate
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", "cal.startDate"),
+                    $qb->expr()->lte("{$p}_history.startDate", 'cal.startDate'),
                     $qb->expr()->orX(
                         $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", "cal.startDate")
+                        $qb->expr()->gt("{$p}_history.endDate", 'cal.startDate')
                     )
                 )
             )
@@ -73,7 +72,7 @@ final readonly class JobAggregator implements AggregatorInterface
         return [];
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -96,7 +95,7 @@ final readonly class JobAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
index b45177bb5..6481f95b4 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
@@ -14,10 +14,8 @@ namespace Chill\CalendarBundle\Export\Aggregator;
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\LocationRepository;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class LocationAggregator implements AggregatorInterface
 {
@@ -30,7 +28,7 @@ final readonly class LocationAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('calloc', $qb->getAllAliases(), true)) {
+        if (!\in_array('calloc', $qb->getAllAliases(), true)) {
             $qb->join('cal.location', 'calloc');
         }
         $qb->addSelect('IDENTITY(cal.location) as location_aggregator');
@@ -46,12 +44,13 @@ final readonly class LocationAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
index 90301e92f..be9406cfa 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
@@ -15,10 +15,8 @@ use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\LocationTypeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class LocationTypeAggregator implements AggregatorInterface
 {
@@ -31,7 +29,7 @@ final readonly class LocationTypeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('calloc', $qb->getAllAliases(), true)) {
+        if (!\in_array('calloc', $qb->getAllAliases(), true)) {
             $qb->join('cal.location', 'calloc');
         }
 
@@ -48,12 +46,13 @@ final readonly class LocationTypeAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
index b3c2aaf19..6bf65b8ef 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
@@ -13,7 +13,6 @@ namespace Chill\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -40,12 +39,13 @@ class MonthYearAggregator implements AggregatorInterface
     {
         // No form needed
     }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getLabels($key, array $values, $data): \Closure
     {
         return static function ($value): string {
             if ('_header' === $value) {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
index 5412a15d1..4998f6d1f 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
@@ -16,14 +16,13 @@ use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
 final readonly class ScopeAggregator implements AggregatorInterface
 {
-    private const PREFIX = "cal_agg_scope";
+    private const PREFIX = 'cal_agg_scope';
 
     public function __construct(
         private ScopeRepository $scopeRepository,
@@ -40,7 +39,7 @@ final readonly class ScopeAggregator implements AggregatorInterface
         $p = self::PREFIX;
 
         $qb
-            ->leftJoin("cal.mainUser", "{$p}_user")
+            ->leftJoin('cal.mainUser', "{$p}_user")
             ->leftJoin(
                 UserScopeHistory::class,
                 "{$p}_history",
@@ -50,10 +49,10 @@ final readonly class ScopeAggregator implements AggregatorInterface
             // scope_at based on cal.startDate
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", "cal.startDate"),
+                    $qb->expr()->lte("{$p}_history.startDate", 'cal.startDate'),
                     $qb->expr()->orX(
                         $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", "cal.startDate")
+                        $qb->expr()->gt("{$p}_history.endDate", 'cal.startDate')
                     )
                 )
             )
@@ -73,7 +72,7 @@ final readonly class ScopeAggregator implements AggregatorInterface
         return [];
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -96,7 +95,7 @@ final readonly class ScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/UrgencyAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/UrgencyAggregator.php
index f37bdec0f..e9213d3cb 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/UrgencyAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/UrgencyAggregator.php
@@ -20,9 +20,7 @@ namespace Chill\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -50,12 +48,13 @@ class UrgencyAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -65,7 +64,7 @@ class UrgencyAggregator implements AggregatorInterface
             return match ($value) {
                 true => $this->translator->trans('is urgent'),
                 false => $this->translator->trans('is not urgent'),
-                default => throw new LogicException(sprintf('The value %s is not valid', $value)),
+                default => throw new \LogicException(sprintf('The value %s is not valid', $value)),
             };
         };
     }
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php b/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
index 771e66504..2e156d7a0 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Closure;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -32,6 +31,7 @@ class CountCalendars implements ExportInterface, GroupedExportInterface
     {
         // No form necessary
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
index 3c73888d5..b69185a17 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
@@ -20,7 +20,6 @@ use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class StatCalendarAvgDuration implements ExportInterface, GroupedExportInterface
@@ -31,6 +30,7 @@ class StatCalendarAvgDuration implements ExportInterface, GroupedExportInterface
     {
         // no form needed
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -54,7 +54,7 @@ class StatCalendarAvgDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         $labels = array_combine($values, $values);
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
index 155cf7b69..8ea23014c 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
@@ -20,7 +20,6 @@ use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class StatCalendarSumDuration implements ExportInterface, GroupedExportInterface
@@ -31,6 +30,7 @@ class StatCalendarSumDuration implements ExportInterface, GroupedExportInterface
     {
         // no form needed
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -54,7 +54,7 @@ class StatCalendarSumDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         $labels = array_combine($values, $values);
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
index 453e14fae..c16c148fc 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
@@ -58,6 +58,7 @@ class AgentFilter implements FilterInterface
             'expanded' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
index 4db5d2e80..90a004388 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
@@ -58,6 +58,7 @@ class BetweenDatesFilter implements FilterInterface
             ->add('date_from', PickRollingDateType::class, [])
             ->add('date_to', PickRollingDateType::class, []);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php
index c53e9ba1f..63149509f 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php
@@ -20,7 +20,6 @@ namespace Chill\CalendarBundle\Export\Filter;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -66,6 +65,7 @@ class CalendarRangeFilter implements FilterInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['hasCalendarRange' => self::DEFAULT_CHOICE];
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
index 93def5631..c122a298d 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
@@ -20,7 +20,6 @@ use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 final readonly class JobFilter implements FilterInterface
 {
@@ -40,7 +39,7 @@ final readonly class JobFilter implements FilterInterface
         $p = self::PREFIX;
 
         $qb
-            ->leftJoin("cal.mainUser", "{$p}_user")
+            ->leftJoin('cal.mainUser', "{$p}_user")
             ->leftJoin(
                 UserJobHistory::class,
                 "{$p}_history",
@@ -50,19 +49,18 @@ final readonly class JobFilter implements FilterInterface
             // job_at based on cal.startDate
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", "cal.startDate"),
+                    $qb->expr()->lte("{$p}_history.startDate", 'cal.startDate'),
                     $qb->expr()->orX(
                         $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", "cal.startDate")
+                        $qb->expr()->gt("{$p}_history.endDate", 'cal.startDate')
                     )
                 )
             )
             ->andWhere($qb->expr()->in("{$p}_history.job", ":{$p}_job"))
             ->setParameter(
                 "{$p}_job",
-                $data["job"]
+                $data['job']
             );
-
     }
 
     public function applyOn(): string
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
index e04bd922b..93edc1b3a 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
@@ -41,7 +41,7 @@ class ScopeFilter implements FilterInterface
         $p = self::PREFIX;
 
         $qb
-            ->leftJoin("cal.mainUser", "{$p}_user")
+            ->leftJoin('cal.mainUser', "{$p}_user")
             ->leftJoin(
                 UserScopeHistory::class,
                 "{$p}_history",
@@ -51,17 +51,17 @@ class ScopeFilter implements FilterInterface
             // scope_at based on cal.startDate
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", "cal.startDate"),
+                    $qb->expr()->lte("{$p}_history.startDate", 'cal.startDate'),
                     $qb->expr()->orX(
                         $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", "cal.startDate")
+                        $qb->expr()->gt("{$p}_history.endDate", 'cal.startDate')
                     )
                 )
             )
             ->andWhere($qb->expr()->in("{$p}_history.scope", ":{$p}_scope"))
             ->setParameter(
                 "{$p}_scope",
-                $data["scope"]
+                $data['scope']
             );
     }
 
diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarDocEditType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarDocEditType.php
index 34a501028..224a74f01 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CalendarDocEditType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CalendarDocEditType.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Form;
 
 use Chill\CalendarBundle\Entity\CalendarDoc\CalendarDocEditDTO;
-use Chill\DocStoreBundle\Form\StoredObjectType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
index 702e27695..eec0b3f9f 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
@@ -21,7 +21,6 @@ use Chill\MainBundle\Form\Type\CommentType;
 use Chill\MainBundle\Form\Type\PrivateCommentType;
 use Chill\PersonBundle\Form\DataTransformer\PersonsToIdDataTransformer;
 use Chill\ThirdPartyBundle\Form\DataTransformer\ThirdPartiesToIdDataTransformer;
-use DateTimeImmutable;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
@@ -72,42 +71,42 @@ class CalendarType extends AbstractType
         $builder->add('startDate', HiddenType::class);
         $builder->get('startDate')
             ->addModelTransformer(new CallbackTransformer(
-                static function (?DateTimeImmutable $dateTimeImmutable): string {
+                static function (?\DateTimeImmutable $dateTimeImmutable): string {
                     if (null !== $dateTimeImmutable) {
-                        $res = date_format($dateTimeImmutable, DateTimeImmutable::ATOM);
+                        $res = date_format($dateTimeImmutable, \DateTimeImmutable::ATOM);
                     } else {
                         $res = '';
                     }
 
                     return $res;
                 },
-                static function (?string $dateAsString): ?DateTimeImmutable {
+                static function (?string $dateAsString): ?\DateTimeImmutable {
                     if ('' === $dateAsString || null === $dateAsString) {
                         return null;
                     }
 
-                    return DateTimeImmutable::createFromFormat(DateTimeImmutable::ATOM, $dateAsString);
+                    return \DateTimeImmutable::createFromFormat(\DateTimeImmutable::ATOM, $dateAsString);
                 }
             ));
 
         $builder->add('endDate', HiddenType::class);
         $builder->get('endDate')
             ->addModelTransformer(new CallbackTransformer(
-                static function (?DateTimeImmutable $dateTimeImmutable): string {
+                static function (?\DateTimeImmutable $dateTimeImmutable): string {
                     if (null !== $dateTimeImmutable) {
-                        $res = date_format($dateTimeImmutable, DateTimeImmutable::ATOM);
+                        $res = date_format($dateTimeImmutable, \DateTimeImmutable::ATOM);
                     } else {
                         $res = '';
                     }
 
                     return $res;
                 },
-                static function (?string $dateAsString): ?DateTimeImmutable {
+                static function (?string $dateAsString): ?\DateTimeImmutable {
                     if ('' === $dateAsString || null === $dateAsString) {
                         return null;
                     }
 
-                    return DateTimeImmutable::createFromFormat(DateTimeImmutable::ATOM, $dateAsString);
+                    return \DateTimeImmutable::createFromFormat(\DateTimeImmutable::ATOM, $dateAsString);
                 }
             ));
 
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
index 007e781cb..8f62fdcdb 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
@@ -21,7 +21,6 @@ namespace Chill\CalendarBundle\Messenger\Doctrine;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Messenger\Message\CalendarMessage;
 use Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PostPersistEventArgs;
 use Doctrine\ORM\Event\PostRemoveEventArgs;
 use Doctrine\ORM\Event\PostUpdateEventArgs;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
index beb46f870..8b875bdcb 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
@@ -21,7 +21,6 @@ namespace Chill\CalendarBundle\Messenger\Doctrine;
 use Chill\CalendarBundle\Entity\CalendarRange;
 use Chill\CalendarBundle\Messenger\Message\CalendarRangeMessage;
 use Chill\CalendarBundle\Messenger\Message\CalendarRangeRemovedMessage;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PostPersistEventArgs;
 use Doctrine\ORM\Event\PostRemoveEventArgs;
 use Doctrine\ORM\Event\PostUpdateEventArgs;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php
index f96d3d14c..7a67bee61 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php
@@ -43,7 +43,7 @@ class MSGraphChangeNotificationHandler implements MessageHandlerInterface
         $user = $this->userRepository->find($changeNotificationMessage->getUserId());
 
         if (null === $user) {
-            $this->logger->warning(self::class . ' notification concern non-existent user, skipping');
+            $this->logger->warning(self::class.' notification concern non-existent user, skipping');
 
             return;
         }
@@ -52,7 +52,7 @@ class MSGraphChangeNotificationHandler implements MessageHandlerInterface
             $secret = $this->mapCalendarToUser->getSubscriptionSecret($user);
 
             if ($secret !== ($notification['clientState'] ?? -1)) {
-                $this->logger->warning(self::class . ' could not validate secret, skipping');
+                $this->logger->warning(self::class.' could not validate secret, skipping');
 
                 continue;
             }
@@ -67,7 +67,7 @@ class MSGraphChangeNotificationHandler implements MessageHandlerInterface
                 $this->calendarSyncer->handleCalendarSync($calendar, $notification, $user);
                 $this->em->flush();
             } else {
-                $this->logger->info(self::class . ' id not found in any calendar nor calendar range');
+                $this->logger->info(self::class.' id not found in any calendar nor calendar range');
             }
         }
 
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php
index d86b61c6d..080140d86 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php
@@ -19,8 +19,6 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
-use LogicException;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
@@ -33,18 +31,18 @@ class EventsOnUserSubscriptionCreator
     public function __construct(private readonly LoggerInterface $logger, private readonly MachineHttpClient $machineHttpClient, private readonly MapCalendarToUser $mapCalendarToUser, private readonly UrlGeneratorInterface $urlGenerator) {}
 
     /**
+     * @return array{secret: string, id: string, expiration: int}
+     *
      * @throws ClientExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface
-     *
-     * @return array<secret: string, id: string, expiration: int>
      */
-    public function createSubscriptionForUser(User $user, DateTimeImmutable $expiration): array
+    public function createSubscriptionForUser(User $user, \DateTimeImmutable $expiration): array
     {
         if (null === $userId = $this->mapCalendarToUser->getUserId($user)) {
-            throw new LogicException('no user id');
+            throw new \LogicException('no user id');
         }
 
         $subscription = [
@@ -56,7 +54,7 @@ class EventsOnUserSubscriptionCreator
             ),
             'resource' => "/users/{$userId}/calendar/events",
             'clientState' => $secret = base64_encode(openssl_random_pseudo_bytes(92, $cstrong)),
-            'expirationDateTime' => $expiration->format(DateTimeImmutable::ATOM),
+            'expirationDateTime' => $expiration->format(\DateTimeImmutable::ATOM),
         ];
 
         try {
@@ -79,26 +77,26 @@ class EventsOnUserSubscriptionCreator
     }
 
     /**
+     * @return array{secret: string, id: string, expiration: int}
+     *
      * @throws ClientExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface
-     *
-     * @return array<secret: string, id: string, expiration: int>
      */
-    public function renewSubscriptionForUser(User $user, DateTimeImmutable $expiration): array
+    public function renewSubscriptionForUser(User $user, \DateTimeImmutable $expiration): array
     {
         if (null === $userId = $this->mapCalendarToUser->getUserId($user)) {
-            throw new LogicException('no user id');
+            throw new \LogicException('no user id');
         }
 
         if (null === $subscriptionId = $this->mapCalendarToUser->getActiveSubscriptionId($user)) {
-            throw new LogicException('no user id');
+            throw new \LogicException('no user id');
         }
 
         $subscription = [
-            'expirationDateTime' => $expiration->format(DateTimeImmutable::ATOM),
+            'expirationDateTime' => $expiration->format(\DateTimeImmutable::ATOM),
         ];
 
         try {
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php
index 740666cd6..37e3e1996 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php
@@ -13,7 +13,6 @@ namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use Chill\CalendarBundle\Exception\UserAbsenceSyncException;
 use Chill\MainBundle\Entity\User;
-use Psr\Log\LoggerInterface;
 use Symfony\Component\Clock\ClockInterface;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
@@ -43,25 +42,24 @@ final readonly class MSUserAbsenceReader implements MSUserAbsenceReaderInterface
 
         try {
             $automaticRepliesSettings = $this->machineHttpClient
-                ->request('GET', 'users/' . $id . '/mailboxSettings/automaticRepliesSetting')
+                ->request('GET', 'users/'.$id.'/mailboxSettings/automaticRepliesSetting')
                 ->toArray(true);
         } catch (ClientExceptionInterface|DecodingExceptionInterface|RedirectionExceptionInterface|TransportExceptionInterface $e) {
-            throw new UserAbsenceSyncException("Error receiving response for mailboxSettings", 0, $e);
+            throw new UserAbsenceSyncException('Error receiving response for mailboxSettings', 0, $e);
         } catch (ServerExceptionInterface $e) {
-            throw new UserAbsenceSyncException("Server error receiving response for mailboxSettings", 0, $e);
+            throw new UserAbsenceSyncException('Server error receiving response for mailboxSettings', 0, $e);
         }
 
-        if (!array_key_exists("status", $automaticRepliesSettings)) {
-            throw new \LogicException("no key \"status\" on automatic replies settings: " . json_encode($automaticRepliesSettings, JSON_THROW_ON_ERROR));
+        if (!array_key_exists('status', $automaticRepliesSettings)) {
+            throw new \LogicException('no key "status" on automatic replies settings: '.json_encode($automaticRepliesSettings, JSON_THROW_ON_ERROR));
         }
 
         return match ($automaticRepliesSettings['status']) {
             'disabled' => false,
             'alwaysEnabled' => true,
-            'scheduled' =>
-                RemoteEventConverter::convertStringDateWithoutTimezone($automaticRepliesSettings['scheduledStartDateTime']['dateTime']) < $this->clock->now()
+            'scheduled' => RemoteEventConverter::convertStringDateWithoutTimezone($automaticRepliesSettings['scheduledStartDateTime']['dateTime']) < $this->clock->now()
                 && RemoteEventConverter::convertStringDateWithoutTimezone($automaticRepliesSettings['scheduledEndDateTime']['dateTime']) > $this->clock->now(),
-            default => throw new UserAbsenceSyncException("this status is not documented by Microsoft")
+            default => throw new UserAbsenceSyncException('this status is not documented by Microsoft')
         };
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSync.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSync.php
index a54fa217f..318580ffc 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSync.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSync.php
@@ -36,13 +36,13 @@ readonly class MSUserAbsenceSync
             return;
         }
 
-        $this->logger->info("will change user absence", ['userId' => $user->getId()]);
+        $this->logger->info('will change user absence', ['userId' => $user->getId()]);
 
         if ($absence) {
-            $this->logger->debug("make user absent", ['userId' => $user->getId()]);
+            $this->logger->debug('make user absent', ['userId' => $user->getId()]);
             $user->setAbsenceStart($this->clock->now());
         } else {
-            $this->logger->debug("make user present", ['userId' => $user->getId()]);
+            $this->logger->debug('make user present', ['userId' => $user->getId()]);
             $user->setAbsenceStart(null);
         }
     }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php
index b7b9b4e73..ce490ce3f 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php
@@ -19,7 +19,6 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use League\OAuth2\Client\Tool\BearerAuthorizationTrait;
-use LogicException;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
@@ -30,17 +29,14 @@ class MachineHttpClient implements HttpClientInterface
 
     private readonly HttpClientInterface $decoratedClient;
 
-    /**
-     * @param HttpClientInterface $decoratedClient
-     */
-    public function __construct(private readonly MachineTokenStorage $machineTokenStorage, ?HttpClientInterface $decoratedClient = null)
+    public function __construct(private readonly MachineTokenStorage $machineTokenStorage, HttpClientInterface $decoratedClient = null)
     {
         $this->decoratedClient = $decoratedClient ?? \Symfony\Component\HttpClient\HttpClient::create();
     }
 
     /**
      * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface
-     * @throws LogicException if method is not supported
+     * @throws \LogicException                                                     if method is not supported
      */
     public function request(string $method, string $url, array $options = []): ResponseInterface
     {
@@ -66,13 +62,13 @@ class MachineHttpClient implements HttpClientInterface
                 break;
 
             default:
-                throw new LogicException("Method not supported: {$method}");
+                throw new \LogicException("Method not supported: {$method}");
         }
 
         return $this->decoratedClient->request($method, $url, $options);
     }
 
-    public function stream($responses, ?float $timeout = null): ResponseStreamInterface
+    public function stream($responses, float $timeout = null): ResponseStreamInterface
     {
         return $this->decoratedClient->stream($responses, $timeout);
     }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php
index ff6d63c10..4b214e6d0 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php
@@ -19,12 +19,9 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
-use LogicException;
 use Psr\Log\LoggerInterface;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use function array_key_exists;
 
 /**
  * Write metadata to user, which allow to find his default calendar.
@@ -43,12 +40,12 @@ class MapCalendarToUser
 
     public function getActiveSubscriptionId(User $user): string
     {
-        if (!array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
-            throw new LogicException('do not contains msgraph metadata');
+        if (!\array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
+            throw new \LogicException('do not contains msgraph metadata');
         }
 
-        if (!array_key_exists(self::ID_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY])) {
-            throw new LogicException('do not contains metadata for subscription id');
+        if (!\array_key_exists(self::ID_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY])) {
+            throw new \LogicException('do not contains metadata for subscription id');
         }
 
         return $user->getAttributes()[self::METADATA_KEY][self::ID_SUBSCRIPTION_EVENT];
@@ -83,12 +80,12 @@ class MapCalendarToUser
 
     public function getSubscriptionSecret(User $user): string
     {
-        if (!array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
-            throw new LogicException('do not contains msgraph metadata');
+        if (!\array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
+            throw new \LogicException('do not contains msgraph metadata');
         }
 
-        if (!array_key_exists(self::SECRET_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY])) {
-            throw new LogicException('do not contains secret in msgraph');
+        if (!\array_key_exists(self::SECRET_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY])) {
+            throw new \LogicException('do not contains secret in msgraph');
         }
 
         return $user->getAttributes()[self::METADATA_KEY][self::SECRET_SUBSCRIPTION_EVENT];
@@ -114,25 +111,25 @@ class MapCalendarToUser
 
     public function hasActiveSubscription(User $user): bool
     {
-        if (!array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
+        if (!\array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
             return false;
         }
 
-        if (!array_key_exists(self::EXPIRATION_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY])) {
+        if (!\array_key_exists(self::EXPIRATION_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY])) {
             return false;
         }
 
         return $user->getAttributes()[self::METADATA_KEY][self::EXPIRATION_SUBSCRIPTION_EVENT]
-            >= (new DateTimeImmutable('now'))->getTimestamp();
+            >= (new \DateTimeImmutable('now'))->getTimestamp();
     }
 
     public function hasSubscriptionSecret(User $user): bool
     {
-        if (!array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
+        if (!\array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
             return false;
         }
 
-        return array_key_exists(self::SECRET_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY]);
+        return \array_key_exists(self::SECRET_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY]);
     }
 
     public function hasUserId(User $user): bool
@@ -141,11 +138,11 @@ class MapCalendarToUser
             return false;
         }
 
-        if (!array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
+        if (!\array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
             return false;
         }
 
-        return array_key_exists('id', $user->getAttributes()[self::METADATA_KEY]);
+        return \array_key_exists('id', $user->getAttributes()[self::METADATA_KEY]);
     }
 
     public function writeMetadata(User $user): User
@@ -179,8 +176,8 @@ class MapCalendarToUser
     public function writeSubscriptionMetadata(
         User $user,
         int $expiration,
-        ?string $id = null,
-        ?string $secret = null
+        string $id = null,
+        string $secret = null
     ): void {
         $user->setAttributeByDomain(self::METADATA_KEY, self::EXPIRATION_SUBSCRIPTION_EVENT, $expiration);
 
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php
index 32f0e5dec..d969a56b6 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php
@@ -19,7 +19,6 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use League\OAuth2\Client\Tool\BearerAuthorizationTrait;
-use LogicException;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
@@ -30,10 +29,7 @@ class OnBehalfOfUserHttpClient
 
     private readonly HttpClientInterface $decoratedClient;
 
-    /**
-     * @param HttpClientInterface $decoratedClient
-     */
-    public function __construct(private readonly OnBehalfOfUserTokenStorage $tokenStorage, ?HttpClientInterface $decoratedClient = null)
+    public function __construct(private readonly OnBehalfOfUserTokenStorage $tokenStorage, HttpClientInterface $decoratedClient = null)
     {
         $this->decoratedClient = $decoratedClient ?? \Symfony\Component\HttpClient\HttpClient::create();
     }
@@ -61,13 +57,13 @@ class OnBehalfOfUserHttpClient
                 break;
 
             default:
-                throw new LogicException("Method not supported: {$method}");
+                throw new \LogicException("Method not supported: {$method}");
         }
 
         return $this->decoratedClient->request($method, $url, $options);
     }
 
-    public function stream($responses, ?float $timeout = null): ResponseStreamInterface
+    public function stream($responses, float $timeout = null): ResponseStreamInterface
     {
         return $this->decoratedClient->stream($responses, $timeout);
     }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
index a3a8971bc..d8fff109b 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
@@ -18,7 +18,6 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
-use LogicException;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use TheNetworg\OAuth2\Client\Provider\Azure;
 use TheNetworg\OAuth2\Client\Token\AccessToken;
@@ -38,7 +37,7 @@ class OnBehalfOfUserTokenStorage
         $token = $this->session->get(self::MS_GRAPH_ACCESS_TOKEN, null);
 
         if (null === $token) {
-            throw new LogicException('unexisting token');
+            throw new \LogicException('unexisting token');
         }
 
         if ($token->hasExpired()) {
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
index 5b52a6ecd..94b488ddd 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
@@ -24,11 +24,7 @@ use Chill\CalendarBundle\Entity\Invite;
 use Chill\CalendarBundle\RemoteCalendar\Model\RemoteEvent;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
-use DateTimeImmutable;
-use DateTimeZone;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
@@ -52,9 +48,9 @@ class RemoteEventConverter
 
     private const REMOTE_DATETIME_WITHOUT_TZ_FORMAT = 'Y-m-d\TH:i:s.u?';
 
-    private readonly DateTimeZone $defaultDateTimeZone;
+    private readonly \DateTimeZone $defaultDateTimeZone;
 
-    private readonly DateTimeZone $remoteDateTimeZone;
+    private readonly \DateTimeZone $remoteDateTimeZone;
 
     public function __construct(
         private readonly \Twig\Environment $engine,
@@ -63,7 +59,7 @@ class RemoteEventConverter
         private readonly PersonRenderInterface $personRender,
         private readonly TranslatorInterface $translator
     ) {
-        $this->defaultDateTimeZone = (new DateTimeImmutable())->getTimezone();
+        $this->defaultDateTimeZone = (new \DateTimeImmutable())->getTimezone();
         $this->remoteDateTimeZone = self::getRemoteTimeZone();
     }
 
@@ -103,7 +99,7 @@ class RemoteEventConverter
     {
         $result = array_merge(
             [
-                'subject' => '[Chill] ' .
+                'subject' => '[Chill] '.
                     implode(
                         ', ',
                         $calendar->getPersons()->map(fn (Person $p) => $this->personRender->renderString($p, []))->toArray()
@@ -119,7 +115,7 @@ class RemoteEventConverter
                     'timeZone' => 'UTC',
                 ],
                 'allowNewTimeProposals' => false,
-                'transactionId' => 'calendar_' . $calendar->getId(),
+                'transactionId' => 'calendar_'.$calendar->getId(),
                 'body' => [
                     'contentType' => 'text',
                     'content' => $this->engine->render(
@@ -152,45 +148,45 @@ class RemoteEventConverter
     public function convertAvailabilityToRemoteEvent(array $event): RemoteEvent
     {
         $startDate =
-            DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['start']['dateTime'], $this->remoteDateTimeZone)
+            \DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['start']['dateTime'], $this->remoteDateTimeZone)
                 ->setTimezone($this->defaultDateTimeZone);
         $endDate =
-            DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['end']['dateTime'], $this->remoteDateTimeZone)
+            \DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['end']['dateTime'], $this->remoteDateTimeZone)
                 ->setTimezone($this->defaultDateTimeZone);
 
         return new RemoteEvent(
             uniqid('generated_'),
-            $this->translator->trans('remote_ms_graph.freebusy_statuses.' . $event['status']),
+            $this->translator->trans('remote_ms_graph.freebusy_statuses.'.$event['status']),
             '',
             $startDate,
             $endDate
         );
     }
 
-    public static function convertStringDateWithoutTimezone(string $date): DateTimeImmutable
+    public static function convertStringDateWithoutTimezone(string $date): \DateTimeImmutable
     {
-        $d = DateTimeImmutable::createFromFormat(
+        $d = \DateTimeImmutable::createFromFormat(
             self::REMOTE_DATETIME_WITHOUT_TZ_FORMAT,
             $date,
             self::getRemoteTimeZone()
         );
 
         if (false === $d) {
-            throw new RuntimeException("could not convert string date to datetime: {$date}");
+            throw new \RuntimeException("could not convert string date to datetime: {$date}");
         }
 
-        return $d->setTimezone((new DateTimeImmutable())->getTimezone());
+        return $d->setTimezone((new \DateTimeImmutable())->getTimezone());
     }
 
-    public static function convertStringDateWithTimezone(string $date): DateTimeImmutable
+    public static function convertStringDateWithTimezone(string $date): \DateTimeImmutable
     {
-        $d = DateTimeImmutable::createFromFormat(self::REMOTE_DATETIMEZONE_FORMAT, $date);
+        $d = \DateTimeImmutable::createFromFormat(self::REMOTE_DATETIMEZONE_FORMAT, $date);
 
         if (false === $d) {
-            throw new RuntimeException("could not convert string date to datetime: {$date}");
+            throw new \RuntimeException("could not convert string date to datetime: {$date}");
         }
 
-        $d->setTimezone((new DateTimeImmutable())->getTimezone());
+        $d->setTimezone((new \DateTimeImmutable())->getTimezone());
 
         return $d;
     }
@@ -198,10 +194,10 @@ class RemoteEventConverter
     public function convertToRemote(array $event): RemoteEvent
     {
         $startDate =
-            DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['start']['dateTime'], $this->remoteDateTimeZone)
+            \DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['start']['dateTime'], $this->remoteDateTimeZone)
                 ->setTimezone($this->defaultDateTimeZone);
         $endDate =
-            DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['end']['dateTime'], $this->remoteDateTimeZone)
+            \DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['end']['dateTime'], $this->remoteDateTimeZone)
                 ->setTimezone($this->defaultDateTimeZone);
 
         return new RemoteEvent(
@@ -214,26 +210,22 @@ class RemoteEventConverter
         );
     }
 
-    public function getLastModifiedDate(array $event): DateTimeImmutable
+    public function getLastModifiedDate(array $event): \DateTimeImmutable
     {
-        $date = DateTimeImmutable::createFromFormat(self::REMOTE_DATETIMEZONE_FORMAT, $event['lastModifiedDateTime']);
+        $date = \DateTimeImmutable::createFromFormat(self::REMOTE_DATETIMEZONE_FORMAT, $event['lastModifiedDateTime']);
 
         if (false === $date) {
-            $date = DateTimeImmutable::createFromFormat(self::REMOTE_DATETIMEZONE_FORMAT_ALT, $event['lastModifiedDateTime']);
+            $date = \DateTimeImmutable::createFromFormat(self::REMOTE_DATETIMEZONE_FORMAT_ALT, $event['lastModifiedDateTime']);
         }
 
         if (false === $date) {
-            $this->logger->error(self::class . ' Could not convert lastModifiedDate', [
+            $this->logger->error(self::class.' Could not convert lastModifiedDate', [
                 'actual' => $event['lastModifiedDateTime'],
                 'format' => self::REMOTE_DATETIMEZONE_FORMAT,
                 'format_alt' => self::REMOTE_DATETIMEZONE_FORMAT_ALT,
             ]);
 
-            throw new RuntimeException(sprintf(
-                'could not convert lastModifiedDate: %s, expected format: %s',
-                $event['lastModifiedDateTime'],
-                self::REMOTE_DATETIMEZONE_FORMAT . ' and ' . self::REMOTE_DATETIMEZONE_FORMAT_ALT
-            ));
+            throw new \RuntimeException(sprintf('could not convert lastModifiedDate: %s, expected format: %s', $event['lastModifiedDateTime'], self::REMOTE_DATETIMEZONE_FORMAT.' and '.self::REMOTE_DATETIMEZONE_FORMAT_ALT));
         }
 
         return $date;
@@ -247,9 +239,9 @@ class RemoteEventConverter
         return 'Y-m-d\TH:i:s';
     }
 
-    public static function getRemoteTimeZone(): DateTimeZone
+    public static function getRemoteTimeZone(): \DateTimeZone
     {
-        return new DateTimeZone('UTC');
+        return new \DateTimeZone('UTC');
     }
 
     private function buildInviteToAttendee(Invite $invite): array
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarRangeSyncer.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarRangeSyncer.php
index 847052a26..1dffe198c 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarRangeSyncer.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarRangeSyncer.php
@@ -24,7 +24,6 @@ use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\RemoteEventConverter;
 use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -45,7 +44,7 @@ class CalendarRangeSyncer
                 }
                 $calendarRange->preventEnqueueChanges = true;
 
-                $this->logger->info(self::class . ' remove a calendar range because deleted on remote calendar');
+                $this->logger->info(self::class.' remove a calendar range because deleted on remote calendar');
                 $this->em->remove($calendarRange);
 
                 break;
@@ -57,7 +56,7 @@ class CalendarRangeSyncer
                         $notification['resource']
                     )->toArray();
                 } catch (ClientExceptionInterface $clientException) {
-                    $this->logger->warning(self::class . ' could not retrieve event from ms graph. Already deleted ?', [
+                    $this->logger->warning(self::class.' could not retrieve event from ms graph. Already deleted ?', [
                         'calendarRangeId' => $calendarRange->getId(),
                         'remoteEventId' => $notification['resource'],
                     ]);
@@ -68,7 +67,7 @@ class CalendarRangeSyncer
                 $lastModified = RemoteEventConverter::convertStringDateWithTimezone($new['lastModifiedDateTime']);
 
                 if ($calendarRange->getRemoteAttributes()['lastModifiedDateTime'] === $lastModified->getTimestamp()) {
-                    $this->logger->info(self::class . ' change key is equals. Source is probably a local update', [
+                    $this->logger->info(self::class.' change key is equals. Source is probably a local update', [
                         'calendarRangeId' => $calendarRange->getId(),
                         'remoteEventId' => $notification['resource'],
                     ]);
@@ -90,7 +89,7 @@ class CalendarRangeSyncer
                 break;
 
             default:
-                throw new RuntimeException('This changeType is not suppored: ' . $notification['changeType']);
+                throw new \RuntimeException('This changeType is not suppored: '.$notification['changeType']);
         }
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarSyncer.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarSyncer.php
index a1362a2ce..9b4daf626 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarSyncer.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarSyncer.php
@@ -23,12 +23,9 @@ use Chill\CalendarBundle\Entity\Invite;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\RemoteEventConverter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
-use LogicException;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use function in_array;
 
 class CalendarSyncer
 {
@@ -39,7 +36,7 @@ class CalendarSyncer
         match ($notification['changeType']) {
             'deleted' => $this->handleDeleteCalendar($calendar, $notification, $user),
             'updated' => $this->handleUpdateCalendar($calendar, $notification, $user),
-            default => throw new RuntimeException('this change type is not supported: ' . $notification['changeType']),
+            default => throw new \RuntimeException('this change type is not supported: '.$notification['changeType']),
         };
     }
 
@@ -59,7 +56,7 @@ class CalendarSyncer
                 $notification['resource']
             )->toArray();
         } catch (ClientExceptionInterface $clientException) {
-            $this->logger->warning(self::class . ' could not retrieve event from ms graph. Already deleted ?', [
+            $this->logger->warning(self::class.' could not retrieve event from ms graph. Already deleted ?', [
                 'calendarId' => $calendar->getId(),
                 'remoteEventId' => $notification['resource'],
             ]);
@@ -76,7 +73,7 @@ class CalendarSyncer
         );
 
         if ($calendar->getRemoteAttributes()['lastModifiedDateTime'] === $lastModified->getTimestamp()) {
-            $this->logger->info(self::class . ' change key is equals. Source is probably a local update', [
+            $this->logger->info(self::class.' change key is equals. Source is probably a local update', [
                 'calendarRangeId' => $calendar->getId(),
                 'remoteEventId' => $notification['resource'],
             ]);
@@ -135,12 +132,12 @@ class CalendarSyncer
                 'tentativelyAccepted' => $invite->setStatus(Invite::TENTATIVELY_ACCEPTED),
                 'accepted' => $invite->setStatus(Invite::ACCEPTED),
                 'declined' => $invite->setStatus(Invite::DECLINED),
-                default => throw new LogicException('should not happens, not implemented: ' . $status),
+                default => throw new \LogicException('should not happens, not implemented: '.$status),
             };
         }
 
         foreach ($calendar->getUsers() as $user) {
-            if (!in_array(strtolower($user->getEmailCanonical()), $emails, true)) {
+            if (!\in_array(strtolower($user->getEmailCanonical()), $emails, true)) {
                 $calendar->removeUser($user);
             }
         }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
index fe8fae8e6..768ad2a44 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
@@ -28,8 +28,6 @@ use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\RemoteEventConverter;
 use Chill\CalendarBundle\Repository\CalendarRangeRepository;
 use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
-use Exception;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
@@ -38,8 +36,6 @@ use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_key_exists;
-use function count;
 
 class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
 {
@@ -47,7 +43,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
 
     public function __construct(private readonly CalendarRepository $calendarRepository, private readonly CalendarRangeRepository $calendarRangeRepository, private readonly HttpClientInterface $machineHttpClient, private readonly MapCalendarToUser $mapCalendarToUser, private readonly LoggerInterface $logger, private readonly OnBehalfOfUserTokenStorage $tokenStorage, private readonly OnBehalfOfUserHttpClient $userHttpClient, private readonly RemoteEventConverter $remoteEventConverter, private readonly TranslatorInterface $translator, private readonly UrlGeneratorInterface $urlGenerator, private readonly Security $security) {}
 
-    public function countEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate): int
+    public function countEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate): int
     {
         $userId = $this->mapCalendarToUser->getUserId($user);
 
@@ -58,7 +54,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $data = $this->userHttpClient->request(
                 'GET',
-                'users/' . $userId . '/calendarView',
+                'users/'.$userId.'/calendarView',
                 [
                     'query' => [
                         'startDateTime' => $startDate->setTimezone(RemoteEventConverter::getRemoteTimeZone())->format(RemoteEventConverter::getRemoteDateTimeSimpleFormat()),
@@ -70,7 +66,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
             )->toArray();
         } catch (ClientExceptionInterface $e) {
             if (403 === $e->getResponse()->getStatusCode()) {
-                return count($this->getScheduleTimesForUser($user, $startDate, $endDate));
+                return \count($this->getScheduleTimesForUser($user, $startDate, $endDate));
             }
 
             $this->logger->error('Could not get list of event on MSGraph', [
@@ -107,6 +103,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
             $this->logger->debug('mark user ready for msgraph calendar as he does not have any mapping', [
                 'userId' => $user->getId(),
             ]);
+
             return true;
         }
 
@@ -114,14 +111,14 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
     }
 
     /**
+     * @return array|\Chill\CalendarBundle\RemoteCalendar\Model\RemoteEvent[]
+     *
      * @throws \Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface
-     *
-     * @return array|\Chill\CalendarBundle\RemoteCalendar\Model\RemoteEvent[]
      */
-    public function listEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array
+    public function listEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array
     {
         $userId = $this->mapCalendarToUser->getUserId($user);
 
@@ -132,7 +129,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $bareEvents = $this->userHttpClient->request(
                 'GET',
-                'users/' . $userId . '/calendarView',
+                'users/'.$userId.'/calendarView',
                 [
                     'query' => [
                         'startDateTime' => $startDate->setTimezone(RemoteEventConverter::getRemoteTimeZone())->format(RemoteEventConverter::getRemoteDateTimeSimpleFormat()),
@@ -172,7 +169,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         }
     }
 
-    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, ?CalendarRange $associatedCalendarRange = null): void
+    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, CalendarRange $associatedCalendarRange = null): void
     {
         if ('' === $remoteId) {
             return;
@@ -222,7 +219,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
                     $calendar->getRemoteId(),
                     $this->translator->trans('remote_ms_graph.cancel_event_because_main_user_is_%label%', ['%label%' => $calendar->getMainUser()]),
                     $previousMainUser,
-                    'calendar_' . $calendar->getRemoteId()
+                    'calendar_'.$calendar->getRemoteId()
                 );
                 $this->createCalendarOnRemote($calendar);
             } else {
@@ -300,7 +297,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
                 break;
 
             default:
-                throw new Exception('not supported');
+                throw new \Exception('not supported');
         }
 
         try {
@@ -313,7 +310,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
             $this->logger->warning('could not update calendar range to remote', [
                 'exception' => $e->getTraceAsString(),
                 'content' => $e->getResponse()->getContent(),
-                'calendarRangeId' => 'invite_' . $invite->getId(),
+                'calendarRangeId' => 'invite_'.$invite->getId(),
             ]);
 
             throw $e;
@@ -355,7 +352,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
             'id' => $id,
             'lastModifiedDateTime' => $lastModified,
             'changeKey' => $changeKey
-        ] = $this->createOnRemote($eventData, $calendar->getMainUser(), 'calendar_' . $calendar->getId());
+        ] = $this->createOnRemote($eventData, $calendar->getMainUser(), 'calendar_'.$calendar->getId());
 
         if (null === $id) {
             return;
@@ -390,7 +387,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $event = $this->machineHttpClient->request(
                 'POST',
-                'users/' . $userId . '/calendar/events',
+                'users/'.$userId.'/calendar/events',
                 [
                     'json' => $eventData,
                 ]
@@ -434,7 +431,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         ] = $this->createOnRemote(
             $eventData,
             $calendarRange->getUser(),
-            'calendar_range_' . $calendarRange->getId()
+            'calendar_range_'.$calendarRange->getId()
         );
 
         $calendarRange->setRemoteId($id)
@@ -457,7 +454,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         $userId = $this->mapCalendarToUser->getUserId($user);
 
         if ('' === $iCalUid = ($event['iCalUId'] ?? '')) {
-            throw new Exception('no iCalUid for this event');
+            throw new \Exception('no iCalUid for this event');
         }
 
         try {
@@ -475,8 +472,8 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
             throw $clientException;
         }
 
-        if (1 !== count($events['value'])) {
-            throw new Exception('multiple events found with same iCalUid');
+        if (1 !== \count($events['value'])) {
+            throw new \Exception('multiple events found with same iCalUid');
         }
 
         return $events['value'][0]['id'];
@@ -487,19 +484,13 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         $userId = $this->mapCalendarToUser->getUserId($user);
 
         if (null === $userId) {
-            throw new Exception(
-                sprintf(
-                    'no remote calendar for this user: %s, remoteid: %s',
-                    $user->getId(),
-                    $remoteId
-                )
-            );
+            throw new \Exception(sprintf('no remote calendar for this user: %s, remoteid: %s', $user->getId(), $remoteId));
         }
 
         try {
             return $this->machineHttpClient->request(
                 'GET',
-                'users/' . $userId . '/calendar/events/' . $remoteId
+                'users/'.$userId.'/calendar/events/'.$remoteId
             )->toArray();
         } catch (ClientExceptionInterface $e) {
             $this->logger->warning('Could not get event from calendar', [
@@ -510,11 +501,11 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         }
     }
 
-    private function getScheduleTimesForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate): array
+    private function getScheduleTimesForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate): array
     {
         $userId = $this->mapCalendarToUser->getUserId($user);
 
-        if (array_key_exists($userId, $this->cacheScheduleTimeForUser)) {
+        if (\array_key_exists($userId, $this->cacheScheduleTimeForUser)) {
             return $this->cacheScheduleTimeForUser[$userId];
         }
 
@@ -529,17 +520,17 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         $body = [
             'schedules' => [$user->getEmailCanonical()],
             'startTime' => [
-                'dateTime' => ($startDate->setTimezone(RemoteEventConverter::getRemoteTimeZone())->format(RemoteEventConverter::getRemoteDateTimeSimpleFormat())),
+                'dateTime' => $startDate->setTimezone(RemoteEventConverter::getRemoteTimeZone())->format(RemoteEventConverter::getRemoteDateTimeSimpleFormat()),
                 'timeZone' => 'UTC',
             ],
             'endTime' => [
-                'dateTime' => ($endDate->setTimezone(RemoteEventConverter::getRemoteTimeZone())->format(RemoteEventConverter::getRemoteDateTimeSimpleFormat())),
+                'dateTime' => $endDate->setTimezone(RemoteEventConverter::getRemoteTimeZone())->format(RemoteEventConverter::getRemoteDateTimeSimpleFormat()),
                 'timeZone' => 'UTC',
             ],
         ];
 
         try {
-            $response = $this->userHttpClient->request('POST', 'users/' . $userId . '/calendar/getSchedule', [
+            $response = $this->userHttpClient->request('POST', 'users/'.$userId.'/calendar/getSchedule', [
                 'json' => $body,
             ])->toArray();
         } catch (ClientExceptionInterface $e) {
@@ -564,7 +555,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         $eventDatas = [];
         $eventDatas[] = $this->remoteEventConverter->calendarToEvent($calendar);
 
-        if (0 < count($newInvites)) {
+        if (0 < \count($newInvites)) {
             // it seems that invitaiton are always send, even if attendee changes are mixed with other datas
             // $eventDatas[] = $this->remoteEventConverter->calendarToEventAttendeesOnly($calendar);
         }
@@ -578,7 +569,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
                 $calendar->getRemoteId(),
                 $eventData,
                 $calendar->getMainUser(),
-                'calendar_' . $calendar->getId()
+                'calendar_'.$calendar->getId()
             );
 
             $calendar->addRemoteAttributes([
@@ -609,7 +600,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $event = $this->machineHttpClient->request(
                 'PATCH',
-                'users/' . $userId . '/calendar/events/' . $remoteId,
+                'users/'.$userId.'/calendar/events/'.$remoteId,
                 [
                     'json' => $eventData,
                 ]
@@ -637,7 +628,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $this->machineHttpClient->request(
                 'DELETE',
-                'users/' . $userId . '/calendar/events/' . $remoteId
+                'users/'.$userId.'/calendar/events/'.$remoteId
             );
         } catch (ClientExceptionInterface) {
             $this->logger->warning('could not remove event from calendar', [
@@ -664,7 +655,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $event = $this->machineHttpClient->request(
                 'GET',
-                'users/' . $userId . '/calendar/events/' . $calendarRange->getRemoteId()
+                'users/'.$userId.'/calendar/events/'.$calendarRange->getRemoteId()
             )->toArray();
         } catch (ClientExceptionInterface $e) {
             $this->logger->warning('Could not get event from calendar', [
@@ -691,7 +682,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $event = $this->machineHttpClient->request(
                 'PATCH',
-                'users/' . $userId . '/calendar/events/' . $calendarRange->getRemoteId(),
+                'users/'.$userId.'/calendar/events/'.$calendarRange->getRemoteId(),
                 [
                     'json' => $eventData,
                 ]
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php
index c8fb569e8..b4e2a5d3a 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php
@@ -22,20 +22,18 @@ use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Entity\CalendarRange;
 use Chill\CalendarBundle\Entity\Invite;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
-use LogicException;
 use Symfony\Component\HttpFoundation\Response;
 
 class NullRemoteCalendarConnector implements RemoteCalendarConnectorInterface
 {
-    public function countEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate): int
+    public function countEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate): int
     {
         return 0;
     }
 
     public function getMakeReadyResponse(string $returnPath): Response
     {
-        throw new LogicException('As this connector is always ready, this method should not be called');
+        throw new \LogicException('As this connector is always ready, this method should not be called');
     }
 
     public function isReady(): bool
@@ -43,12 +41,12 @@ class NullRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         return true;
     }
 
-    public function listEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array
+    public function listEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array
     {
         return [];
     }
 
-    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, ?CalendarRange $associatedCalendarRange = null): void {}
+    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, CalendarRange $associatedCalendarRange = null): void {}
 
     public function removeCalendarRange(string $remoteId, array $remoteAttributes, User $user): void {}
 
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php
index e3ef89ca4..53d2c8602 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php
@@ -23,12 +23,11 @@ use Chill\CalendarBundle\Entity\CalendarRange;
 use Chill\CalendarBundle\Entity\Invite;
 use Chill\CalendarBundle\RemoteCalendar\Model\RemoteEvent;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
 use Symfony\Component\HttpFoundation\Response;
 
 interface RemoteCalendarConnectorInterface
 {
-    public function countEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate): int;
+    public function countEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate): int;
 
     /**
      * Return a response, more probably a RedirectResponse, where the user
@@ -46,9 +45,9 @@ interface RemoteCalendarConnectorInterface
     /**
      * @return array|RemoteEvent[]
      */
-    public function listEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array;
+    public function listEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array;
 
-    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, ?CalendarRange $associatedCalendarRange = null): void;
+    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, CalendarRange $associatedCalendarRange = null): void;
 
     public function removeCalendarRange(string $remoteId, array $remoteAttributes, User $user): void;
 
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
index 6a986c9db..c52fc2866 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
@@ -28,7 +28,6 @@ use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSUserAbsenceSync;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraphRemoteCalendarConnector;
 use Chill\CalendarBundle\RemoteCalendar\Connector\NullRemoteCalendarConnector;
 use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
-use RuntimeException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -43,7 +42,7 @@ class RemoteCalendarCompilerPass implements CompilerPassInterface
         if (true === $config['remote_calendars_sync']['microsoft_graph']['enabled']) {
             $connector = MSGraphRemoteCalendarConnector::class;
 
-            $container->setAlias(HttpClientInterface::class . ' $machineHttpClient', MachineHttpClient::class);
+            $container->setAlias(HttpClientInterface::class.' $machineHttpClient', MachineHttpClient::class);
         } else {
             $connector = NullRemoteCalendarConnector::class;
             // remove services which cannot be loaded
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php
index d0a4bb566..40d1d1435 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php
@@ -18,7 +18,6 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\RemoteCalendar\Model;
 
-use DateTimeImmutable;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 class RemoteEvent
@@ -36,11 +35,11 @@ class RemoteEvent
         /**
          * @Serializer\Groups({"read"})
          */
-        public DateTimeImmutable $startDate,
+        public \DateTimeImmutable $startDate,
         /**
          * @Serializer\Groups({"read"})
          */
-        public DateTimeImmutable $endDate,
+        public \DateTimeImmutable $endDate,
         /**
          * @Serializer\Groups({"read"})
          */
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php
index b120fb4d0..8f490f376 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php
@@ -23,7 +23,6 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 
@@ -31,7 +30,7 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
 {
     public function __construct(private readonly AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository, private readonly EntityManagerInterface $em) {}
 
-    public function buildQueryByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): QueryBuilder
+    public function buildQueryByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): QueryBuilder
     {
         $qb = $this->em->createQueryBuilder();
         $qb->from(Calendar::class, 'c');
@@ -54,7 +53,7 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
         return $qb;
     }
 
-    public function buildQueryByAccompanyingPeriodIgnoredByDates(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): QueryBuilder
+    public function buildQueryByAccompanyingPeriodIgnoredByDates(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): QueryBuilder
     {
         $qb = $this->em->createQueryBuilder();
         $qb->from(Calendar::class, 'c');
@@ -80,7 +79,7 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
     /**
      * Base implementation. The list of allowed accompanying period is retrieved "manually" from @see{AccompanyingPeriodACLAwareRepository}.
      */
-    public function buildQueryByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): QueryBuilder
+    public function buildQueryByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): QueryBuilder
     {
         $qb = $this->em->createQueryBuilder()
             ->from(Calendar::class, 'c');
@@ -104,7 +103,7 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
     /**
      * Base implementation. The list of allowed accompanying period is retrieved "manually" from @see{AccompanyingPeriodACLAwareRepository}.
      */
-    public function buildQueryByPersonIgnoredByDates(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): QueryBuilder
+    public function buildQueryByPersonIgnoredByDates(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): QueryBuilder
     {
         $qb = $this->em->createQueryBuilder()
             ->from(Calendar::class, 'c');
@@ -125,14 +124,14 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
         return $qb;
     }
 
-    public function countByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int
+    public function countByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int
     {
         $qb = $this->buildQueryByAccompanyingPeriod($period, $startDate, $endDate)->select('count(c)');
 
         return $qb->getQuery()->getSingleScalarResult();
     }
 
-    public function countByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int
+    public function countByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int
     {
         return $this->buildQueryByPerson($person, $startDate, $endDate)
             ->select('COUNT(c)')
@@ -140,14 +139,14 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
             ->getSingleScalarResult();
     }
 
-    public function countIgnoredByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int
+    public function countIgnoredByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int
     {
         $qb = $this->buildQueryByAccompanyingPeriodIgnoredByDates($period, $startDate, $endDate)->select('count(c)');
 
         return $qb->getQuery()->getSingleScalarResult();
     }
 
-    public function countIgnoredByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int
+    public function countIgnoredByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int
     {
         return $this->buildQueryByPersonIgnoredByDates($person, $startDate, $endDate)
             ->select('COUNT(c)')
@@ -158,12 +157,12 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
     /**
      * @return array|Calendar[]
      */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], int $offset = null, int $limit = null): array
     {
         $qb = $this->buildQueryByAccompanyingPeriod($period, $startDate, $endDate)->select('c');
 
         foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('c.' . $sort, $order);
+            $qb->addOrderBy('c.'.$sort, $order);
         }
 
         if (null !== $offset) {
@@ -177,13 +176,13 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
         return $qb->getQuery()->getResult();
     }
 
-    public function findByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array
+    public function findByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], int $offset = null, int $limit = null): array
     {
         $qb = $this->buildQueryByPerson($person, $startDate, $endDate)
             ->select('c');
 
         foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('c.' . $sort, $order);
+            $qb->addOrderBy('c.'.$sort, $order);
         }
 
         if (null !== $offset) {
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepositoryInterface.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepositoryInterface.php
index 70fb02590..f6d1b5c17 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepositoryInterface.php
@@ -21,33 +21,32 @@ namespace Chill\CalendarBundle\Repository;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 
 interface CalendarACLAwareRepositoryInterface
 {
-    public function countByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int;
+    public function countByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int;
 
     /**
      * Return the number or calendars associated with a person. See condition on @see{self::findByPerson}.
      */
-    public function countByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int;
+    public function countByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int;
 
     /**
      * Return the number or calendars associated with an accompanyign period which **does not** match the date conditions.
      */
-    public function countIgnoredByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int;
+    public function countIgnoredByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int;
 
     /**
      * Return the number or calendars associated with a person which **does not** match the date conditions.
      *
      * See condition on @see{self::findByPerson}.
      */
-    public function countIgnoredByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int;
+    public function countIgnoredByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int;
 
     /**
      * @return array|Calendar[]
      */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array;
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], int $offset = null, int $limit = null): array;
 
     /**
      * Return all the calendars which are associated with a person, either on @see{Calendar::person} or within.
@@ -59,5 +58,5 @@ interface CalendarACLAwareRepositoryInterface
      *
      * @return array|Calendar[]
      */
-    public function findByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array;
+    public function findByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], int $offset = null, int $limit = null): array;
 }
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
index dd593bf3c..fb71717d0 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
@@ -35,7 +35,7 @@ class CalendarDocRepository implements ObjectRepository, CalendarDocRepositoryIn
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepositoryInterface.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepositoryInterface.php
index d2b1951df..6d86fd943 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepositoryInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepositoryInterface.php
@@ -25,7 +25,7 @@ interface CalendarDocRepositoryInterface
     /**
      * @return array|CalendarDoc[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null);
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null);
 
     public function findOneBy(array $criteria): ?CalendarDoc;
 
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php
index b74110c96..a707ccde9 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php
@@ -13,14 +13,12 @@ namespace Chill\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\CalendarRange;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
-use function count;
 
 class CalendarRangeRepository implements ObjectRepository
 {
@@ -31,7 +29,7 @@ class CalendarRangeRepository implements ObjectRepository
         $this->repository = $em->getRepository(CalendarRange::class);
     }
 
-    public function countByAvailableRangesForUser(User $user, DateTimeImmutable $from, DateTimeImmutable $to): int
+    public function countByAvailableRangesForUser(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): int
     {
         return $this->buildQueryAvailableRangesForUser($user, $from, $to)
             ->select('COUNT(cr)')
@@ -54,7 +52,7 @@ class CalendarRangeRepository implements ObjectRepository
     /**
      * @return array|CalendarRange[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -64,10 +62,10 @@ class CalendarRangeRepository implements ObjectRepository
      */
     public function findByAvailableRangesForUser(
         User $user,
-        DateTimeImmutable $from,
-        DateTimeImmutable $to,
-        ?int $limit = null,
-        ?int $offset = null
+        \DateTimeImmutable $from,
+        \DateTimeImmutable $to,
+        int $limit = null,
+        int $offset = null
     ): array {
         $qb = $this->buildQueryAvailableRangesForUser($user, $from, $to);
 
@@ -98,7 +96,7 @@ class CalendarRangeRepository implements ObjectRepository
      */
     public function findRemoteIdsPresent(array $remoteIds): array
     {
-        if (0 === count($remoteIds)) {
+        if (0 === \count($remoteIds)) {
             return [];
         }
 
@@ -113,7 +111,7 @@ class CalendarRangeRepository implements ObjectRepository
 
         $remoteIdsStr = implode(
             ', ',
-            array_fill(0, count($remoteIds), '((?))')
+            array_fill(0, \count($remoteIds), '((?))')
         );
 
         $rsm = new ResultSetMapping();
@@ -143,7 +141,7 @@ class CalendarRangeRepository implements ObjectRepository
         return CalendarRange::class;
     }
 
-    private function buildQueryAvailableRangesForUser(User $user, DateTimeImmutable $from, DateTimeImmutable $to): QueryBuilder
+    private function buildQueryAvailableRangesForUser(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('cr');
 
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
index 91a64c5ec..486493b21 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
@@ -14,14 +14,12 @@ namespace Chill\CalendarBundle\Repository;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
-use function count;
 
 class CalendarRepository implements ObjectRepository
 {
@@ -40,7 +38,7 @@ class CalendarRepository implements ObjectRepository
         return $this->repository->count(['accompanyingPeriod' => $period]);
     }
 
-    public function countByUser(User $user, DateTimeImmutable $from, DateTimeImmutable $to): int
+    public function countByUser(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): int
     {
         return $this->buildQueryByUser($user, $from, $to)
             ->select('COUNT(c)')
@@ -48,7 +46,7 @@ class CalendarRepository implements ObjectRepository
             ->getSingleScalarResult();
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -69,7 +67,7 @@ class CalendarRepository implements ObjectRepository
     /**
      * @return array|Calendar[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -77,7 +75,7 @@ class CalendarRepository implements ObjectRepository
     /**
      * @return array|Calendar[]
      */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->findBy(
             [
@@ -89,7 +87,7 @@ class CalendarRepository implements ObjectRepository
         );
     }
 
-    public function findByNotificationAvailable(DateTimeImmutable $startDate, DateTimeImmutable $endDate, ?int $limit = null, ?int $offset = null): array
+    public function findByNotificationAvailable(\DateTimeImmutable $startDate, \DateTimeImmutable $endDate, int $limit = null, int $offset = null): array
     {
         $qb = $this->queryByNotificationAvailable($startDate, $endDate)->select('c');
 
@@ -107,7 +105,7 @@ class CalendarRepository implements ObjectRepository
     /**
      * @return array|Calendar[]
      */
-    public function findByUser(User $user, DateTimeImmutable $from, DateTimeImmutable $to, ?int $limit = null, ?int $offset = null): array
+    public function findByUser(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to, int $limit = null, int $offset = null): array
     {
         $qb = $this->buildQueryByUser($user, $from, $to)->select('c');
 
@@ -138,13 +136,13 @@ class CalendarRepository implements ObjectRepository
      */
     public function findRemoteIdsPresent(array $remoteIds): array
     {
-        if (0 === count($remoteIds)) {
+        if (0 === \count($remoteIds)) {
             return [];
         }
 
         $remoteIdsStr = implode(
             ', ',
-            array_fill(0, count($remoteIds), '((?))')
+            array_fill(0, \count($remoteIds), '((?))')
         );
 
         $sql = "SELECT
@@ -183,7 +181,7 @@ class CalendarRepository implements ObjectRepository
         return Calendar::class;
     }
 
-    private function buildQueryByUser(User $user, DateTimeImmutable $from, DateTimeImmutable $to): QueryBuilder
+    private function buildQueryByUser(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('c');
 
@@ -202,7 +200,7 @@ class CalendarRepository implements ObjectRepository
             ]);
     }
 
-    private function queryByNotificationAvailable(DateTimeImmutable $startDate, DateTimeImmutable $endDate): QueryBuilder
+    private function queryByNotificationAvailable(\DateTimeImmutable $startDate, \DateTimeImmutable $endDate): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('c');
 
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
index 8778330f8..c6f163aa3 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
@@ -41,7 +41,7 @@ class InviteRepository implements ObjectRepository
     /**
      * @return array|Invite[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null)
     {
         return $this->entityRepository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarDocVoter.php b/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarDocVoter.php
index 75f774119..a0e653cb1 100644
--- a/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarDocVoter.php
+++ b/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarDocVoter.php
@@ -15,8 +15,6 @@ use Chill\CalendarBundle\Entity\CalendarDoc;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
-use UnexpectedValueException;
-use function in_array;
 
 class CalendarDocVoter extends Voter
 {
@@ -33,19 +31,18 @@ class CalendarDocVoter extends Voter
 
     protected function supports($attribute, $subject): bool
     {
-        return in_array($attribute, self::ALL, true) && $subject instanceof CalendarDoc;
+        return \in_array($attribute, self::ALL, true) && $subject instanceof CalendarDoc;
     }
 
     /**
      * @param CalendarDoc $subject
-     * @param mixed $attribute
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
         return match ($attribute) {
             self::EDIT => $this->security->isGranted(CalendarVoter::EDIT, $subject->getCalendar()),
             self::SEE => $this->security->isGranted(CalendarVoter::SEE, $subject->getCalendar()),
-            default => throw new UnexpectedValueException('Attribute not supported: ' . $attribute),
+            default => throw new \UnexpectedValueException('Attribute not supported: '.$attribute),
         };
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php b/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
index c433f2ee6..8f4c3a065 100644
--- a/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
+++ b/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
@@ -20,15 +20,12 @@ namespace Chill\CalendarBundle\Security\Voter;
 
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
 use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use LogicException;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Security;
 
@@ -92,7 +89,7 @@ class CalendarVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
             switch ($attribute) {
                 case self::SEE:
                 case self::CREATE:
-                    if ($subject->getStep() === AccompanyingPeriod::STEP_DRAFT) {
+                    if (AccompanyingPeriod::STEP_DRAFT === $subject->getStep()) {
                         return false;
                     }
 
@@ -122,6 +119,6 @@ class CalendarVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
             }
         }
 
-        throw new LogicException('attribute or not implemented');
+        throw new \LogicException('attribute or not implemented');
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
index 80c77d119..087f5ea86 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
@@ -29,7 +29,6 @@ use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use function count;
 
 final readonly class CalendarContext implements CalendarContextInterface
 {
@@ -122,8 +121,6 @@ final readonly class CalendarContext implements CalendarContextInterface
         }
     }
 
-    /**
-     */
     public function getData(DocGeneratorTemplate $template, mixed $entity, array $contextGenerationData = []): array
     {
         $options = $this->getOptions($template);
@@ -173,7 +170,7 @@ final readonly class CalendarContext implements CalendarContextInterface
         if ($options['askMainPerson']) {
             $data['mainPerson'] = null;
 
-            if (1 === count($entity->getPersons())) {
+            if (1 === \count($entity->getPersons())) {
                 $data['mainPerson'] = $entity->getPersons()->first();
             }
         }
@@ -181,7 +178,7 @@ final readonly class CalendarContext implements CalendarContextInterface
         if ($options['askThirdParty']) {
             $data['thirdParty'] = null;
 
-            if (1 === count($entity->getProfessionals())) {
+            if (1 === \count($entity->getProfessionals())) {
                 $data['thirdParty'] = $entity->getProfessionals()->first();
             }
         }
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
index 74393a422..09a333f3f 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
@@ -12,12 +12,8 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Service\DocGenerator;
 
 use Chill\CalendarBundle\Entity\Calendar;
-use Chill\DocGeneratorBundle\Context\DocGeneratorContextInterface;
 use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
 use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
-use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
-use Chill\DocStoreBundle\Entity\StoredObject;
-use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * @extends DocGeneratorContextWithPublicFormInterface<Calendar>
diff --git a/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php
index 530843723..5e4e7de83 100644
--- a/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php
+++ b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php
@@ -22,7 +22,6 @@ use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\MappingException;
@@ -44,7 +43,7 @@ final readonly class AccompanyingPeriodCalendarGenericDocProvider implements Gen
     /**
      * @throws MappingException
      */
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
     {
         $classMetadata = $this->em->getClassMetadata(CalendarDoc::class);
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
@@ -91,7 +90,7 @@ final readonly class AccompanyingPeriodCalendarGenericDocProvider implements Gen
         return $this->security->isGranted(CalendarVoter::SEE, $accompanyingPeriod);
     }
 
-    public function buildFetchQueryForPerson(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
     {
         $classMetadata = $this->em->getClassMetadata(CalendarDoc::class);
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
@@ -136,8 +135,8 @@ final readonly class AccompanyingPeriodCalendarGenericDocProvider implements Gen
                 $storedObjectMetadata->getColumnName('createdAt')
             );
             $orParams = [...$orParams, $participation->getAccompanyingPeriod()->getId(),
-                DateTimeImmutable::createFromInterface($participation->getStartDate()),
-                null === $participation->getEndDate() ? null : DateTimeImmutable::createFromInterface($participation->getEndDate())];
+                \DateTimeImmutable::createFromInterface($participation->getStartDate()),
+                null === $participation->getEndDate() ? null : \DateTimeImmutable::createFromInterface($participation->getEndDate())];
             $orTypes = [...$orTypes, Types::INTEGER, Types::DATE_IMMUTABLE, Types::DATE_IMMUTABLE];
         }
 
@@ -147,7 +146,7 @@ final readonly class AccompanyingPeriodCalendarGenericDocProvider implements Gen
             return $query;
         }
 
-        $query->addWhereClause(implode(" OR ", $or), $orParams, $orTypes);
+        $query->addWhereClause(implode(' OR ', $or), $orParams, $orTypes);
 
         return $this->addWhereClausesToQuery($query, $startDate, $endDate, $content);
     }
@@ -159,7 +158,7 @@ final readonly class AccompanyingPeriodCalendarGenericDocProvider implements Gen
         return $this->security->isGranted(AccompanyingPeriodVoter::SEE, $person);
     }
 
-    private function addWhereClausesToQuery(FetchQuery $query, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate, ?string $content): FetchQuery
+    private function addWhereClausesToQuery(FetchQuery $query, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?string $content): FetchQuery
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
 
@@ -182,7 +181,7 @@ final readonly class AccompanyingPeriodCalendarGenericDocProvider implements Gen
         if (null !== $content) {
             $query->addWhereClause(
                 sprintf('doc_store.%s ilike ?', $storedObjectMetadata->getColumnName('title')),
-                ['%' . $content . '%'],
+                ['%'.$content.'%'],
                 [Types::STRING]
             );
         }
diff --git a/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/PersonCalendarGenericDocProvider.php b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/PersonCalendarGenericDocProvider.php
index 8bc2d4c4c..49e890ca0 100644
--- a/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/PersonCalendarGenericDocProvider.php
+++ b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/PersonCalendarGenericDocProvider.php
@@ -19,8 +19,6 @@ use Chill\DocStoreBundle\GenericDoc\FetchQuery;
 use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
 use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\MappingException;
@@ -28,7 +26,7 @@ use Service\GenericDoc\Providers\PersonCalendarGenericDocProviderTest;
 use Symfony\Component\Security\Core\Security;
 
 /**
- * Provide calendar documents for calendar associated to persons
+ * Provide calendar documents for calendar associated to persons.
  *
  * @see PersonCalendarGenericDocProviderTest
  */
@@ -41,7 +39,7 @@ final readonly class PersonCalendarGenericDocProvider implements GenericDocForPe
         private EntityManagerInterface $em
     ) {}
 
-    private function addWhereClausesToQuery(FetchQuery $query, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
+    private function addWhereClausesToQuery(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
 
@@ -64,7 +62,7 @@ final readonly class PersonCalendarGenericDocProvider implements GenericDocForPe
         if (null !== $content) {
             $query->addWhereClause(
                 sprintf('doc_store.%s ilike ?', $storedObjectMetadata->getColumnName('title')),
-                ['%' . $content . '%'],
+                ['%'.$content.'%'],
                 [Types::STRING]
             );
         }
@@ -75,7 +73,7 @@ final readonly class PersonCalendarGenericDocProvider implements GenericDocForPe
     /**
      * @throws MappingException
      */
-    public function buildFetchQueryForPerson(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
     {
         $classMetadata = $this->em->getClassMetadata(CalendarDoc::class);
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
@@ -114,10 +112,6 @@ final readonly class PersonCalendarGenericDocProvider implements GenericDocForPe
         return $this->addWhereClausesToQuery($query, $startDate, $endDate, $content);
     }
 
-    /**
-     * @param Person $person
-     * @return bool
-     */
     public function isAllowedForPerson(Person $person): bool
     {
         return $this->security->isGranted(CalendarVoter::SEE, $person);
diff --git a/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Renderers/AccompanyingPeriodCalendarGenericDocRenderer.php b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Renderers/AccompanyingPeriodCalendarGenericDocRenderer.php
index b252b698d..123afc164 100644
--- a/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Renderers/AccompanyingPeriodCalendarGenericDocRenderer.php
+++ b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Renderers/AccompanyingPeriodCalendarGenericDocRenderer.php
@@ -23,7 +23,7 @@ final readonly class AccompanyingPeriodCalendarGenericDocRenderer implements Gen
 
     public function supports(GenericDocDTO $genericDocDTO, $options = []): bool
     {
-        return $genericDocDTO->key === AccompanyingPeriodCalendarGenericDocProvider::KEY || $genericDocDTO->key === PersonCalendarGenericDocProvider::KEY;
+        return AccompanyingPeriodCalendarGenericDocProvider::KEY === $genericDocDTO->key || PersonCalendarGenericDocProvider::KEY === $genericDocDTO->key;
     }
 
     public function getTemplate(GenericDocDTO $genericDocDTO, $options = []): string
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/BulkCalendarShortMessageSender.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/BulkCalendarShortMessageSender.php
index c29328988..9a4a92a94 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/BulkCalendarShortMessageSender.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/BulkCalendarShortMessageSender.php
@@ -19,7 +19,6 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -33,7 +32,7 @@ class BulkCalendarShortMessageSender
         $countCalendars = 0;
         $countSms = 0;
 
-        foreach ($this->provider->getCalendars(new DateTimeImmutable('now')) as $calendar) {
+        foreach ($this->provider->getCalendars(new \DateTimeImmutable('now')) as $calendar) {
             $smses = $this->messageForCalendarBuilder->buildMessageForCalendar($calendar);
 
             foreach ($smses as $sms) {
@@ -42,13 +41,13 @@ class BulkCalendarShortMessageSender
             }
 
             $this->em
-                ->createQuery('UPDATE ' . Calendar::class . ' c SET c.smsStatus = :smsStatus WHERE c.id = :id')
+                ->createQuery('UPDATE '.Calendar::class.' c SET c.smsStatus = :smsStatus WHERE c.id = :id')
                 ->setParameters(['smsStatus' => Calendar::SMS_SENT, 'id' => $calendar->getId()])
                 ->execute();
             ++$countCalendars;
             $this->em->refresh($calendar);
         }
 
-        $this->logger->info(self::class . 'a bulk of messages was sent', ['count_calendars' => $countCalendars, 'count_sms' => $countSms]);
+        $this->logger->info(self::class.'a bulk of messages was sent', ['count_calendars' => $countCalendars, 'count_sms' => $countSms]);
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/CalendarForShortMessageProvider.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/CalendarForShortMessageProvider.php
index 8f15be6f2..31b870ed4 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/CalendarForShortMessageProvider.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/CalendarForShortMessageProvider.php
@@ -20,9 +20,7 @@ namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Repository\CalendarRepository;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
-use function count;
 
 class CalendarForShortMessageProvider
 {
@@ -35,7 +33,7 @@ class CalendarForShortMessageProvider
      *
      * @return iterable|Calendar[]
      */
-    public function getCalendars(DateTimeImmutable $at): iterable
+    public function getCalendars(\DateTimeImmutable $at): iterable
     {
         $range = $this->rangeGenerator->generateRange($at);
 
@@ -62,6 +60,6 @@ class CalendarForShortMessageProvider
 
             $calendars = $this->calendarRepository
                 ->findByNotificationAvailable($startDate, $endDate, $batchSize, $offset);
-        } while (count($calendars) === $batchSize);
+        } while (\count($calendars) === $batchSize);
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultRangeGenerator.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultRangeGenerator.php
index 7d6da3ef0..b79118cf0 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultRangeGenerator.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultRangeGenerator.php
@@ -18,9 +18,7 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
-use DateInterval;
 use Monolog\DateTimeImmutable;
-use UnexpectedValueException;
 
 /**
  * * Lundi => Envoi des rdv du mardi et mercredi.
@@ -33,7 +31,7 @@ class DefaultRangeGenerator implements RangeGeneratorInterface
 {
     public function generateRange(\DateTimeImmutable $date): ?array
     {
-        $onMidnight = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $date->format('Y-m-d') . ' 00:00:00');
+        $onMidnight = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $date->format('Y-m-d').' 00:00:00');
 
         switch ($dow = (int) $onMidnight->format('w')) {
             case 6: // Saturday
@@ -42,32 +40,32 @@ class DefaultRangeGenerator implements RangeGeneratorInterface
 
             case 1: // Monday
                 // send for Tuesday and Wednesday
-                $startDate = $onMidnight->add(new DateInterval('P1D'));
-                $endDate = $startDate->add(new DateInterval('P2D'));
+                $startDate = $onMidnight->add(new \DateInterval('P1D'));
+                $endDate = $startDate->add(new \DateInterval('P2D'));
 
                 break;
 
             case 2: // tuesday
             case 3: // wednesday
-                $startDate = $onMidnight->add(new DateInterval('P2D'));
-                $endDate = $startDate->add(new DateInterval('P1D'));
+                $startDate = $onMidnight->add(new \DateInterval('P2D'));
+                $endDate = $startDate->add(new \DateInterval('P1D'));
 
                 break;
 
             case 4: // thursday
-                $startDate = $onMidnight->add(new DateInterval('P2D'));
-                $endDate = $startDate->add(new DateInterval('P2D'));
+                $startDate = $onMidnight->add(new \DateInterval('P2D'));
+                $endDate = $startDate->add(new \DateInterval('P2D'));
 
                 break;
 
             case 5: // friday
-                $startDate = $onMidnight->add(new DateInterval('P3D'));
-                $endDate = $startDate->add(new DateInterval('P1D'));
+                $startDate = $onMidnight->add(new \DateInterval('P3D'));
+                $endDate = $startDate->add(new \DateInterval('P1D'));
 
                 break;
 
             default:
-                throw new UnexpectedValueException('a day of a week should not have the value: ' . $dow);
+                throw new \UnexpectedValueException('a day of a week should not have the value: '.$dow);
         }
 
         return ['startDate' => $startDate, 'endDate' => $endDate];
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
index 0d6c4002e..880c9950f 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
@@ -20,7 +20,6 @@ namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\MainBundle\Service\ShortMessage\ShortMessage;
-use Symfony\Component\Templating\EngineInterface;
 
 class DefaultShortMessageForCalendarBuilder implements ShortMessageForCalendarBuilderInterface
 {
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/RangeGeneratorInterface.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/RangeGeneratorInterface.php
index 357e264d9..a96664907 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/RangeGeneratorInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/RangeGeneratorInterface.php
@@ -18,12 +18,10 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
-use DateTimeImmutable;
-
 interface RangeGeneratorInterface
 {
     /**
-     * @return ?array{startDate: DateTimeImmutable, endDate: DateTimeImmutable} when return is null, then no ShortMessage must be send
+     * @return ?array{startDate: \DateTimeImmutable, endDate: \DateTimeImmutable} when return is null, then no ShortMessage must be send
      */
-    public function generateRange(DateTimeImmutable $date): ?array;
+    public function generateRange(\DateTimeImmutable $date): ?array;
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
index ba9fecb65..80d01ada5 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
@@ -13,15 +13,14 @@ namespace Chill\CalendarBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use function random_int;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarControllerTest extends WebTestCase
@@ -75,7 +74,7 @@ final class CalendarControllerTest extends WebTestCase
             ->join('ac.scopes', 's')
             ->andWhere('JSON_EXTRACT(s.name,\'fr\') LIKE :s')
             ->setParameter('s', 'social')
-            ->setFirstResult(random_int(0, $nb - 1))
+            ->setFirstResult(\random_int(0, $nb - 1))
             ->setMaxResults(1)
             ->getQuery()
             ->getSingleScalarResult(),
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php
index 1d4fb46b1..0c53f2b8d 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php
@@ -23,6 +23,7 @@ use Symfony\Component\Messenger\Transport\InMemoryTransport;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RemoteCalendarMSGraphSyncControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarDocTest.php b/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarDocTest.php
index fa6132b03..98306b10c 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarDocTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarDocTest.php
@@ -18,6 +18,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarDocTest extends TestCase
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarTest.php b/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarTest.php
index e37436ad3..1cedea31c 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarTest.php
@@ -24,6 +24,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarTest extends TestCase
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/AgentAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/AgentAggregatorTest.php
index c1a71218e..ae1aa6663 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/AgentAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/AgentAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AgentAggregatorTest extends AbstractAggregatorTest
@@ -59,7 +60,7 @@ final class AgentAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(cal.id)')
-                ->from(Calendar::class, 'cal')
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/CancelReasonAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/CancelReasonAggregatorTest.php
index ec769f3b1..0cc1ba58a 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/CancelReasonAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/CancelReasonAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CancelReasonAggregatorTest extends AbstractAggregatorTest
@@ -59,7 +60,7 @@ final class CancelReasonAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(cal.id)')
-                ->from(Calendar::class, 'cal')
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php
index 094567fa7..50949c3e3 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class JobAggregatorTest extends AbstractAggregatorTest
@@ -46,7 +47,7 @@ final class JobAggregatorTest extends AbstractAggregatorTest
     public function getFormData(): array
     {
         return [
-            []
+            [],
         ];
     }
 
@@ -59,7 +60,7 @@ final class JobAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(cal.id)')
-                ->from(Calendar::class, 'cal')
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationAggregatorTest.php
index 7756c2d69..c46f9d6da 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LocationAggregatorTest extends AbstractAggregatorTest
@@ -59,7 +60,7 @@ final class LocationAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(cal.id)')
-                ->from(Calendar::class, 'cal')
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php
index a69c9d9b1..fcf4e2709 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LocationTypeAggregatorTest extends AbstractAggregatorTest
@@ -59,7 +60,7 @@ final class LocationTypeAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(cal.id)')
-                ->from(Calendar::class, 'cal')
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/MonthYearAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/MonthYearAggregatorTest.php
index f2840aa98..7c50a0b52 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/MonthYearAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/MonthYearAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class MonthYearAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/ScopeAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/ScopeAggregatorTest.php
index c9a2b9e5c..77ffc0bf1 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/ScopeAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/ScopeAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeAggregatorTest extends AbstractAggregatorTest
@@ -59,7 +60,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(cal.id)')
-                ->from(Calendar::class, 'cal')
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php
index 443d2b0bd..3d4efdd83 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php
@@ -26,6 +26,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AgentFilterTest extends AbstractFilterTest
@@ -78,10 +79,9 @@ final class AgentFilterTest extends AbstractFilterTest
 
         $em = self::$container->get(EntityManagerInterface::class);
 
-        yield
-            $em->createQueryBuilder()
-                ->select('cal.id')
-                ->from(Calendar::class, 'cal')
+        yield $em->createQueryBuilder()
+            ->select('cal.id')
+            ->from(Calendar::class, 'cal')
         ;
 
         self::ensureKernelShutdown();
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php
index a8c8b1749..4a7751433 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php
@@ -22,11 +22,11 @@ use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Export\Filter\BetweenDatesFilter;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BetweenDatesFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php
index d571508c8..e4bf1ac3b 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php
@@ -27,6 +27,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class JobFilterTest extends AbstractFilterTest
@@ -65,8 +66,8 @@ final class JobFilterTest extends AbstractFilterTest
 
         return [
             [
-                'job' => new ArrayCollection($array)
-            ]
+                'job' => new ArrayCollection($array),
+            ],
         ];
     }
 
@@ -79,7 +80,7 @@ final class JobFilterTest extends AbstractFilterTest
         return [
             $em->createQueryBuilder()
                 ->select('cal.id')
-                ->from(Calendar::class, 'cal')
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php
index 06d36846b..194a6cca7 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php
@@ -27,6 +27,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeFilterTest extends AbstractFilterTest
@@ -65,8 +66,8 @@ final class ScopeFilterTest extends AbstractFilterTest
 
         return [
             [
-                'scope' => new ArrayCollection($array)
-            ]
+                'scope' => new ArrayCollection($array),
+            ],
         ];
     }
 
@@ -79,7 +80,7 @@ final class ScopeFilterTest extends AbstractFilterTest
         return [
             $em->createQueryBuilder()
                 ->select('cal.id')
-                ->from(Calendar::class, 'cal')
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php b/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php
index 85a2d72f9..0d1202b67 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php
@@ -35,11 +35,9 @@ use Chill\PersonBundle\Form\DataTransformer\PersonsToIdDataTransformer;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Form\DataTransformer\ThirdPartiesToIdDataTransformer;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use DateTimeImmutable;
 use Doctrine\Common\Collections\Collection;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use ReflectionProperty;
 use Symfony\Component\Form\PreloadedExtension;
 use Symfony\Component\Form\Test\TypeTestCase;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@@ -48,6 +46,7 @@ use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarTypeTest extends TypeTestCase
@@ -112,8 +111,8 @@ final class CalendarTypeTest extends TypeTestCase
         $form->submit($formData);
 
         $this->assertTrue($form->isSynchronized());
-        $this->assertEquals(DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2022-05-05 14:00:00'), $calendar->getStartDate());
-        $this->assertEquals(DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2022-05-05 14:30:00'), $calendar->getEndDate());
+        $this->assertEquals(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2022-05-05 14:00:00'), $calendar->getStartDate());
+        $this->assertEquals(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2022-05-05 14:30:00'), $calendar->getEndDate());
         $this->assertEquals(7, $calendar->getPersons()->first()->getId());
         $this->assertEquals(8, $calendar->getCalendarRange()->getId());
         $this->assertEquals(9, $calendar->getLocation()->getId());
@@ -181,7 +180,7 @@ final class CalendarTypeTest extends TypeTestCase
                 return array_map(
                     static function ($id) use ($objClass) {
                         $obj = new $objClass();
-                        $reflectionProperty = new ReflectionProperty($objClass, 'id');
+                        $reflectionProperty = new \ReflectionProperty($objClass, 'id');
                         $reflectionProperty->setAccessible(true);
                         $reflectionProperty->setValue($obj, (int) $id);
 
@@ -209,7 +208,7 @@ final class CalendarTypeTest extends TypeTestCase
                     return null;
                 }
                 $obj = new $class();
-                $reflectionProperty = new ReflectionProperty($class, 'id');
+                $reflectionProperty = new \ReflectionProperty($class, 'id');
                 $reflectionProperty->setAccessible(true);
                 $reflectionProperty->setValue($obj, (int) $args[0]);
 
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php
index 7623cba64..eca929875 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php
@@ -27,10 +27,10 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Component\Templating\EngineInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AddressConverterTest extends TestCase
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarRangeSyncerTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarRangeSyncerTest.php
index 92280f6c1..9f7df0c2c 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarRangeSyncerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarRangeSyncerTest.php
@@ -22,7 +22,6 @@ use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Entity\CalendarRange;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\RemoteToLocalSync\CalendarRangeSyncer;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -33,6 +32,7 @@ use Symfony\Component\HttpClient\Response\MockResponse;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarRangeSyncerTest extends TestCase
@@ -228,8 +228,8 @@ final class CalendarRangeSyncerTest extends TestCase
         $calendarRange = new CalendarRange();
         $calendarRange
             ->setUser($user = new User())
-            ->setStartDate(new DateTimeImmutable('2020-01-01 15:00:00'))
-            ->setEndDate(new DateTimeImmutable('2020-01-01 15:30:00'))
+            ->setStartDate(new \DateTimeImmutable('2020-01-01 15:00:00'))
+            ->setEndDate(new \DateTimeImmutable('2020-01-01 15:30:00'))
             ->addRemoteAttributes([
                 'lastModifiedDateTime' => 0,
                 'changeKey' => 'abc',
@@ -244,11 +244,11 @@ final class CalendarRangeSyncerTest extends TestCase
 
         $this->assertStringContainsString(
             '2022-06-10T15:30:00',
-            $calendarRange->getStartDate()->format(DateTimeImmutable::ATOM)
+            $calendarRange->getStartDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertStringContainsString(
             '2022-06-10T17:30:00',
-            $calendarRange->getEndDate()->format(DateTimeImmutable::ATOM)
+            $calendarRange->getEndDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertTrue($calendarRange->preventEnqueueChanges);
     }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarSyncerTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarSyncerTest.php
index 82f088c3f..8f6cb9335 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarSyncerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarSyncerTest.php
@@ -24,8 +24,6 @@ use Chill\CalendarBundle\Entity\Invite;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\RemoteToLocalSync\CalendarSyncer;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
-use DateTimeImmutable;
-use DateTimeZone;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -35,6 +33,7 @@ use Symfony\Component\HttpClient\Response\MockResponse;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarSyncerTest extends TestCase
@@ -362,9 +361,9 @@ final class CalendarSyncerTest extends TestCase
         parent::setUp();
 
         // all tests should run when timezone = +02:00
-        $brussels = new DateTimeZone('Europe/Brussels');
+        $brussels = new \DateTimeZone('Europe/Brussels');
 
-        if (7200 === $brussels->getOffset(new DateTimeImmutable())) {
+        if (7200 === $brussels->getOffset(new \DateTimeImmutable())) {
             date_default_timezone_set('Europe/Brussels');
         } else {
             date_default_timezone_set('Europe/Moscow');
@@ -403,8 +402,8 @@ final class CalendarSyncerTest extends TestCase
         $calendar = new Calendar();
         $calendar
             ->setMainUser($user = new User())
-            ->setStartDate(new DateTimeImmutable('2022-06-11 14:30:00'))
-            ->setEndDate(new DateTimeImmutable('2022-06-11 15:30:00'))
+            ->setStartDate(new \DateTimeImmutable('2022-06-11 14:30:00'))
+            ->setEndDate(new \DateTimeImmutable('2022-06-11 15:30:00'))
             ->addUser($userA)
             ->addUser($userB)
             ->setCalendarRange(new CalendarRange())
@@ -480,8 +479,8 @@ final class CalendarSyncerTest extends TestCase
         $calendar = new Calendar();
         $calendar
             ->setMainUser($user = new User())
-            ->setStartDate(new DateTimeImmutable('2020-01-01 10:00:00'))
-            ->setEndDate(new DateTimeImmutable('2020-01-01 12:00:00'))
+            ->setStartDate(new \DateTimeImmutable('2020-01-01 10:00:00'))
+            ->setEndDate(new \DateTimeImmutable('2020-01-01 12:00:00'))
             ->setCalendarRange(new CalendarRange())
             ->addRemoteAttributes([
                 'lastModifiedDateTime' => 0,
@@ -498,11 +497,11 @@ final class CalendarSyncerTest extends TestCase
 
         $this->assertStringContainsString(
             '2022-06-10T15:30:00',
-            $calendar->getStartDate()->format(DateTimeImmutable::ATOM)
+            $calendar->getStartDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertStringContainsString(
             '2022-06-10T17:30:00',
-            $calendar->getEndDate()->format(DateTimeImmutable::ATOM)
+            $calendar->getEndDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertTrue($calendar->preventEnqueueChanges);
         $this->assertGreaterThan($previousVersion, $calendar->getDateTimeVersion());
@@ -524,8 +523,8 @@ final class CalendarSyncerTest extends TestCase
         $calendar = new Calendar();
         $calendar
             ->setMainUser($user = new User())
-            ->setStartDate(new DateTimeImmutable('2022-06-10 15:30:00'))
-            ->setEndDate(new DateTimeImmutable('2022-06-10 17:30:00'))
+            ->setStartDate(new \DateTimeImmutable('2022-06-10 15:30:00'))
+            ->setEndDate(new \DateTimeImmutable('2022-06-10 17:30:00'))
             ->setCalendarRange(new CalendarRange())
             ->addRemoteAttributes([
                 'lastModifiedDateTime' => 0,
@@ -541,11 +540,11 @@ final class CalendarSyncerTest extends TestCase
 
         $this->assertStringContainsString(
             '2022-06-10T15:30:00',
-            $calendar->getStartDate()->format(DateTimeImmutable::ATOM)
+            $calendar->getStartDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertStringContainsString(
             '2022-06-10T17:30:00',
-            $calendar->getEndDate()->format(DateTimeImmutable::ATOM)
+            $calendar->getEndDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertTrue($calendar->preventEnqueueChanges);
         $this->assertEquals(Calendar::STATUS_VALID, $calendar->getStatus());
@@ -568,8 +567,8 @@ final class CalendarSyncerTest extends TestCase
         $calendar = new Calendar();
         $calendar
             ->setMainUser($user = new User())
-            ->setStartDate(new DateTimeImmutable('2020-01-01 10:00:00'))
-            ->setEndDate(new DateTimeImmutable('2020-01-01 12:00:00'))
+            ->setStartDate(new \DateTimeImmutable('2020-01-01 10:00:00'))
+            ->setEndDate(new \DateTimeImmutable('2020-01-01 12:00:00'))
             ->setCalendarRange(new CalendarRange())
             ->addRemoteAttributes([
                 'lastModifiedDateTime' => 0,
@@ -585,11 +584,11 @@ final class CalendarSyncerTest extends TestCase
 
         $this->assertStringContainsString(
             '2020-01-01T10:00:00',
-            $calendar->getStartDate()->format(DateTimeImmutable::ATOM)
+            $calendar->getStartDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertStringContainsString(
             '2020-01-01T12:00:00',
-            $calendar->getEndDate()->format(DateTimeImmutable::ATOM)
+            $calendar->getEndDate()->format(\DateTimeImmutable::ATOM)
         );
 
         $this->assertEquals(Calendar::STATUS_VALID, $calendar->getStatus());
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/LocationConverterTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/LocationConverterTest.php
index 604b707c0..55dfe427c 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/LocationConverterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/LocationConverterTest.php
@@ -30,6 +30,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LocationConverterTest extends TestCase
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderTest.php
index 2ceab8b1f..4307f32a3 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderTest.php
@@ -22,6 +22,7 @@ use Symfony\Component\HttpClient\Response\MockResponse;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class MSUserAbsenceReaderTest extends TestCase
@@ -55,7 +56,7 @@ class MSUserAbsenceReaderTest extends TestCase
 
         $absenceReader = new MSUserAbsenceReader($client, $mapUser->reveal(), $clock);
 
-        self::assertNull($absenceReader->isUserAbsent($user), "when no user found, absence should be null");
+        self::assertNull($absenceReader->isUserAbsent($user), 'when no user found, absence should be null');
     }
 
     public function provideDataTestUserAbsence(): iterable
@@ -81,7 +82,7 @@ class MSUserAbsenceReaderTest extends TestCase
             }
             JSON,
             false,
-            "User is present"
+            'User is present',
         ];
 
         yield [
@@ -103,7 +104,7 @@ class MSUserAbsenceReaderTest extends TestCase
                 }
             JSON,
             true,
-            'User is absent with absence scheduled, we are within this period'
+            'User is absent with absence scheduled, we are within this period',
         ];
 
         yield [
@@ -125,7 +126,7 @@ class MSUserAbsenceReaderTest extends TestCase
                 }
             JSON,
             false,
-            'User is present: absence is scheduled for later'
+            'User is present: absence is scheduled for later',
         ];
 
         yield [
@@ -147,7 +148,7 @@ class MSUserAbsenceReaderTest extends TestCase
                 }
             JSON,
             false,
-            'User is present: absence is past'
+            'User is present: absence is past',
         ];
 
         yield [
@@ -169,7 +170,7 @@ class MSUserAbsenceReaderTest extends TestCase
                 }
             JSON,
             true,
-            "User is absent: absence is always enabled"
+            'User is absent: absence is always enabled',
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSyncTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSyncTest.php
index 1b0f1e416..244c7e468 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSyncTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSyncTest.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Tests\RemoteCalendar\Connector\MSGraph;
 
-use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSUserAbsenceReader;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSUserAbsenceReaderInterface;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSUserAbsenceSync;
 use Chill\MainBundle\Entity\User;
@@ -22,6 +21,7 @@ use Symfony\Component\Clock\MockClock;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class MSUserAbsenceSyncTest extends TestCase
@@ -48,21 +48,21 @@ class MSUserAbsenceSyncTest extends TestCase
 
     public function provideDataTestSyncUserAbsence(): iterable
     {
-        yield [new User(), false, false, null, "user present remains present"];
-        yield [new User(), true, true, new \DateTimeImmutable('2023-07-01T12:00:00'), "user present becomes absent"];
+        yield [new User(), false, false, null, 'user present remains present'];
+        yield [new User(), true, true, new \DateTimeImmutable('2023-07-01T12:00:00'), 'user present becomes absent'];
 
         $user = new User();
-        $user->setAbsenceStart($abs = new \DateTimeImmutable("2023-07-01T12:00:00"));
-        yield [$user, true, true, $abs, "user absent remains absent"];
+        $user->setAbsenceStart($abs = new \DateTimeImmutable('2023-07-01T12:00:00'));
+        yield [$user, true, true, $abs, 'user absent remains absent'];
 
         $user = new User();
-        $user->setAbsenceStart($abs = new \DateTimeImmutable("2023-07-01T12:00:00"));
-        yield [$user, false, false, null, "user absent becomes present"];
+        $user->setAbsenceStart($abs = new \DateTimeImmutable('2023-07-01T12:00:00'));
+        yield [$user, false, false, null, 'user absent becomes present'];
 
-        yield [new User(), null, false, null, "user not syncable: presence do not change"];
+        yield [new User(), null, false, null, 'user not syncable: presence do not change'];
 
         $user = new User();
-        $user->setAbsenceStart($abs = new \DateTimeImmutable("2023-07-01T12:00:00"));
-        yield [$user, null, true, $abs, "user not syncable: absence do not change"];
+        $user->setAbsenceStart($abs = new \DateTimeImmutable('2023-07-01T12:00:00'));
+        yield [$user, null, true, $abs, 'user not syncable: absence do not change'];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Repository/CalendarACLAwareRepositoryTest.php b/src/Bundle/ChillCalendarBundle/Tests/Repository/CalendarACLAwareRepositoryTest.php
index 0fb4a662b..8d3101c5b 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Repository/CalendarACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Repository/CalendarACLAwareRepositoryTest.php
@@ -15,13 +15,13 @@ use Chill\CalendarBundle\Repository\CalendarACLAwareRepository;
 use Chill\PersonBundle\DataFixtures\Helper\PersonRandomHelper;
 use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarACLAwareRepositoryTest extends KernelTestCase
@@ -51,7 +51,7 @@ final class CalendarACLAwareRepositoryTest extends KernelTestCase
             $this->entityManager
         );
 
-        $count = $calendarRepository->countByPerson($person, new DateTimeImmutable('yesterday'), new DateTimeImmutable('tomorrow'));
+        $count = $calendarRepository->countByPerson($person, new \DateTimeImmutable('yesterday'), new \DateTimeImmutable('tomorrow'));
 
         $this->assertIsInt($count);
     }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Serializer/Normalizer/CalendarNormalizerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Serializer/Normalizer/CalendarNormalizerTest.php
index 2a0975206..03ba7f164 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Serializer/Normalizer/CalendarNormalizerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Serializer/Normalizer/CalendarNormalizerTest.php
@@ -16,12 +16,12 @@ use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTimeImmutable;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarNormalizerTest extends KernelTestCase
@@ -41,8 +41,8 @@ final class CalendarNormalizerTest extends KernelTestCase
             ->setComment(
                 $comment = new CommentEmbeddable()
             )
-            ->setStartDate(DateTimeImmutable::createFromFormat(DateTimeImmutable::ATOM, '2020-10-15T15:00:00+0000'))
-            ->setEndDate(DateTimeImmutable::createFromFormat(DateTimeImmutable::ATOM, '2020-15-15T15:30:00+0000'))
+            ->setStartDate(\DateTimeImmutable::createFromFormat(\DateTimeImmutable::ATOM, '2020-10-15T15:00:00+0000'))
+            ->setEndDate(\DateTimeImmutable::createFromFormat(\DateTimeImmutable::ATOM, '2020-15-15T15:30:00+0000'))
             ->addPerson(new Person())
             ->addPerson(new Person())
             ->addUser(new User())
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php
index 7bbaf4ded..506baa98b 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php
@@ -33,11 +33,10 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use function array_key_exists;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarContextTest extends TestCase
@@ -85,13 +84,13 @@ final class CalendarContextTest extends TestCase
         // so, we expect the call to be twice for each method
         $formBuilder->add('thirdParty', EntityType::class, Argument::type('array'))
             ->should(static function ($calls, $object, $method) use ($tp1, $tp2) {
-                if (2 !== count($calls)) {
-                    throw new FailedPredictionException(sprintf('the $builder->add should be called exactly 2, %d receivved', count($calls)));
+                if (2 !== \count($calls)) {
+                    throw new FailedPredictionException(sprintf('the $builder->add should be called exactly 2, %d receivved', \count($calls)));
                 }
 
                 $opts = $calls[0]->getArguments()[2];
 
-                if (!array_key_exists('label', $opts)) {
+                if (!\array_key_exists('label', $opts)) {
                     throw new FailedPredictionException('the $builder->add should have a label key');
                 }
 
@@ -105,13 +104,13 @@ final class CalendarContextTest extends TestCase
             });
         $formBuilder->add('mainPerson', EntityType::class, Argument::type('array'))
             ->should(static function ($calls, $object, $method) use ($p1) {
-                if (2 !== count($calls)) {
-                    throw new FailedPredictionException(sprintf('the $builder->add should be called exactly 2, %d receivved', count($calls)));
+                if (2 !== \count($calls)) {
+                    throw new FailedPredictionException(sprintf('the $builder->add should be called exactly 2, %d receivved', \count($calls)));
                 }
 
                 $opts = $calls[0]->getArguments()[2];
 
-                if (!array_key_exists('label', $opts)) {
+                if (!\array_key_exists('label', $opts)) {
                     throw new FailedPredictionException('the $builder->add should have a label key');
                 }
 
@@ -178,7 +177,7 @@ final class CalendarContextTest extends TestCase
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->persist(Argument::type(CalendarDoc::class))->should(
             static function ($calls, $object, $method) use ($storedObject) {
-                if (1 !== count($calls)) {
+                if (1 !== \count($calls)) {
                     throw new FailedPredictionException('the persist method should be called once');
                 }
 
@@ -189,7 +188,7 @@ final class CalendarContextTest extends TestCase
                     throw new FailedPredictionException('the stored object is not correct');
                 }
 
-                if ($calendarDoc->getStoredObject()->getTitle() !== 'blabla') {
+                if ('blabla' !== $calendarDoc->getStoredObject()->getTitle()) {
                     throw new FailedPredictionException('the doc title should be the one provided');
                 }
 
@@ -203,8 +202,8 @@ final class CalendarContextTest extends TestCase
     }
 
     private function buildCalendarContext(
-        ?EntityManagerInterface $entityManager = null,
-        ?NormalizerInterface $normalizer = null
+        EntityManagerInterface $entityManager = null,
+        NormalizerInterface $normalizer = null
     ): CalendarContext {
         $baseContext = $this->prophesize(BaseContextData::class);
         $baseContext->getData(null)->willReturn(['base_context' => 'data']);
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/BulkCalendarShortMessageSenderTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/BulkCalendarShortMessageSenderTest.php
index 0c190f51d..308c17237 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/BulkCalendarShortMessageSenderTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/BulkCalendarShortMessageSenderTest.php
@@ -18,7 +18,6 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Tests\Service\ShortMessageNotification;
 
-use ArrayIterator;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Service\ShortMessageNotification\BulkCalendarShortMessageSender;
 use Chill\CalendarBundle\Service\ShortMessageNotification\CalendarForShortMessageProvider;
@@ -27,20 +26,18 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Service\ShortMessage\ShortMessage;
 use Chill\MainBundle\Test\PrepareUserTrait;
 use Chill\PersonBundle\DataFixtures\Helper\PersonRandomHelper;
-use DateInterval;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use libphonenumber\PhoneNumberUtil;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Log\NullLogger;
-use stdClass;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BulkCalendarShortMessageSenderTest extends KernelTestCase
@@ -79,26 +76,26 @@ final class BulkCalendarShortMessageSenderTest extends KernelTestCase
         $calendar
             ->addPerson($this->getRandomPerson($em))
             ->setMainUser($user = $this->prepareUser([]))
-            ->setStartDate(new DateTimeImmutable('now'))
-            ->setEndDate($calendar->getStartDate()->add(new DateInterval('PT30M')))
+            ->setStartDate(new \DateTimeImmutable('now'))
+            ->setEndDate($calendar->getStartDate()->add(new \DateInterval('PT30M')))
             ->setSendSMS(true);
 
         $user->setUsername(uniqid());
-        $user->setEmail(uniqid() . '@gmail.com');
+        $user->setEmail(uniqid().'@gmail.com');
         $calendar->getPersons()->first()->setAcceptSMS(true);
 
         // hack to prevent side effect with messages
         $calendar->preventEnqueueChanges = true;
 
         $em->persist($user);
-        //$this->toDelete[] = [User::class, $user->getId()];
+        // $this->toDelete[] = [User::class, $user->getId()];
         $em->persist($calendar);
-        //$this->toDelete[] = [Calendar::class, $calendar->getId()];
+        // $this->toDelete[] = [Calendar::class, $calendar->getId()];
         $em->flush();
 
         $provider = $this->prophesize(CalendarForShortMessageProvider::class);
-        $provider->getCalendars(Argument::type(DateTimeImmutable::class))
-            ->willReturn(new ArrayIterator([$calendar]));
+        $provider->getCalendars(Argument::type(\DateTimeImmutable::class))
+            ->willReturn(new \ArrayIterator([$calendar]));
 
         $messageBuilder = $this->prophesize(ShortMessageForCalendarBuilderInterface::class);
         $messageBuilder->buildMessageForCalendar(Argument::type(Calendar::class))
@@ -114,7 +111,7 @@ final class BulkCalendarShortMessageSenderTest extends KernelTestCase
 
         $bus = $this->prophesize(MessageBusInterface::class);
         $bus->dispatch(Argument::type(ShortMessage::class))
-            ->willReturn(new Envelope(new stdClass()))
+            ->willReturn(new Envelope(new \stdClass()))
             ->shouldBeCalledTimes(1);
 
         $bulk = new BulkCalendarShortMessageSender(
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php
index 34867d8bd..47af7d68e 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php
@@ -23,15 +23,14 @@ use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\CalendarBundle\Service\ShortMessageNotification\CalendarForShortMessageProvider;
 use Chill\CalendarBundle\Service\ShortMessageNotification\DefaultRangeGenerator;
 use Chill\CalendarBundle\Service\ShortMessageNotification\RangeGeneratorInterface;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarForShortMessageProviderTest extends TestCase
@@ -42,13 +41,13 @@ final class CalendarForShortMessageProviderTest extends TestCase
     {
         $calendarRepository = $this->prophesize(CalendarRepository::class);
         $calendarRepository->findByNotificationAvailable(
-            Argument::type(DateTimeImmutable::class),
-            Argument::type(DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
             Argument::exact(0)
         )->shouldBeCalledTimes(0);
         $rangeGenerator = $this->prophesize(RangeGeneratorInterface::class);
-        $rangeGenerator->generateRange(Argument::type(DateTimeImmutable::class))->willReturn(null);
+        $rangeGenerator->generateRange(Argument::type(\DateTimeImmutable::class))->willReturn(null);
 
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->clear()->shouldNotBeCalled();
@@ -59,23 +58,23 @@ final class CalendarForShortMessageProviderTest extends TestCase
             $rangeGenerator->reveal()
         );
 
-        $calendars = iterator_to_array($provider->getCalendars(new DateTimeImmutable('now')));
+        $calendars = iterator_to_array($provider->getCalendars(new \DateTimeImmutable('now')));
 
-        $this->assertEquals(0, count($calendars));
+        $this->assertEquals(0, \count($calendars));
     }
 
     public function testGetCalendars()
     {
         $calendarRepository = $this->prophesize(CalendarRepository::class);
         $calendarRepository->findByNotificationAvailable(
-            Argument::type(DateTimeImmutable::class),
-            Argument::type(DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
             Argument::exact(0)
         )->will(static fn ($args) => array_fill(0, $args[2], new Calendar()))->shouldBeCalledTimes(1);
         $calendarRepository->findByNotificationAvailable(
-            Argument::type(DateTimeImmutable::class),
-            Argument::type(DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
             Argument::not(0)
         )->will(static fn ($args) => array_fill(0, $args[2] - 1, new Calendar()))->shouldBeCalledTimes(1);
@@ -89,10 +88,10 @@ final class CalendarForShortMessageProviderTest extends TestCase
             new DefaultRangeGenerator()
         );
 
-        $calendars = iterator_to_array($provider->getCalendars(new DateTimeImmutable('now')));
+        $calendars = iterator_to_array($provider->getCalendars(new \DateTimeImmutable('now')));
 
-        $this->assertGreaterThan(1, count($calendars));
-        $this->assertLessThan(100, count($calendars));
+        $this->assertGreaterThan(1, \count($calendars));
+        $this->assertLessThan(100, \count($calendars));
         $this->assertContainsOnly(Calendar::class, $calendars);
     }
 
@@ -100,14 +99,14 @@ final class CalendarForShortMessageProviderTest extends TestCase
     {
         $calendarRepository = $this->prophesize(CalendarRepository::class);
         $calendarRepository->findByNotificationAvailable(
-            Argument::type(DateTimeImmutable::class),
-            Argument::type(DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
             Argument::exact(0)
         )->will(static fn ($args) => array_fill(0, 1, new Calendar()))->shouldBeCalledTimes(1);
         $calendarRepository->findByNotificationAvailable(
-            Argument::type(DateTimeImmutable::class),
-            Argument::type(DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
             Argument::not(0)
         )->will(static fn ($args) => [])->shouldBeCalledTimes(1);
@@ -121,9 +120,9 @@ final class CalendarForShortMessageProviderTest extends TestCase
             new DefaultRangeGenerator()
         );
 
-        $calendars = iterator_to_array($provider->getCalendars(new DateTimeImmutable('now')));
+        $calendars = iterator_to_array($provider->getCalendars(new \DateTimeImmutable('now')));
 
-        $this->assertEquals(1, count($calendars));
+        $this->assertEquals(1, \count($calendars));
         $this->assertContainsOnly(Calendar::class, $calendars);
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultRangeGeneratorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultRangeGeneratorTest.php
index de2b97963..552595414 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultRangeGeneratorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultRangeGeneratorTest.php
@@ -19,12 +19,11 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Tests\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Service\ShortMessageNotification\DefaultRangeGenerator;
-use DateTimeImmutable;
-use Iterator;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DefaultRangeGeneratorTest extends TestCase
@@ -36,46 +35,46 @@ final class DefaultRangeGeneratorTest extends TestCase
      * * Jeudi => envoi des rdv du samedi et dimanche
      * * Vendredi => Envoi des rdv du lundi.
      */
-    public function generateData(): Iterator
+    public function generateData(): \Iterator
     {
         yield [
-            new DateTimeImmutable('2022-06-13 10:45:00'),
-            new DateTimeImmutable('2022-06-14 00:00:00'),
-            new DateTimeImmutable('2022-06-16 00:00:00'),
+            new \DateTimeImmutable('2022-06-13 10:45:00'),
+            new \DateTimeImmutable('2022-06-14 00:00:00'),
+            new \DateTimeImmutable('2022-06-16 00:00:00'),
         ];
 
         yield [
-            new DateTimeImmutable('2022-06-14 15:45:00'),
-            new DateTimeImmutable('2022-06-16 00:00:00'),
-            new DateTimeImmutable('2022-06-17 00:00:00'),
+            new \DateTimeImmutable('2022-06-14 15:45:00'),
+            new \DateTimeImmutable('2022-06-16 00:00:00'),
+            new \DateTimeImmutable('2022-06-17 00:00:00'),
         ];
 
         yield [
-            new DateTimeImmutable('2022-06-15 13:45:18'),
-            new DateTimeImmutable('2022-06-17 00:00:00'),
-            new DateTimeImmutable('2022-06-18 00:00:00'),
+            new \DateTimeImmutable('2022-06-15 13:45:18'),
+            new \DateTimeImmutable('2022-06-17 00:00:00'),
+            new \DateTimeImmutable('2022-06-18 00:00:00'),
         ];
 
         yield [
-            new DateTimeImmutable('2022-06-16 01:30:55'),
-            new DateTimeImmutable('2022-06-18 00:00:00'),
-            new DateTimeImmutable('2022-06-20 00:00:00'),
+            new \DateTimeImmutable('2022-06-16 01:30:55'),
+            new \DateTimeImmutable('2022-06-18 00:00:00'),
+            new \DateTimeImmutable('2022-06-20 00:00:00'),
         ];
 
         yield [
-            new DateTimeImmutable('2022-06-17 21:30:55'),
-            new DateTimeImmutable('2022-06-20 00:00:00'),
-            new DateTimeImmutable('2022-06-21 00:00:00'),
+            new \DateTimeImmutable('2022-06-17 21:30:55'),
+            new \DateTimeImmutable('2022-06-20 00:00:00'),
+            new \DateTimeImmutable('2022-06-21 00:00:00'),
         ];
 
         yield [
-            new DateTimeImmutable('2022-06-18 21:30:55'),
+            new \DateTimeImmutable('2022-06-18 21:30:55'),
             null,
             null,
         ];
 
         yield [
-            new DateTimeImmutable('2022-06-19 21:30:55'),
+            new \DateTimeImmutable('2022-06-19 21:30:55'),
             null,
             null,
         ];
@@ -84,7 +83,7 @@ final class DefaultRangeGeneratorTest extends TestCase
     /**
      * @dataProvider generateData
      */
-    public function testGenerateRange(DateTimeImmutable $date, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate)
+    public function testGenerateRange(\DateTimeImmutable $date, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate)
     {
         $generator = new DefaultRangeGenerator();
 
@@ -94,8 +93,8 @@ final class DefaultRangeGeneratorTest extends TestCase
             $this->assertNull($actualStartDate);
             $this->assertNull($actualEndDate);
         } else {
-            $this->assertEquals($startDate->format(DateTimeImmutable::ATOM), $actualStartDate->format(DateTimeImmutable::ATOM));
-            $this->assertEquals($endDate->format(DateTimeImmutable::ATOM), $actualEndDate->format(DateTimeImmutable::ATOM));
+            $this->assertEquals($startDate->format(\DateTimeImmutable::ATOM), $actualStartDate->format(\DateTimeImmutable::ATOM));
+            $this->assertEquals($endDate->format(\DateTimeImmutable::ATOM), $actualEndDate->format(\DateTimeImmutable::ATOM));
         }
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilderTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilderTest.php
index 67d124c40..222d3a451 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilderTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilderTest.php
@@ -23,17 +23,15 @@ use Chill\CalendarBundle\Service\ShortMessageNotification\DefaultShortMessageFor
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
-use DateInterval;
-use DateTimeImmutable;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Component\Templating\EngineInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DefaultShortMessageForCalendarBuilderTest extends TestCase
@@ -51,8 +49,8 @@ final class DefaultShortMessageForCalendarBuilderTest extends TestCase
     {
         $calendar = new Calendar();
         $calendar
-            ->setStartDate(new DateTimeImmutable('now'))
-            ->setEndDate($calendar->getStartDate()->add(new DateInterval('PT30M')))
+            ->setStartDate(new \DateTimeImmutable('now'))
+            ->setEndDate($calendar->getStartDate()->add(new \DateInterval('PT30M')))
             ->setMainUser($user = new User())
             ->addPerson($person = new Person())
             ->setSendSMS(false);
diff --git a/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php b/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
index c6a3fb63c..08425bcf0 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
@@ -15,7 +15,6 @@ use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
 use Doctrine\ORM\EntityManager;
-use RuntimeException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
@@ -26,8 +25,6 @@ use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Parser;
 
-use function count;
-
 /**
  * Class for the command 'chill:custom_fields:populate_group' that
  * Create custom fields from a yml file.
@@ -40,9 +37,6 @@ class CreateFieldsOnGroupCommand extends Command
 
     /**
      * CreateFieldsOnGroupCommand constructor.
-     *
-     * @param $availableLanguages
-     * @param $customizablesEntities
      */
     public function __construct(
         private readonly CustomFieldProvider $customFieldProvider,
@@ -95,9 +89,9 @@ class CreateFieldsOnGroupCommand extends Command
             ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->findAll();
 
-        if (count($customFieldsGroups) === 0) {
+        if (0 === \count($customFieldsGroups)) {
             $output->writeln('<error>There aren\'t any CustomFieldsGroup recorded'
-                . ' Please create at least one.</error>');
+                .' Please create at least one.</error>');
         }
 
         $table = new Table($output);
@@ -120,7 +114,7 @@ class CreateFieldsOnGroupCommand extends Command
                     }
                 }
 
-                throw new RuntimeException('The id does not match an existing CustomFieldsGroup');
+                throw new \RuntimeException('The id does not match an existing CustomFieldsGroup');
             }
         );
         $customFieldsGroup = $helper->ask($input, $output, $question);
@@ -135,6 +129,7 @@ class CreateFieldsOnGroupCommand extends Command
         );
 
         $fields = $this->_addFields($customFieldsGroup, $fieldsInput, $output);
+
         return 0;
     }
 
@@ -145,12 +140,11 @@ class CreateFieldsOnGroupCommand extends Command
         $languages = $this->availableLanguages;
 
         foreach ($values['fields'] as $slug => $field) {
-            //check the cf type exists
+            // check the cf type exists
             $cfType = $this->customFieldProvider->getCustomFieldByType($field['type']);
 
             if (null === $cfType) {
-                throw new RuntimeException('the type ' . $field['type'] . ' '
-                    . 'does not exists');
+                throw new \RuntimeException('the type '.$field['type'].' does not exists');
             }
 
             $cf = new CustomField();
@@ -161,21 +155,21 @@ class CreateFieldsOnGroupCommand extends Command
                 ->setType($field['type'])
                 ->setCustomFieldsGroup($group);
 
-            //add to table
+            // add to table
             $names = [];
 
             foreach ($languages as $lang) {
-                //todo replace with service to find lang when available
+                // todo replace with service to find lang when available
                 $names[] = $cf->getName()[$lang] ?? 'Not available in this language';
             }
 
             if ($this->validator->validate($cf)) {
                 $em->persist($cf);
                 $output->writeln('<info>Adding Custom Field of type '
-                    . $cf->getType() . "\t with slug " . $cf->getSlug() .
-                    "\t and names : " . implode(', ', $names) . '</info>');
+                    .$cf->getType()."\t with slug ".$cf->getSlug().
+                    "\t and names : ".implode(', ', $names).'</info>');
             } else {
-                throw new RuntimeException('Error in field ' . $slug);
+                throw new \RuntimeException('Error in field '.$slug);
             }
         }
 
@@ -187,13 +181,13 @@ class CreateFieldsOnGroupCommand extends Command
         $parser = new Parser();
 
         if (!file_exists($path)) {
-            throw new RuntimeException('file does not exist');
+            throw new \RuntimeException('file does not exist');
         }
 
         try {
             $values = $parser->parse(file_get_contents($path));
         } catch (ParseException $ex) {
-            throw new RuntimeException('The yaml file is not valid', 0, $ex);
+            throw new \RuntimeException('The yaml file is not valid', 0, $ex);
         }
 
         return $values;
@@ -203,7 +197,7 @@ class CreateFieldsOnGroupCommand extends Command
     {
         $rows = [];
         $languages = $this->availableLanguages;
-        //gather entitites and create an array to access them easily
+        // gather entitites and create an array to access them easily
         $customizableEntities = [];
 
         foreach ($this->customizablesEntities as $entry) {
@@ -213,14 +207,14 @@ class CreateFieldsOnGroupCommand extends Command
         array_walk(
             $customFieldsGroups,
             static function (CustomFieldsGroup $customFieldGroup, $key) use ($languages, &$rows, $customizableEntities) {
-                //set id and entity
+                // set id and entity
                 $row = [
                     $customFieldGroup->getId(),
                     $customizableEntities[$customFieldGroup->getEntity()],
                 ];
 
                 foreach ($languages as $lang) {
-                    //todo replace with service to find lang when available
+                    // todo replace with service to find lang when available
                     $row[] = $customFieldGroup->getName()[$lang] ?? 'Not available in this language';
                 }
                 $rows[] = $row;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
index fff8e3216..3bba08b01 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
@@ -26,6 +26,7 @@ class CustomFieldController extends AbstractController
 {
     /**
      * Creates a new CustomField entity.
+     *
      * @Route("/{_locale}/admin/customfield/new", name="customfield_new")
      */
     public function createAction(Request $request)
@@ -86,7 +87,7 @@ class CustomFieldController extends AbstractController
     {
         $entity = new CustomField();
 
-        //add the custom field group if defined in URL
+        // add the custom field group if defined in URL
         $cfGroupId = $request->query->get('customFieldsGroup', null);
 
         if (null !== $cfGroupId) {
@@ -95,8 +96,7 @@ class CustomFieldController extends AbstractController
                 ->find($cfGroupId);
 
             if (!$cfGroup) {
-                throw $this->createNotFoundException('CustomFieldsGroup with id '
-                      . $cfGroupId . ' is not found !');
+                throw $this->createNotFoundException('CustomFieldsGroup with id '.$cfGroupId.' is not found !');
             }
             $entity->setCustomFieldsGroup($cfGroup);
         }
@@ -111,6 +111,7 @@ class CustomFieldController extends AbstractController
 
     /**
      * Edits an existing CustomField entity.
+     *
      * @Route("/{_locale}/admin/customfield/update", name="customfield_update")
      */
     public function updateAction(Request $request, mixed $id)
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
index e6ac19b74..829ca5c55 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
@@ -27,7 +27,6 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 /**
  * Class CustomFieldsGroupController.
@@ -41,6 +40,7 @@ class CustomFieldsGroupController extends AbstractController
 
     /**
      * Creates a new CustomFieldsGroup entity.
+     *
      * @Route("/{_locale}/admin/customfieldsgroup/create", name="customfieldsgroup_create")
      */
     public function createAction(Request $request)
@@ -71,6 +71,7 @@ class CustomFieldsGroupController extends AbstractController
 
     /**
      * Displays a form to edit an existing CustomFieldsGroup entity.
+     *
      * @Route("/{_locale}/admin/customfieldsgroup/{id}/edit", name="customfieldsgroup_edit")
      */
     public function editAction(mixed $id)
@@ -106,7 +107,7 @@ class CustomFieldsGroupController extends AbstractController
         $makeDefaultFormViews = [];
 
         foreach ($cfGroups as $group) {
-            if (!in_array($group->getId(), $defaultGroups, true)) {
+            if (!\in_array($group->getId(), $defaultGroups, true)) {
                 $makeDefaultFormViews[$group->getId()] = $this->createMakeDefaultForm($group)->createView();
             }
         }
@@ -120,6 +121,7 @@ class CustomFieldsGroupController extends AbstractController
 
     /**
      * Set the CustomField Group with id $cFGroupId as default.
+     *
      * @Route("/{_locale}/admin/customfieldsgroup/makedefault", name="customfieldsgroup_makedefault")
      */
     public function makeDefaultAction(Request $request)
@@ -134,9 +136,7 @@ class CustomFieldsGroupController extends AbstractController
         $cFGroup = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->findOneById($cFGroupId);
 
         if (!$cFGroup) {
-            throw $this
-                ->createNotFoundException('customFieldsGroup not found with '
-                        . "id {$cFGroupId}");
+            throw $this->createNotFoundException('customFieldsGroup not found with '."id {$cFGroupId}");
         }
 
         $cFDefaultGroup = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup::class)
@@ -207,7 +207,7 @@ class CustomFieldsGroupController extends AbstractController
 
         $this->get('twig.loader')
             ->addPath(
-                __DIR__ . '/../Tests/Fixtures/App/app/Resources/views/',
+                __DIR__.'/../Tests/Fixtures/App/app/Resources/views/',
                 $namespace = 'test'
             );
 
@@ -219,8 +219,8 @@ class CustomFieldsGroupController extends AbstractController
                 ]);
             }
 
-            //dump($form->getData());
-            //dump(json_enccode($form->getData()));
+            // dump($form->getData());
+            // dump(json_enccode($form->getData()));
         }
 
         return $this
@@ -233,7 +233,6 @@ class CustomFieldsGroupController extends AbstractController
      * Finds and displays a CustomFieldsGroup entity.
      *
      * @Route("/{_locale}/admin/customfieldsgroup/{id}/show", name="customfieldsgroup/show")
-     *
      */
     public function showAction(mixed $id)
     {
@@ -294,8 +293,7 @@ class CustomFieldsGroupController extends AbstractController
     {
         $fieldChoices = [];
 
-        foreach ($this->customFieldProvider->getAllFields()
-              as $key => $customType) {
+        foreach ($this->customFieldProvider->getAllFields() as $key => $customType) {
             $fieldChoices[$key] = $customType->getName();
         }
 
@@ -361,11 +359,9 @@ class CustomFieldsGroupController extends AbstractController
     /**
      * create a form to make the group default.
      *
-     * @param CustomFieldsGroup $group
-     *
      * @return \Symfony\Component\Form\Form
      */
-    private function createMakeDefaultForm(?CustomFieldsGroup $group = null)
+    private function createMakeDefaultForm(CustomFieldsGroup $group = null)
     {
         return $this->createFormBuilder($group, [
             'method' => 'POST',
@@ -387,8 +383,8 @@ class CustomFieldsGroupController extends AbstractController
         $em = $this->getDoctrine()->getManager();
 
         $customFieldsGroupIds = $em->createQuery('SELECT g.id FROM '
-                . 'ChillCustomFieldsBundle:CustomFieldsDefaultGroup d '
-                . 'JOIN d.customFieldsGroup g')
+                .'ChillCustomFieldsBundle:CustomFieldsDefaultGroup d '
+                .'JOIN d.customFieldsGroup g')
             ->getResult(Query::HYDRATE_SCALAR);
 
         $result = [];
@@ -409,7 +405,7 @@ class CustomFieldsGroupController extends AbstractController
     private function getOptionsAvailable($entity)
     {
         $options = $this->getParameter('chill_custom_fields.'
-              . 'customizables_entities');
+              .'customizables_entities');
 
         foreach ($options as $key => $definition) {
             if ($definition['class'] === $entity) {
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
index 2ee0a9c48..8fd91f27d 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
@@ -18,18 +18,9 @@ use Chill\CustomFieldsBundle\Form\Type\ChoicesType;
 use Chill\CustomFieldsBundle\Form\Type\ChoiceWithOtherType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use LogicException;
-use Symfony\Bridge\Twig\TwigEngine;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
 use Twig\Environment;
-use function array_key_exists;
-use function count;
-use function in_array;
-use function is_array;
-use function LogicException;
 
 class CustomFieldChoice extends AbstractCustomField
 {
@@ -61,7 +52,7 @@ class CustomFieldChoice extends AbstractCustomField
 
     public function buildForm(FormBuilderInterface $builder, CustomField $customField)
     {
-        //prepare choices
+        // prepare choices
         $choices = [];
         $customFieldOptions = $customField->getOptions();
 
@@ -71,7 +62,7 @@ class CustomFieldChoice extends AbstractCustomField
             }
         }
 
-        //prepare $options
+        // prepare $options
         $options = [
             'multiple' => $customFieldOptions[self::MULTIPLE],
             'choices' => array_combine(array_values($choices), array_keys($choices)),
@@ -79,11 +70,11 @@ class CustomFieldChoice extends AbstractCustomField
             'label' => $this->translatableStringHelper->localize($customField->getName()),
         ];
 
-        //if allow_other = true
+        // if allow_other = true
         if (true === $customFieldOptions[self::ALLOW_OTHER]) {
             $otherValueLabel = null;
 
-            if (array_key_exists(self::OTHER_VALUE_LABEL, $customFieldOptions)) {
+            if (\array_key_exists(self::OTHER_VALUE_LABEL, $customFieldOptions)) {
                 $otherValueLabel = $this->translatableStringHelper->localize(
                     $customFieldOptions[self::OTHER_VALUE_LABEL]
                 );
@@ -99,8 +90,8 @@ class CustomFieldChoice extends AbstractCustomField
                     )
                     ->addModelTransformer(new CustomFieldDataTransformer($this, $customField))
             );
-        } else { //if allow_other = false
-            //we add the 'expanded' to options
+        } else { // if allow_other = false
+            // we add the 'expanded' to options
             $options['expanded'] = $customFieldOptions[self::EXPANDED];
 
             $builder->add(
@@ -164,7 +155,7 @@ class CustomFieldChoice extends AbstractCustomField
         return $serialized;
     }
 
-    public function extractOtherValue(CustomField $cf, ?array $data = null)
+    public function extractOtherValue(CustomField $cf, array $data = null)
     {
         return $data['_other'];
     }
@@ -185,7 +176,7 @@ class CustomFieldChoice extends AbstractCustomField
             if ($this->allowOtherChoice($cf)) {
                 $labels = $cf->getOptions()[self::OTHER_VALUE_LABEL];
 
-                if (!is_array($labels) || count($labels) === 0) {
+                if (!\is_array($labels) || 0 === \count($labels)) {
                     $labels['back'] = 'other value';
                 }
                 $choices['_other'] = $this->translatableStringHelper
@@ -210,8 +201,8 @@ class CustomFieldChoice extends AbstractCustomField
      *
      * Used in list exports.
      *
-     * @param string $choiceSlug the slug of the choice we want to know if it was checked
-     * @param array|string $data the data of the field
+     * @param string       $choiceSlug the slug of the choice we want to know if it was checked
+     * @param array|string $data       the data of the field
      *
      * @return bool
      */
@@ -223,10 +214,10 @@ class CustomFieldChoice extends AbstractCustomField
 
         if ($cf->getOptions()[self::MULTIPLE]) {
             if ($cf->getOptions()[self::ALLOW_OTHER]) {
-                return in_array($choiceSlug, $this->deserialize($data, $cf)['_choices'], true);
+                return \in_array($choiceSlug, $this->deserialize($data, $cf)['_choices'], true);
             }
 
-            return in_array($choiceSlug, $this->deserialize($data, $cf), true);
+            return \in_array($choiceSlug, $this->deserialize($data, $cf), true);
         }
 
         if ($cf->getOptions()[self::ALLOW_OTHER]) {
@@ -243,9 +234,9 @@ class CustomFieldChoice extends AbstractCustomField
         }
 
         // if multiple choice OR multiple/single choice with other
-        if (is_array($value)) {
+        if (\is_array($value)) {
             // if allow other
-            if (array_key_exists('_choices', $value)) {
+            if (\array_key_exists('_choices', $value)) {
                 if (null === $value['_choices']) {
                     return true;
                 }
@@ -253,7 +244,7 @@ class CustomFieldChoice extends AbstractCustomField
                 return empty($value['_choices']);
             }   // we do not have 'allow other'
 
-            if (count($value) === 1) {
+            if (1 === \count($value)) {
                 return empty($value[0]);
             }
 
@@ -262,7 +253,7 @@ class CustomFieldChoice extends AbstractCustomField
 
         return empty($value);
 
-        throw LogicException('This case is not expected.');
+        throw \LogicException('This case is not expected.');
     }
 
     public function isMultiple(CustomField $cf)
@@ -273,19 +264,16 @@ class CustomFieldChoice extends AbstractCustomField
     /**
      * @internal this function is able to receive data whichever is the value of "other", "multiple"
      *
-     * @param mixed $value
-     * @param mixed $documentType
-     *
      * @return string html representation
      */
     public function render($value, CustomField $customField, $documentType = 'html')
     {
-        //extract the data. They are under a _choice key if they are stored with allow_other
+        // extract the data. They are under a _choice key if they are stored with allow_other
         $data = $value['_choices'] ?? $value;
-        $selected = (is_array($data)) ? $data : [$data];
+        $selected = (\is_array($data)) ? $data : [$data];
         $choices = $customField->getOptions()[self::CHOICES];
 
-        if (in_array('_other', $selected, true)) {
+        if (\in_array('_other', $selected, true)) {
             $choices[] = ['name' => $value['_other'], 'slug' => '_other'];
         }
 
@@ -323,7 +311,7 @@ class CustomFieldChoice extends AbstractCustomField
         $value = $this->guessValue($serialized);
 
         // set in an array : we want a multiple
-        $fixedValue = is_array($value) ? $value : [$value];
+        $fixedValue = \is_array($value) ? $value : [$value];
 
         if ($allowOther) {
             return $this->deserializeWithAllowOther($serialized, $fixedValue);
@@ -337,9 +325,9 @@ class CustomFieldChoice extends AbstractCustomField
         $value = $this->guessValue($serialized);
 
         // set in a single value. We must have a single string
-        $fixedValue = is_array($value) ?
+        $fixedValue = \is_array($value) ?
                 // check if the array has an element, if not replace by empty string
-                count($value) > 0 ? end($value) : ''
+                \count($value) > 0 ? end($value) : ''
                 :
                 $value;
 
@@ -372,16 +360,17 @@ class CustomFieldChoice extends AbstractCustomField
             return null;
         }
 
-        if (!is_array($value)) {
+        if (!\is_array($value)) {
             return $value;
         }
         // we have a field with "allow other"
-        if (array_key_exists('_choices', $value)) {
+        if (\array_key_exists('_choices', $value)) {
             return $value['_choices'];
         }
+
         // we have a field with "multiple"
         return $value;
 
-        throw LogicException('This case is not expected.');
+        throw \LogicException('This case is not expected.');
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
index 5e0592f8e..a535f805e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
@@ -15,9 +15,6 @@ use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldDataTransformer;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use DateTime;
-use Exception;
-use Symfony\Bundle\TwigBundle\TwigEngine;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -34,7 +31,7 @@ use Twig\Environment;
  */
 class CustomFieldDate extends AbstractCustomField
 {
-    final public const DATE_FORMAT = DateTime::RFC3339;
+    final public const DATE_FORMAT = \DateTime::RFC3339;
 
     final public const FORMAT = 'format';
 
@@ -71,8 +68,8 @@ class CustomFieldDate extends AbstractCustomField
     {
         $validatorFunction = static function ($value, ExecutionContextInterface $context) {
             try {
-                $date = new DateTime($value);
-            } catch (Exception) {
+                $date = new \DateTime($value);
+            } catch (\Exception) {
                 $context->buildViolation('The expression "%expression%" is invalid', [
                     '%expression%' => $value,
                 ])
@@ -107,7 +104,7 @@ class CustomFieldDate extends AbstractCustomField
             return null;
         }
 
-        return DateTime::createFromFormat(self::DATE_FORMAT, $serialized);
+        return \DateTime::createFromFormat(self::DATE_FORMAT, $serialized);
     }
 
     public function getName()
@@ -129,7 +126,7 @@ class CustomFieldDate extends AbstractCustomField
 
             default:
                 $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:date.'
-                        . $documentType . '.twig';
+                        .$documentType.'.twig';
 
                 return $this->templating
                     ->render($template, [
@@ -165,7 +162,7 @@ class CustomFieldDate extends AbstractCustomField
         // add required
         $fieldOptions['required'] = false;
 
-        //add label
+        // add label
         $fieldOptions['label'] = $this->translatableStringHelper->localize($customField->getName());
 
         // add constraints if required
@@ -176,8 +173,8 @@ class CustomFieldDate extends AbstractCustomField
                         return;
                     }
 
-                    $value = DateTime::createFromFormat(self::DATE_FORMAT, $timestamp);
-                    $after = new DateTime($options[self::MIN]);
+                    $value = \DateTime::createFromFormat(self::DATE_FORMAT, $timestamp);
+                    $after = new \DateTime($options[self::MIN]);
 
                     if ($value < $after) {
                         $context
@@ -197,8 +194,8 @@ class CustomFieldDate extends AbstractCustomField
                         return;
                     }
 
-                    $value = DateTime::createFromFormat(self::DATE_FORMAT, $timestamp);
-                    $before = new DateTime($options[self::MAX]);
+                    $value = \DateTime::createFromFormat(self::DATE_FORMAT, $timestamp);
+                    $before = new \DateTime($options[self::MAX]);
 
                     if ($value > $before) {
                         $context
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
index 43902a7e3..ff89c04d2 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
@@ -21,7 +21,7 @@ interface CustomFieldInterface
      * user.
      *
      * @param \Chill\CustomFieldsBundle\CustomField\FormBuilderInterface $builder
-     * @param \Chill\CustomFieldsBundle\CustomField\CustomField $customField
+     * @param \Chill\CustomFieldsBundle\CustomField\CustomField          $customField
      *
      * @return \Symfony\Component\Form\FormTypeInterface the form type
      */
@@ -42,7 +42,6 @@ interface CustomFieldInterface
      * value which may be used in the process.
      *
      * @param \Chill\CustomFieldsBundle\CustomField\CustomField $customField
-     * @param mixed $serialized
      */
     public function deserialize($serialized, CustomField $customField);
 
@@ -58,9 +57,8 @@ interface CustomFieldInterface
     /**
      * Return a repsentation of the value of the CustomField.
      *
-     * @param mixed $value the raw value, **not deserialized** (= as stored in the db)
+     * @param mixed                                             $value       the raw value, **not deserialized** (= as stored in the db)
      * @param \Chill\CustomFieldsBundle\CustomField\CustomField $customField
-     * @param mixed $documentType
      *
      * @return string an html representation of the value
      */
@@ -69,7 +67,6 @@ interface CustomFieldInterface
     /**
      * Transform the value into a format that can be stored in DB.
      *
-     * @param mixed $value
      * @param \Chill\CustomFieldsBundle\CustomField\CustomField $customField
      */
     public function serialize($value, CustomField $customField);
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
index e7886daff..885a02f2d 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
@@ -15,19 +15,11 @@ use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option;
 use Chill\CustomFieldsBundle\EntityRepository\CustomFieldLongChoice\OptionRepository;
 use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldDataTransformer;
-use Chill\FamilyMembersBundle\Templating\Twig;
 use Chill\MainBundle\Form\Type\Select2ChoiceType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use LogicException;
-use Symfony\Bridge\Twig\TwigEngine;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 
-use Symfony\Component\Templating\EngineInterface;
-use function get_class;
-use function gettype;
-use function is_object;
-
 class CustomFieldLongChoice extends AbstractCustomField
 {
     final public const KEY = 'key';
@@ -46,7 +38,7 @@ class CustomFieldLongChoice extends AbstractCustomField
             false,
             true
         );
-        //create a local copy of translatable string helper
+        // create a local copy of translatable string helper
         $translatableStringHelper = $this->translatableStringHelper;
         $builder->add($customField->getSlug(), Select2ChoiceType::class, [
             'choices' => $entries,
@@ -73,7 +65,7 @@ class CustomFieldLongChoice extends AbstractCustomField
 
     public function buildOptionsForm(FormBuilderInterface $builder)
     {
-        //create a selector between different keys
+        // create a selector between different keys
         $keys = $this->optionRepository->getKeys();
         $choices = [];
 
@@ -105,7 +97,7 @@ class CustomFieldLongChoice extends AbstractCustomField
     {
         $option = $this->deserialize($value, $customField);
         $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:choice_long.'
-                . $documentType . '.twig';
+                .$documentType.'.twig';
 
         return $this->templating
             ->render($template, [
@@ -120,9 +112,7 @@ class CustomFieldLongChoice extends AbstractCustomField
         }
 
         if (!$value instanceof Option) {
-            throw new LogicException('the value should be an instance of '
-                    . 'Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option, '
-                    . is_object($value) ? $value::class : gettype($value) . ' given');
+            throw new \LogicException('the value should be an instance of Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option, '.\is_object($value) ? $value::class : \gettype($value).' given');
         }
 
         // we place the id in array, to allow in the future multiple select
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
index 2071c3606..979d96540 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
@@ -13,7 +13,6 @@ namespace Chill\CustomFieldsBundle\CustomFields;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Bundle\TwigBundle\TwigEngine;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -49,10 +48,10 @@ class CustomFieldNumber extends AbstractCustomField
     {
         $options = $customField->getOptions();
 
-        //select the type depending to the SCALE
+        // select the type depending to the SCALE
         $type = (0 === $options[self::SCALE] || null === $options[self::SCALE]) ?
                 IntegerType::class : NumberType::class;
-        //'integer' : 'number';
+        // 'integer' : 'number';
 
         $fieldOptions = $this->prepareFieldOptions($customField, $type);
 
@@ -97,7 +96,7 @@ class CustomFieldNumber extends AbstractCustomField
     public function render($value, CustomField $customField, $documentType = 'html')
     {
         $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:number.'
-                . $documentType . '.twig';
+                .$documentType.'.twig';
         $options = $customField->getOptions();
 
         return $this->templating
@@ -132,7 +131,7 @@ class CustomFieldNumber extends AbstractCustomField
         // add required
         $fieldOptions['required'] = false;
 
-        //add label
+        // add label
         $fieldOptions['label'] = $this->translatableStringHelper->localize($customField->getName());
 
         // add constraints if required
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
index 0584d770d..f95048e21 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
@@ -13,16 +13,12 @@ namespace Chill\CustomFieldsBundle\CustomFields;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Bundle\TwigBundle\TwigEngine;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-
 use Twig\Environment;
-use function array_key_exists;
 
 class CustomFieldText extends AbstractCustomField
 {
@@ -51,7 +47,7 @@ class CustomFieldText extends AbstractCustomField
         $attrArray = [];
 
         if (
-            array_key_exists(self::MULTIPLE_CF_INLINE, $options)
+            \array_key_exists(self::MULTIPLE_CF_INLINE, $options)
             && $options[self::MULTIPLE_CF_INLINE]
         ) {
             $attrArray['class'] = 'multiple-cf-inline';
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
index 305cc6c3e..302e04350 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
@@ -14,10 +14,8 @@ namespace Chill\CustomFieldsBundle\CustomFields;
 use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\Form\Type\CustomFieldsTitleType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Bundle\TwigBundle\TwigEngine;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Twig\Environment;
 
 class CustomFieldTitle extends AbstractCustomField
diff --git a/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php b/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
index 8b827b535..f95991b7c 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
@@ -73,7 +73,7 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
             ->setText($text)
             ->setParent($parent)
             ->setActive(true)
-            ->setInternalKey($parent->getKey() . '-' . $this->counter);
+            ->setInternalKey($parent->getKey().'-'.$this->counter);
     }
 
     private function loadingCompanies(ObjectManager $manager)
@@ -103,7 +103,7 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
                 ->setKey('company');
             $manager->persist($parent);
 
-            //Load children
+            // Load children
             $expected_nb_children = random_int(10, 50);
 
             for ($i = 0; $i < $expected_nb_children; ++$i) {
@@ -143,7 +143,7 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
                 ->setKey('word');
             $manager->persist($parent);
 
-            //Load children
+            // Load children
             $expected_nb_children = random_int(10, 50);
 
             for ($i = 0; $i < $expected_nb_children; ++$i) {
diff --git a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
index 3a188f4c1..724fd01ca 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
@@ -29,15 +29,15 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/fixtures.yaml');
         $loader->load('services/controller.yaml');
         $loader->load('services/command.yaml');
         $loader->load('services/menu.yaml');
 
-        //add at least a blank array at 'customizable_entities' options
-        //$customizable_entities = (isset($config['customizables_entities'])
+        // add at least a blank array at 'customizable_entities' options
+        // $customizable_entities = (isset($config['customizables_entities'])
         //        && $config['customizables_entities'] !== FALSE)
         //        ? $config['customizables_entities'] : array();
 
@@ -64,7 +64,7 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
         ];
         $container->prependExtensionConfig('twig', $twigConfig);
 
-        //add routes for custom bundle
+        // add routes for custom bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
diff --git a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php
index 0cf1a67eb..6e68a248a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\CustomFieldsBundle\DependencyInjection;
 
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -21,8 +20,7 @@ class CustomFieldCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('chill.custom_field.provider')) {
-            throw new LogicException('service chill.custom_field.provider '
-                    . 'is not defined.');
+            throw new \LogicException('service chill.custom_field.provider is not defined.');
         }
 
         $definition = $container->getDefinition(
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
index 509f53a38..b75d23e5e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
@@ -17,7 +17,9 @@ use Doctrine\ORM\Mapping as ORM;
  * CustomField.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="customfield")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class CustomField
@@ -39,10 +41,10 @@ class CustomField
     private ?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup $customFieldGroup = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -60,8 +62,6 @@ class CustomField
     private array $options = [];
 
     /**
-     * @var float
-     *
      * @ORM\Column(type="float")
      */
     private ?float $ordering = null;
@@ -72,15 +72,11 @@ class CustomField
     private false $required = false;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255)
      */
     private ?string $slug = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255)
      */
     private ?string $type = null;
@@ -214,11 +210,9 @@ class CustomField
     /**
      * Set customFieldGroup.
      *
-     * @param CustomFieldsGroup $customFieldGroup
-     *
      * @return CustomField
      */
-    public function setCustomFieldsGroup(?CustomFieldsGroup $customFieldGroup = null)
+    public function setCustomFieldsGroup(CustomFieldsGroup $customFieldGroup = null)
     {
         $this->customFieldGroup = $customFieldGroup;
 
@@ -273,8 +267,6 @@ class CustomField
     }
 
     /**
-     * @param $slug
-     *
      * @return $this
      */
     public function setSlug($slug)
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
index 964160de6..b6f371c8e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * @ORM\Entity(
  * repositoryClass="Chill\CustomFieldsBundle\EntityRepository\CustomFieldLongChoice\OptionRepository")
+ *
  * @ORM\Table(name="custom_field_long_choice_options")
  */
 class Option
@@ -29,6 +30,7 @@ class Option
 
     /**
      * @var Collection<Option>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option",
      * mappedBy="parent")
@@ -36,10 +38,10 @@ class Option
     private Collection $children;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -58,6 +60,7 @@ class Option
      * @ORM\ManyToOne(
      *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option",
      * inversedBy="children")
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?\Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option $parent = null;
@@ -147,8 +150,6 @@ class Option
     }
 
     /**
-     * @param $active
-     *
      * @return $this
      */
     public function setActive($active)
@@ -159,8 +160,6 @@ class Option
     }
 
     /**
-     * @param $internal_key
-     *
      * @return $this
      */
     public function setInternalKey($internal_key)
@@ -171,8 +170,6 @@ class Option
     }
 
     /**
-     * @param $key
-     *
      * @return $this
      */
     public function setKey($key)
@@ -185,7 +182,7 @@ class Option
     /**
      * @return $this
      */
-    public function setParent(?Option $parent = null)
+    public function setParent(Option $parent = null)
     {
         $this->parent = $parent;
         $this->key = $parent->getKey();
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
index 6e509d176..fbf100a95 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
@@ -17,6 +17,7 @@ use Doctrine\ORM\Mapping as ORM;
  * CustomFieldsDefaultGroup.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="customfieldsdefaultgroup",
  *     uniqueConstraints={@ORM\UniqueConstraint(
@@ -27,8 +28,6 @@ use Doctrine\ORM\Mapping as ORM;
 class CustomFieldsDefaultGroup
 {
     /**
-     * @var CustomFieldsGroup
-     *
      * @ORM\ManyToOne(
      * targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldsGroup")
      *
@@ -37,17 +36,15 @@ class CustomFieldsDefaultGroup
     private ?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup $customFieldsGroup = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255)
      */
     private ?string $entity = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -85,7 +82,7 @@ class CustomFieldsDefaultGroup
     /**
      * Set customFieldsGroup.
      *
-     * @param CustomFieldsGroup $customFieldsGroup     *
+     * @param CustomFieldsGroup $customFieldsGroup *
      *
      * @return CustomFieldsDefaultGroup
      */
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
index 41fc535fe..9d2be4979 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
  * CustomFieldGroup.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="customfieldsgroup")
  */
 class CustomFieldsGroup
@@ -34,25 +35,25 @@ class CustomFieldsGroup
      * The custom fields are asc-ordered regarding to their property "ordering".
      *
      * @var Collection<CustomField>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomField",
      * mappedBy="customFieldGroup")
+     *
      * @ORM\OrderBy({"ordering": "ASC"})
      */
     private Collection $customFields;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255)
      */
     private ?string $entity = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -138,9 +139,9 @@ class CustomFieldsGroup
     /**
      * Get name.
      */
-    public function getName(?string $language = null): array|string
+    public function getName(string $language = null): array|string
     {
-        //TODO set this in a service, PLUS twig function
+        // TODO set this in a service, PLUS twig function
         if (null !== $language) {
             if (isset($this->name[$language])) {
                 return $this->name[$language];
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
index f4e2b82f4..9ffc157cc 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
@@ -16,7 +16,6 @@ use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\Persistence\ObjectManager;
-use LogicException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -54,14 +53,14 @@ class CustomFieldType extends AbstractType
             $builder->get('customFieldsGroup')
                 ->addViewTransformer(new CustomFieldsGroupToIdTransformer($this->om));
         } else {
-            throw new LogicException('The value of group_widget is not handled');
+            throw new \LogicException('The value of group_widget is not handled');
         }
 
         $builder
             ->add('ordering', NumberType::class)
             ->add('required', CheckboxType::class, [
                 'required' => false,
-                //'expanded' => TRUE,
+                // 'expanded' => TRUE,
                 'label' => 'Required field',
             ])
             ->add('type', HiddenType::class, ['data' => $options['type']])
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
index 9033bea6a..8cf3ea182 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
@@ -21,22 +21,20 @@ use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function count;
-
 class CustomFieldsGroupType extends AbstractType
 {
     public function __construct(
         private readonly array $customizableEntities,
-        //TODO : add comment about this variable
+        // TODO : add comment about this variable
         private readonly TranslatorInterface $translator
     ) {}
 
-    //TODO : details about the function
+    // TODO : details about the function
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        //prepare translation
+        // prepare translation
         $entities = [];
-        $customizableEntities = []; //TODO : change name too close than $this->customizableEntities
+        $customizableEntities = []; // TODO : change name too close than $this->customizableEntities
 
         foreach ($this->customizableEntities as $key => $definition) {
             $entities[$definition['class']] = $this->translator->trans($definition['name']);
@@ -55,14 +53,14 @@ class CustomFieldsGroupType extends AbstractType
                 $form = $event->getForm();
                 $group = $event->getData();
 
-                //stop the function if entity is not set
-                if ($group->getEntity() === null) {
+                // stop the function if entity is not set
+                if (null === $group->getEntity()) {
                     return;
                 }
 
                 $optionBuilder = null;
 
-                if (count($customizableEntities[$group->getEntity()]['options']) > 0) {
+                if (\count($customizableEntities[$group->getEntity()]['options']) > 0) {
                     $optionBuilder = $builder
                         ->getFormFactory()
                         ->createBuilderForProperty(CustomFieldsGroup::class, 'options')
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
index f96e02914..180ac0a8a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
@@ -16,8 +16,6 @@ use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
-use function gettype;
-
 class CustomFieldsGroupToIdTransformer implements DataTransformerInterface
 {
     public function __construct(private readonly ObjectManager $om) {}
@@ -25,35 +23,25 @@ class CustomFieldsGroupToIdTransformer implements DataTransformerInterface
     /**
      * Transforms a string (id) to an object (CustomFieldsGroup).
      *
-     * @param  string $id
+     * @param string $id
      *
-     * @throws TransformationFailedException if object (report) is not found.
+     * @throws TransformationFailedException if object (report) is not found
      */
-    public function reverseTransform($id): ?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup
+    public function reverseTransform($id): ?CustomFieldsGroup
     {
         if (!$id) {
             return null;
         }
 
         if ($id instanceof CustomFieldsGroup) {
-            throw new TransformationFailedException(
-                'The transformation failed: the expected argument on '
-                  . 'reverseTransform is an object of type int,'
-                  . 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup, '
-                  . 'given'
-            );
+            throw new TransformationFailedException('The transformation failed: the expected argument on reverseTransform is an object of type int,Chill\CustomFieldsBundle\Entity\CustomFieldsGroup, given');
         }
 
         $customFieldsGroup = $this->om
             ->getRepository(CustomFieldsGroup::class)->find($id);
 
         if (null === $customFieldsGroup) {
-            throw new TransformationFailedException(
-                sprintf(
-                    'Le group avec le numéro "%s" ne peut pas être trouvé!',
-                    $id
-                )
-            );
+            throw new TransformationFailedException(sprintf('Le group avec le numéro "%s" ne peut pas être trouvé!', $id));
         }
 
         return $customFieldsGroup;
@@ -62,7 +50,7 @@ class CustomFieldsGroupToIdTransformer implements DataTransformerInterface
     /**
      * Transforms an custom_field_group to a string (id).
      *
-     * @param  CustomFieldsGroup|null $customFieldsGroup
+     * @param CustomFieldsGroup|null $customFieldsGroup
      *
      * @return string
      */
@@ -73,14 +61,7 @@ class CustomFieldsGroupToIdTransformer implements DataTransformerInterface
         }
 
         if (!$customFieldsGroup instanceof CustomFieldsGroup) {
-            throw new TransformationFailedException(sprintf(
-                'Transformation failed: '
-                  . 'the expected type of the transforme function is an '
-                  . 'object of type Chill\CustomFieldsBundle\Entity\CustomFieldsGroup, '
-                  . '%s given (value : %s)',
-                gettype($customFieldsGroup),
-                $customFieldsGroup
-            ));
+            throw new TransformationFailedException(sprintf('Transformation failed: the expected type of the transforme function is an object of type Chill\CustomFieldsBundle\Entity\CustomFieldsGroup, %s given (value : %s)', \gettype($customFieldsGroup), $customFieldsGroup));
         }
 
         return $customFieldsGroup->getId();
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
index 2827c0a73..9f2fa3a9e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
@@ -15,10 +15,6 @@ use Chill\CustomFieldsBundle\Entity\CustomField;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Form\DataTransformerInterface;
 
-use function array_key_exists;
-
-use const JSON_THROW_ON_ERROR;
-
 /**
  * Not in use ? Deprecated ?
  */
@@ -58,22 +54,22 @@ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
         echo "<br> - - 9 - <br>";
          */
 
-        //var_dump($customFieldsArray);
+        // var_dump($customFieldsArray);
 
         $customFieldsArrayRet = [];
 
         foreach ($customFieldsArray as $key => $value) {
             $traited = false;
 
-            if (array_key_exists($key, $this->customField)) {
+            if (\array_key_exists($key, $this->customField)) {
                 $type = $this->customField[$key]->getType();
 
                 if (str_starts_with((string) $type, 'ManyToOne')) {
                     // pour le manytoone() faire
                     // un update du form en js ? : http://symfony.com/fr/doc/current/cookbook/form/form_collections.html
                     //
-                    //$entityClass = substr($type, 10, -1);
-                    //echo $entityClasss;
+                    // $entityClass = substr($type, 10, -1);
+                    // echo $entityClasss;
                     if (str_starts_with((string) $type, 'ManyToOnePersist')) {
                         // PEUT ETRE A FAIRE SI SEULEMENT $value->getId() ne renvoie rien...
                         //
@@ -100,9 +96,9 @@ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
             }
         }
 
-        //echo json_encode($customFieldsArrayRet);
+        // echo json_encode($customFieldsArrayRet);
 
-        return json_encode($customFieldsArrayRet, JSON_THROW_ON_ERROR);
+        return json_encode($customFieldsArrayRet, \JSON_THROW_ON_ERROR);
     }
 
     public function transform($customFieldsJSON)
@@ -112,7 +108,7 @@ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
         if (null === $customFieldsJSON) {
             $customFieldsArray = [];
         } else {
-            $customFieldsArray = json_decode((string) $customFieldsJSON, true, 512, JSON_THROW_ON_ERROR);
+            $customFieldsArray = json_decode((string) $customFieldsJSON, true, 512, \JSON_THROW_ON_ERROR);
         }
 
         $customFieldsArrayRet = [];
@@ -120,7 +116,7 @@ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
         foreach ($customFieldsArray as $key => $value) {
             $traited = false;
 
-            if (array_key_exists($key, $this->customField)) {
+            if (\array_key_exists($key, $this->customField)) {
                 $type = $this->customField[$key]->getType();
 
                 if (str_starts_with((string) $type, 'ManyToOne')) {
@@ -131,7 +127,7 @@ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
                     }
 
                     $customFieldsArrayRet[$key] = $this->om
-                        ->getRepository('ChillCustomFieldsBundle:' . $entityClass)
+                        ->getRepository('ChillCustomFieldsBundle:'.$entityClass)
                         ->findOneById($value);
                     $traited = true;
                 } elseif ('ManyToMany(Adress)' === $type) {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php
index 14ddf0472..2d801beec 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php
@@ -16,8 +16,6 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-use function array_key_exists;
-
 /**
  * This extension create the possibility to add some text
  * after the input.
@@ -30,8 +28,8 @@ abstract class PostTextExtension extends AbstractTypeExtension
 {
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        if (array_key_exists('post_text', $options)) {
-            //set the post text variable to the view
+        if (\array_key_exists('post_text', $options)) {
+            // set the post text variable to the view
             $view->vars['post_text'] = $options['post_text'];
         }
     }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
index ffb22f87e..8d0c049f0 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
@@ -29,9 +29,9 @@ class ChoiceWithOtherType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        //add an 'other' entry in choices array
+        // add an 'other' entry in choices array
         $options['choices'][$this->otherValueLabel] = '_other';
-        //ChoiceWithOther must always be expanded
+        // ChoiceWithOther must always be expanded
         $options['expanded'] = true;
         // adding a default value for choice
         $options['empty_data'] = null;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
index 59fa5f3f2..8f6e896bf 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
@@ -108,7 +108,7 @@ class LinkedCustomFieldsType extends AbstractType
      */
     private function getRootForm(FormInterface $form)
     {
-        if ($form->getParent() === null) {
+        if (null === $form->getParent()) {
             return $form;
         }
 
diff --git a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
index 1f115d675..aad28a2b2 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\CustomFieldsBundle\Service;
 
-use LogicException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -45,8 +44,8 @@ class CustomFieldProvider implements ContainerAwareInterface
      * Add a new custom field to the provider.
      *
      * @param type $serviceName The name of the service (declared in service.yml)
-     * @param type $type The type of the service (that is used in the form to
-     * add this type)
+     * @param type $type        The type of the service (that is used in the form to
+     *                          add this type)
      */
     public function addCustomField($serviceName, $type)
     {
@@ -56,7 +55,7 @@ class CustomFieldProvider implements ContainerAwareInterface
     /**
      * Get all the custom fields known by the provider.
      *
-     * @return array Array of the known custom fields indexed by the type.
+     * @return array array of the known custom fields indexed by the type
      */
     public function getAllFields()
     {
@@ -77,8 +76,7 @@ class CustomFieldProvider implements ContainerAwareInterface
             return $this->servicesByType[$type];
         }
 
-        throw new LogicException('the custom field with type ' . $type . ' '
-                . 'is not found');
+        throw new \LogicException('the custom field with type '.$type.' is not found');
     }
 
     /**
@@ -86,10 +84,10 @@ class CustomFieldProvider implements ContainerAwareInterface
      *
      * @see \Symfony\Component\DependencyInjection\ContainerAwareInterface::setContainer()
      */
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         if (null === $container) {
-            throw new LogicException('container should not be null');
+            throw new \LogicException('container should not be null');
         }
 
         $this->container = $container;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
index d43e64cf3..320f36544 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
@@ -25,9 +25,9 @@ class CustomFieldsHelper
     /**
      * Constructor.
      *
-     * @param EntityManagerInterface $em The entity manager
-     * @param CustomFieldProvider $provider The customfield provider that
-     * contains all the declared custom fields
+     * @param EntityManagerInterface $em       The entity manager
+     * @param CustomFieldProvider    $provider The customfield provider that
+     *                                         contains all the declared custom fields
      */
     public function __construct(private readonly EntityManagerInterface $em, private readonly CustomFieldProvider $provider) {}
 
@@ -45,13 +45,13 @@ class CustomFieldsHelper
     /**
      * Render the value of a custom field.
      *
-     * @param array $fields the **raw** array, as stored in the db
-     * @param CustomField $customField the customField entity
-     * @param string $documentType The type of document in which the rendered value is displayed ('html' or 'csv').
+     * @param array       $fields       the **raw** array, as stored in the db
+     * @param CustomField $customField  the customField entity
+     * @param string      $documentType the type of document in which the rendered value is displayed ('html' or 'csv')
+     *
+     * @return The representation of the value the customField
      *
      * @throws CustomFieldsHelperException if slug is missing
-     *
-     * @return The representation of the value the customField.
      */
     public function renderCustomField(array $fields, CustomField $customField, $documentType = 'html')
     {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php
index f1d143c92..e442b0f0c 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\CustomFieldsBundle\Service;
 
-use Exception;
-
-class CustomFieldsHelperException extends Exception
+class CustomFieldsHelperException extends \Exception
 {
     public static function customFieldsGroupNotFound($entity)
     {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
index 1b7ab606b..6d3d889a8 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
@@ -13,9 +13,6 @@ namespace Chill\CustomFieldsBundle\Templating\Twig;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\Service\CustomFieldsHelper;
-use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
@@ -77,9 +74,9 @@ class CustomFieldRenderingTwig extends AbstractExtension
      * Twig Extension that is used to render the label of a custom field.
      *
      * @param CustomField $customField Either a customField OR a customizable_entity OR the FQDN of the entity
-     * @param array $params The parameters for rendering. Currently, 'label_layout' allow to choose a different label. Default is '@ChillCustomFields/CustomField/render_label.html.twig'
+     * @param array       $params      The parameters for rendering. Currently, 'label_layout' allow to choose a different label. Default is '@ChillCustomFields/CustomField/render_label.html.twig'
      *
-     * @return string HTML representation of the custom field label.
+     * @return string HTML representation of the custom field label
      */
     public function renderLabel(Environment $env, CustomField $customField, array $params = [])
     {
@@ -93,9 +90,9 @@ class CustomFieldRenderingTwig extends AbstractExtension
      *
      * The presentation of the value  is influenced by the document type.
      *
-     * @param array $fields The array raw, as stored in the db
-     * @param CustomField $customField Either a customField OR a customizable_entity OR the FQDN of the entity
-     * @param string $documentType The type of the document (csv, html)
+     * @param array       $fields       The array raw, as stored in the db
+     * @param CustomField $customField  Either a customField OR a customizable_entity OR the FQDN of the entity
+     * @param string      $documentType The type of the document (csv, html)
      *
      * @return string HTML representation of the custom field value, as described in the CustomFieldInterface. Is HTML safe
      */
diff --git a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
index 9d0537750..57add2733 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
@@ -11,9 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\CustomFieldsBundle\Templating\Twig;
 
-use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
@@ -71,16 +68,17 @@ final class CustomFieldsGroupRenderingTwig extends AbstractExtension
      *
      * The presentation of the value  is influenced by the document type.
      *
-     * @param array $fields The array raw, as stored in the db
+     * @param array             $fields           The array raw, as stored in the db
      * @param CustomFieldsGroud $customFielsGroup The custom field group
-     * @param string $documentType The type of the document (csv, html)
-     * @param array $params The parameters for rendering :
-     *  - layout : allow to choose a different layout by default :
+     * @param string            $documentType     The type of the document (csv, html)
+     * @param array             $params           The parameters for rendering :
+     *                                            - layout : allow to choose a different layout by default :
+     *
      *             @ChillCustomFields/CustomFieldsGroup/render.html.twig
      *  - show_empty : force show empty field
      *
      * @return string HTML representation of the custom field group value, as described in
-     * the CustomFieldInterface. Is HTML safe
+     *                the CustomFieldInterface. Is HTML safe
      */
     public function renderWidget(Environment $env, array $fields, $customFielsGroup, $documentType = 'html', array $params = [])
     {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php
index 925c6305e..ef5936997 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  * Test the option Customizables_entities.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ConfigCustomizablesEntitiesTest extends KernelTestCase
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php
index d3d096a38..f844ad2d5 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldControllerTest_TODO extends WebTestCase
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php
index e6fa291d5..ac2b94483 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php
@@ -16,6 +16,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldsGroupControllerTest extends WebTestCase
@@ -32,7 +33,7 @@ final class CustomFieldsGroupControllerTest extends WebTestCase
             'PHP_AUTH_PW' => 'olala',
         ]);
 
-        //create the entity
+        // create the entity
         $this->createCustomFieldsGroup($client);
 
         // Edit the entity
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php
index 79f547fe2..6c6e424da 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php
@@ -33,7 +33,7 @@ trait CustomFieldTestHelper
     {
         $kernel = static::$kernel;
 
-        //check a kernel is accessible
+        // check a kernel is accessible
         $customFieldsGroup = $this->createMock(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class);
         $customFieldsGroup->expects($this->once())
             ->method('getActiveCustomFields')
@@ -55,7 +55,7 @@ trait CustomFieldTestHelper
             ->getForm();
 
         $kernel->getContainer()->get('twig.loader')
-            ->addPath($kernel->getContainer()->getParameter('kernel.root_dir') .
+            ->addPath($kernel->getContainer()->getParameter('kernel.root_dir').
                 '/Resources/views/', $namespace = 'test');
 
         $content = $kernel
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
index cebff56ab..35d9ca3a3 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
@@ -23,6 +23,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  * - deserialize
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldsChoiceTest extends KernelTestCase
@@ -129,6 +130,7 @@ final class CustomFieldsChoiceTest extends KernelTestCase
      * This test does not covers the case when the selected value is `_other`
      *
      * @param type $data
+     *
      * @dataProvider serializedRepresentationDataProvider
      */
     public function testDeserializeMultipleChoiceWithOther($data)
@@ -214,6 +216,7 @@ final class CustomFieldsChoiceTest extends KernelTestCase
      * **without** an "allow_other" field.
      *
      * @param type $data
+     *
      * @dataProvider serializedRepresentationDataProvider
      */
     public function testDeserializeMultipleChoiceWithoutOther($data)
@@ -261,7 +264,7 @@ final class CustomFieldsChoiceTest extends KernelTestCase
         $deserialized = $this->cfChoice->deserialize($data, $customField);
         $this->assertSame([null], $deserialized);
 
-        //from single
+        // from single
         $data = ['_other' => null, '_choices' => null];
         $deserialized = $this->cfChoice->deserialize($data, $customField);
         $this->assertSame([null], $deserialized);
@@ -274,6 +277,7 @@ final class CustomFieldsChoiceTest extends KernelTestCase
      * If the value is in _other, the _other value should be in the _other field.
      *
      * @param type $data
+     *
      * @dataProvider serializedRepresentationDataProvider
      */
     public function testDeserializeSingleChoiceWithOther($data)
@@ -311,8 +315,8 @@ final class CustomFieldsChoiceTest extends KernelTestCase
         $deserialized = $this->cfChoice->deserialize($data, $customField);
         $this->assertSame(['_other' => 'something', '_choices' => '_other'], $deserialized);
 
-        //test with null data
-        //from a single to a single :
+        // test with null data
+        // from a single to a single :
         $data = ['_other' => 'something', '_choices' => null];
         $deserialized = $this->cfChoice->deserialize($data, $customField);
         $this->assertSame(['_other' => 'something', '_choices' => null], $deserialized);
@@ -340,11 +344,11 @@ final class CustomFieldsChoiceTest extends KernelTestCase
         $this->assertSame(['_other' => '', '_choices' => null], $deserialized);
     }
 
-    /////////////////////////////////////////
+    // ///////////////////////////////////////
     //
     // test function deserialize
     //
-    ////////////////////////////////////////
+    // //////////////////////////////////////
 
     /**
      * Test if the representation of the data is deserialized to a single text.
@@ -352,6 +356,7 @@ final class CustomFieldsChoiceTest extends KernelTestCase
      * If the value is in _other, the _other value should not be returned.
      *
      * @param type $data
+     *
      * @dataProvider serializedRepresentationDataProvider
      */
     public function testDeserializeSingleChoiceWithoutOther($data)
@@ -409,11 +414,11 @@ final class CustomFieldsChoiceTest extends KernelTestCase
         $this->assertTrue($isEmpty);
     }
 
-    /////////////////////////////////////////
+    // ///////////////////////////////////////
     //
     // test function isEmptyValue
     //
-    ////////////////////////////////////////
+    // //////////////////////////////////////
     /**
      * test the not empty with the not-empty data provider.
      *
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
index 3dfaf7ac0..235631e24 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
@@ -11,15 +11,14 @@ declare(strict_types=1);
 
 namespace Chill\CustomFieldsBundle\Tests\CustomFields;
 
-use Chill\CustomFieldsBundle\CustomFields\CustomFieldNumber;
 use Chill\CustomFieldsBundle\Entity\CustomField;
 use Symfony\Component\Form\FormBuilderInterface;
-use function count;
 
 /**
  * Test CustomFieldsNumber.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldsNumberTest extends \Symfony\Bundle\FrameworkBundle\Test\WebTestCase
@@ -70,7 +69,7 @@ final class CustomFieldsNumberTest extends \Symfony\Bundle\FrameworkBundle\Test\
 
         $this->assertTrue($form->isSynchronized());
         $this->assertFalse($form->isValid());
-        $this->assertEquals(1, count($form['default']->getErrors()));
+        $this->assertEquals(1, \count($form['default']->getErrors()));
     }
 
     public function testCreateInvalidFormValueLowerThanMinimum()
@@ -90,7 +89,7 @@ final class CustomFieldsNumberTest extends \Symfony\Bundle\FrameworkBundle\Test\
 
         $this->assertTrue($form->isSynchronized());
         $this->assertFalse($form->isValid());
-        $this->assertEquals(1, count($form['default']->getErrors()));
+        $this->assertEquals(1, \count($form['default']->getErrors()));
     }
 
     public function testCreateValidForm()
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
index e13dcba44..87722c1bd 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldsTextTest extends WebTestCase
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php
index 087b232ee..d6327829a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Form\Extension\Core\Type\IntegerType;
  * Test the post-text extension.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PostTextIntegerExtensionTest extends KernelTestCase
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php
index 2d04c8bc4..4a905ae1b 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Form\Extension\Core\Type\NumberType;
  * Test the post-text extension.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PostTextNumberExtensionTest extends KernelTestCase
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
index b72a3138d..0ef952f59 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\HttpFoundation\Response;
  * Test that routes are correctly loaded.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class RoutingLoaderTest extends WebTestCase
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
index f97d66e13..310e64b62 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
@@ -12,13 +12,13 @@ declare(strict_types=1);
 namespace Chill\CustomFields\Tests\Service;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
-use Chill\CustomFieldsBundle\Service\CustomFieldsHelper;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * Tests for custom fields helper.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldsHelperTest extends KernelTestCase
@@ -52,7 +52,7 @@ final class CustomFieldsHelperTest extends KernelTestCase
 
         $this->assertFalse($this->cfHelper->isEmptyValue($data, $this->randomCFText));
 
-        //empty value
+        // empty value
         $data = [
             $this->randomCFText->getSlug() => '',
         ];
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
index 6353467ff..04376b84a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
@@ -12,14 +12,13 @@ declare(strict_types=1);
 namespace Chill\CustomFields\Tests\Templating\Twig;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
-use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
-use Chill\CustomFieldsBundle\Templating\Twig\CustomFieldRenderingTwig;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * Test the rendering of twig function which renders custom fields.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldRenderingTwigTest extends KernelTestCase
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
index f01e9d4f8..07da58cbc 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
@@ -13,8 +13,6 @@ namespace Chill\CustomFields\Tests\Templating\Twig;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
-use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
-use Chill\CustomFieldsBundle\Templating\Twig\CustomFieldsGroupRenderingTwig;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
@@ -22,6 +20,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  * the `chill_custom_fields_group_widget`.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldsGroupRenderingTwigTest extends KernelTestCase
@@ -93,7 +92,6 @@ final class CustomFieldsGroupRenderingTwigTest extends KernelTestCase
     }
 
     /**
-     *
      * @return CustomField
      */
     private function getSimpleCustomFieldText(mixed $slug, mixed $name)
diff --git a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php
index cd14e83de..c8804c378 100644
--- a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php
+++ b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php
@@ -22,7 +22,7 @@ class Version20151210155904 extends AbstractMigration
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE CustomField DROP required');
     }
@@ -30,7 +30,7 @@ class Version20151210155904 extends AbstractMigration
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE customfield ADD required BOOLEAN DEFAULT FALSE');
     }
diff --git a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php
index d06a8af07..1f3211aa3 100644
--- a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php
+++ b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php
@@ -22,7 +22,7 @@ class Version20151210205610 extends AbstractMigration
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE custom_field_long_choice_options DROP CONSTRAINT cf_long_choice_self_referencing');
         $this->addSql('DROP SEQUENCE custom_field_long_choice_options_id_seq CASCADE');
@@ -31,19 +31,19 @@ class Version20151210205610 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE custom_field_long_choice_options_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE custom_field_long_choice_options (id INT NOT NULL, '
-                . 'parent_id INT DEFAULT NULL, '
-                . 'key VARCHAR(15) NOT NULL, '
-                . 'text jsonb NOT NULL, '
-                . 'active boolean NOT NULL,'
-                . 'internal_key VARCHAR(50) NOT NULL DEFAULT \'\', '
-                . 'PRIMARY KEY(id))');
+                .'parent_id INT DEFAULT NULL, '
+                .'key VARCHAR(15) NOT NULL, '
+                .'text jsonb NOT NULL, '
+                .'active boolean NOT NULL,'
+                .'internal_key VARCHAR(50) NOT NULL DEFAULT \'\', '
+                .'PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_14BBB8E0727ACA70 ON custom_field_long_choice_options (parent_id)');
         $this->addSql('ALTER TABLE custom_field_long_choice_options ADD CONSTRAINT cf_long_choice_self_referencing '
-                . 'FOREIGN KEY (parent_id) REFERENCES custom_field_long_choice_options (id) '
-                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'FOREIGN KEY (parent_id) REFERENCES custom_field_long_choice_options (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php
index 488906457..68fb598d8 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php
@@ -17,12 +17,12 @@ use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 interface ContextManagerInterface
 {
     /**
-     * @throws ContextNotFoundException When the context is not found.
+     * @throws ContextNotFoundException when the context is not found
      */
     public function getContextByDocGeneratorTemplate(DocGeneratorTemplate $docGeneratorTemplate): DocGeneratorContextInterface;
 
     /**
-     * @throws ContextNotFoundException When the context is not found.
+     * @throws ContextNotFoundException when the context is not found
      */
     public function getContextByKey(string $searchedKey): DocGeneratorContextInterface;
 
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
index 732d4b796..998375d5d 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
@@ -15,6 +15,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * @template T of object
+ *
  * @extends DocGeneratorContextInterface<T>
  */
 interface DocGeneratorContextWithAdminFormInterface extends DocGeneratorContextInterface
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
index 496524206..e69337993 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
@@ -16,6 +16,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * @template T of object
+ *
  * @extends DocGeneratorContextInterface<T>
  */
 interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContextInterface
@@ -28,7 +29,7 @@ interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContext
     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, mixed $entity): void;
 
     /**
-     * Fill the form with initial data
+     * Fill the form with initial data.
      *
      * @param T $entity
      */
@@ -42,14 +43,14 @@ interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContext
     public function hasPublicForm(DocGeneratorTemplate $template, mixed $entity): bool;
 
     /**
-     * Transform the data from the form into serializable data, storable into messenger's message
+     * Transform the data from the form into serializable data, storable into messenger's message.
      *
      * @param T $entity
      */
     public function contextGenerationDataNormalize(DocGeneratorTemplate $template, mixed $entity, array $data): array;
 
     /**
-     * Reverse the data from the messenger's message into data usable for doc's generation
+     * Reverse the data from the messenger's message into data usable for doc's generation.
      *
      * @param T $entity
      */
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php
index c1e5cabe8..66912787f 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\Context\Exception;
 
-use RuntimeException;
-
-class ContextNotFoundException extends RuntimeException
+class ContextNotFoundException extends \RuntimeException
 {
     public function __construct($contextName)
     {
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php
index 8a6b000b3..210e1a3ee 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php
@@ -11,13 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\Context\Exception;
 
-use LogicException;
-
-use function get_class;
-use function gettype;
-use function is_object;
-
-class UnexpectedTypeException extends LogicException
+class UnexpectedTypeException extends \LogicException
 {
     public function __construct($value, string $expectedType)
     {
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index a216b6416..c9e1873b2 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -15,16 +15,13 @@ use Chill\DocGeneratorBundle\Context\ContextManager;
 use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
-use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
 use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
 use Chill\DocGeneratorBundle\Service\Generator\GeneratorInterface;
 use Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage;
 use Chill\DocStoreBundle\Entity\StoredObject;
-use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Doctrine\ORM\EntityManagerInterface;
-use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
@@ -37,9 +34,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Contracts\HttpClient\HttpClientInterface;
-use function strlen;
-use const JSON_PRETTY_PRINT;
 
 final class DocGeneratorTemplateController extends AbstractController
 {
@@ -155,10 +149,7 @@ final class DocGeneratorTemplateController extends AbstractController
         try {
             $context = $this->contextManager->getContextByDocGeneratorTemplate($template);
         } catch (ContextNotFoundException $e) {
-            throw new NotFoundHttpException(
-                'Context not found.',
-                $e
-            );
+            throw new NotFoundHttpException('Context not found.', $e);
         }
 
         $entity = $this
@@ -167,9 +158,7 @@ final class DocGeneratorTemplateController extends AbstractController
             ->find($entityId);
 
         if (null === $entity) {
-            throw new NotFoundHttpException(
-                sprintf('Entity with classname %s and id %s is not found', $context->getEntityClass(), $entityId)
-            );
+            throw new NotFoundHttpException(sprintf('Entity with classname %s and id %s is not found', $context->getEntityClass(), $entityId));
         }
 
         $contextGenerationData = [
@@ -230,7 +219,7 @@ final class DocGeneratorTemplateController extends AbstractController
         // if is test, render the data or generate the doc
         if ($isTest && isset($form) && $form['show_data']->getData()) {
             return $this->render('@ChillDocGenerator/Generator/debug_value.html.twig', [
-                'datas' => json_encode($context->getData($template, $entity, $contextGenerationData), JSON_PRETTY_PRINT),
+                'datas' => json_encode($context->getData($template, $entity, $contextGenerationData), \JSON_PRETTY_PRINT),
             ]);
         }
         if ($isTest) {
@@ -250,7 +239,7 @@ final class DocGeneratorTemplateController extends AbstractController
                     'Content-Transfer-Encoding', 'binary',
                     'Content-Type' => 'application/vnd.oasis.opendocument.text',
                     'Content-Disposition' => 'attachment; filename="generated.odt"',
-                    'Content-Length' => strlen($generated),
+                    'Content-Length' => \strlen($generated),
                 ],
             );
         }
diff --git a/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php
index 571de1574..97d436c5e 100644
--- a/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php
+++ b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php
@@ -15,7 +15,6 @@ use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Service\DocGenerator\AccompanyingPeriodContext;
-use DateTime;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Persistence\ObjectManager;
 
@@ -59,7 +58,7 @@ class LoadDocGeneratorTemplate extends AbstractFixture
                 ->setFilename($template['file']['filename'])
                 ->setKeyInfos(json_decode($template['file']['key'], true))
                 ->setIv(json_decode($template['file']['iv'], true))
-                ->setCreatedAt(new DateTime('today'))
+                ->setCreatedAt(new \DateTime('today'))
                 ->setType($template['file']['type']);
 
             $manager->persist($newStoredObj);
diff --git a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
index 9edca1675..e3f45a7fd 100644
--- a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
+++ b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
@@ -30,7 +30,7 @@ class ChillDocGeneratorExtension extends Extension implements PrependExtensionIn
         $config = $this->processConfiguration($configuration, $configs);
         $container->setParameter('chill_doc_generator', $config);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/controller.yaml');
         $loader->load('services/fixtures.yaml');
diff --git a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php
index a2f67fc39..2438e66d9 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php
@@ -17,7 +17,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_docgen_template")
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "docgen_template": DocGeneratorTemplate::class
  * })
@@ -41,6 +43,7 @@ class DocGeneratorTemplate
 
     /**
      * @ORM\Column(type="text", nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
     private ?string $description = null;
@@ -59,14 +62,18 @@ class DocGeneratorTemplate
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read"})
      */
     private int $id;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"read"})
      */
     private array $name = [];
diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php
index 4d802d2ca..a408ec8e6 100644
--- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php
@@ -13,5 +13,5 @@ namespace Chill\DocGeneratorBundle\GeneratorDriver;
 
 interface DriverInterface
 {
-    public function generateFromString(string $template, string $resourceType, array $data, ?string $templateName = null): string;
+    public function generateFromString(string $template, string $resourceType, array $data, string $templateName = null): string;
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php
index 5e7227a00..9fa6f6654 100644
--- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php
@@ -11,16 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\GeneratorDriver\Exception;
 
-use RuntimeException;
-use Throwable;
-
 /**
  * A exception to throw when there are syntax errors in the
  * template file.
  */
-class TemplateException extends RuntimeException
+class TemplateException extends \RuntimeException
 {
-    public function __construct(private readonly array $errors, $code = 0, ?Throwable $previous = null)
+    public function __construct(private readonly array $errors, $code = 0, \Throwable $previous = null)
     {
         parent::__construct('Error while generating document from template', $code, $previous);
     }
diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
index 7dd1dccf0..547af44c9 100644
--- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
@@ -20,7 +20,6 @@ use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use Throwable;
 
 final class RelatorioDriver implements DriverInterface
 {
@@ -34,7 +33,7 @@ final class RelatorioDriver implements DriverInterface
         $this->url = $parameterBag->get('chill_doc_generator')['driver']['relatorio']['url'];
     }
 
-    public function generateFromString(string $template, string $resourceType, array $data, ?string $templateName = null): string
+    public function generateFromString(string $template, string $resourceType, array $data, string $templateName = null): string
     {
         $form = new FormDataPart(
             [
@@ -84,7 +83,7 @@ final class RelatorioDriver implements DriverInterface
             ]);
 
             throw $e;
-        } catch (Throwable $exception) {
+        } catch (\Throwable $exception) {
             $this
                 ->logger
                 ->error(
diff --git a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
index 0f2771b4e..85486c2ce 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
@@ -58,7 +58,7 @@ final class DocGeneratorTemplateRepository implements ObjectRepository
      *
      * @return DocGeneratorTemplate[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -85,7 +85,7 @@ final class DocGeneratorTemplateRepository implements ObjectRepository
             ->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?DocGeneratorTemplate
+    public function findOneBy(array $criteria, array $orderBy = null): ?DocGeneratorTemplate
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php
index 51527bbef..bcf73abd0 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php
@@ -12,10 +12,7 @@ declare(strict_types=1);
 namespace Chill\DocGeneratorBundle\Serializer\Encoder;
 
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
-
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
-use function array_keys;
-use function is_array;
 
 class DocGenEncoder implements EncoderInterface
 {
@@ -38,21 +35,21 @@ class DocGenEncoder implements EncoderInterface
 
     private function canonicalizeKey(string $path, string $key): string
     {
-        return '' === $path ? $key : $path . '_' . $key;
+        return '' === $path ? $key : $path.'_'.$key;
     }
 
     private function isAssociative(array $data)
     {
-        $keys = array_keys($data);
+        $keys = \array_keys($data);
 
-        return array_keys($keys) !== $keys;
+        return \array_keys($keys) !== $keys;
     }
 
     private function recusiveEncoding(array $data, array &$result, $path)
     {
         if ($this->isAssociative($data)) {
             foreach ($data as $key => $value) {
-                if (is_array($value)) {
+                if (\is_array($value)) {
                     $this->recusiveEncoding($value, $result, $this->canonicalizeKey($path, $key));
                 } else {
                     $result[$this->canonicalizeKey($path, $key)] = $value;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
index 9b384704b..4614c7850 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
@@ -14,14 +14,11 @@ namespace Chill\DocGeneratorBundle\Serializer\Helper;
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-use function array_merge;
-use function is_array;
-
 class NormalizeNullValueHelper
 {
     public function __construct(private readonly NormalizerInterface $normalizer, private readonly ?string $discriminatorType = null, private readonly ?string $discriminatorValue = null) {}
 
-    public function normalize(array $attributes, string $format = 'docgen', ?array $context = [], ?ClassMetadata $classMetadata = null)
+    public function normalize(array $attributes, string $format = 'docgen', ?array $context = [], ClassMetadata $classMetadata = null)
     {
         $data = [];
         $data['isNull'] = true;
@@ -36,7 +33,7 @@ class NormalizeNullValueHelper
             } else {
                 $data[$key] = match ($class) {
                     'array', 'bool', 'double', 'float', 'int', 'resource', 'string', 'null' => '',
-                    default => $this->normalizer->normalize(null, $format, array_merge(
+                    default => $this->normalizer->normalize(null, $format, \array_merge(
                         $this->getContextForAttribute($key, $context, $classMetadata),
                         ['docgen:expects' => $class]
                     )),
@@ -57,10 +54,10 @@ class NormalizeNullValueHelper
 
         if (null !== $attributeMetadata) {
             /** @var \Symfony\Component\Serializer\Mapping\AttributeMetadata $attributeMetadata */
-            $initialContext = array_merge(
+            $initialContext = \array_merge(
                 $initialContext,
                 $attributeMetadata->getNormalizationContextForGroups(
-                    is_array($initialContext['groups']) ? $initialContext['groups'] : [$initialContext['groups']]
+                    \is_array($initialContext['groups']) ? $initialContext['groups'] : [$initialContext['groups']]
                 )
             );
         }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
index b4e99bb98..55c53c1d9 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\Serializer\Normalizer;
 
-use ArrayObject;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ReadableCollection;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
@@ -26,10 +25,10 @@ class CollectionDocGenNormalizer implements ContextAwareNormalizerInterface, Nor
     use NormalizerAwareTrait;
 
     /**
-     * @param Collection $object
+     * @param Collection  $object
      * @param string|null $format
      *
-     * @return array|ArrayObject|bool|float|int|string|void|null
+     * @return array|\ArrayObject|bool|float|int|string|void|null
      */
     public function normalize($object, $format = null, array $context = [])
     {
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
index 11743796a..a748c4e22 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
@@ -14,8 +14,6 @@ namespace Chill\DocGeneratorBundle\Serializer\Normalizer;
 use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\Common\Collections\ReadableCollection;
-use ReflectionClass;
-use RuntimeException;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
@@ -28,15 +26,6 @@ use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-use function array_filter;
-use function array_key_exists;
-use function array_merge;
-use function get_class;
-use function implode;
-use function in_array;
-use function is_array;
-use function is_object;
-
 class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInterface
 {
     use NormalizerAwareTrait;
@@ -55,27 +44,22 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
         $classMetadataKey = $object ?? $context['docgen:expects'] ?? null;
 
         if (null === $classMetadataKey) {
-            throw new RuntimeException('Could not determine the metadata for this object. Either provide a non-null object, or a "docgen:expects" key in the context');
+            throw new \RuntimeException('Could not determine the metadata for this object. Either provide a non-null object, or a "docgen:expects" key in the context');
         }
 
         if (!$this->classMetadataFactory->hasMetadataFor($classMetadataKey)) {
-            throw new LogicException(sprintf(
-                'This object does not have metadata: %s. Add groups on this entity to allow to serialize with the format %s and groups %s',
-                is_object($object) ? $object::class : '(todo' /*$context['docgen:expects'],*/ ,
-                $format,
-                implode(', ', ($context['groups'] ?? []))
-            ));
+            throw new LogicException(sprintf('This object does not have metadata: %s. Add groups on this entity to allow to serialize with the format %s and groups %s', \is_object($object) ? $object::class : '(todo' /* $context['docgen:expects'], */ , $format, \implode(', ', $context['groups'] ?? [])));
         }
 
         $metadata = $this->classMetadataFactory->getMetadataFor($classMetadataKey);
-        $expectedGroups = array_key_exists(AbstractNormalizer::GROUPS, $context) ?
-            is_array($context[AbstractNormalizer::GROUPS]) ? $context[AbstractNormalizer::GROUPS] : [$context[AbstractNormalizer::GROUPS]]
+        $expectedGroups = \array_key_exists(AbstractNormalizer::GROUPS, $context) ?
+            \is_array($context[AbstractNormalizer::GROUPS]) ? $context[AbstractNormalizer::GROUPS] : [$context[AbstractNormalizer::GROUPS]]
             : [];
-        $attributes = array_filter(
+        $attributes = \array_filter(
             $metadata->getAttributesMetadata(),
             static function (AttributeMetadata $a) use ($expectedGroups) {
                 foreach ($a->getGroups() as $g) {
-                    if (in_array($g, $expectedGroups, true)) {
+                    if (\in_array($g, $expectedGroups, true)) {
                         return true;
                     }
                 }
@@ -93,10 +77,10 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
 
     public function supportsNormalization($data, $format = null): bool
     {
-        return 'docgen' === $format && (is_object($data) || null === $data);
+        return 'docgen' === $format && (\is_object($data) || null === $data);
     }
 
-    private function getExpectedType(AttributeMetadata $attribute, ReflectionClass $reflection): string
+    private function getExpectedType(AttributeMetadata $attribute, \ReflectionClass $reflection): string
     {
         $type = null;
 
@@ -104,48 +88,32 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
             // we have to get the expected content
             if ($reflection->hasProperty($attribute->getName())) {
                 if (!$reflection->getProperty($attribute->getName())->hasType()) {
-                    throw new \LogicException(sprintf(
-                        'Could not determine how the content is determined for the attribute %s on class %s. Add a type on this property',
-                        $attribute->getName(),
-                        $reflection->getName()
-                    ));
+                    throw new \LogicException(sprintf('Could not determine how the content is determined for the attribute %s on class %s. Add a type on this property', $attribute->getName(), $reflection->getName()));
                 }
 
                 $type = $reflection->getProperty($attribute->getName())->getType();
-            } elseif ($reflection->hasMethod($method = 'get' . ucfirst($attribute->getName()))) {
+            } elseif ($reflection->hasMethod($method = 'get'.ucfirst($attribute->getName()))) {
                 if (!$reflection->getMethod($method)->hasReturnType()) {
-                    throw new \LogicException(sprintf(
-                        'Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method',
-                        $attribute->getName(),
-                        $reflection->getName()
-                    ));
+                    throw new \LogicException(sprintf('Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method', $attribute->getName(), $reflection->getName()));
                 }
 
                 $type = $reflection->getMethod($method)->getReturnType();
-            } elseif ($reflection->hasMethod($method = 'is' . ucfirst($attribute->getName()))) {
+            } elseif ($reflection->hasMethod($method = 'is'.ucfirst($attribute->getName()))) {
                 if (!$reflection->getMethod($method)->hasReturnType()) {
-                    throw new \LogicException(sprintf(
-                        'Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method',
-                        $attribute->getName(),
-                        $reflection->getName()
-                    ));
+                    throw new \LogicException(sprintf('Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method', $attribute->getName(), $reflection->getName()));
                 }
 
                 $type = $reflection->getMethod($method)->getReturnType();
             } elseif ($reflection->hasMethod($attribute->getName())) {
                 if (!$reflection->getMethod($attribute->getName())->hasReturnType()) {
-                    throw new \LogicException(sprintf(
-                        'Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method',
-                        $attribute->getName(),
-                        $reflection->getName()
-                    ));
+                    throw new \LogicException(sprintf('Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method', $attribute->getName(), $reflection->getName()));
                 }
 
                 $type = $reflection->getMethod($attribute->getName())->getReturnType();
             } else {
                 $reflection = $reflection->getParentClass();
             }
-        } while (null === $type && $reflection instanceof ReflectionClass);
+        } while (null === $type && $reflection instanceof \ReflectionClass);
 
         if ($type instanceof \ReflectionNamedType) {
             return $type->getName();
@@ -156,22 +124,19 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
                     return ReadableCollection::class;
                 }
 
-                $class = new ReflectionClass($classString);
+                $class = new \ReflectionClass($classString);
 
                 if ($class->implementsInterface(ReadableCollection::class)) {
                     return ReadableCollection::class;
                 }
             }
 
-            throw new \LogicException(sprintf("The automatic normalization of intersection types is not supported, unless a %s is contained in the intersected types", ReadableCollection::class));
+            throw new \LogicException(sprintf('The automatic normalization of intersection types is not supported, unless a %s is contained in the intersected types', ReadableCollection::class));
         } elseif (null === $type ?? null) {
-            throw new \LogicException(sprintf(
-                'Could not determine the type for this attribute: %s. Add a return type to the method or property declaration',
-                $attribute->getName()
-            ));
+            throw new \LogicException(sprintf('Could not determine the type for this attribute: %s. Add a return type to the method or property declaration', $attribute->getName()));
         }
 
-        throw new \LogicException(sprintf("The automatic normalization of %s is not supported", $type::class));
+        throw new \LogicException(sprintf('The automatic normalization of %s is not supported', $type::class));
     }
 
     /**
@@ -211,13 +176,13 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
         return $normalizer->normalize($keys, $format, $context, $metadata);
     }
 
-    private function normalizeNullOutputValue(mixed $format, array $context, AttributeMetadata $attribute, ReflectionClass $reflection)
+    private function normalizeNullOutputValue(mixed $format, array $context, AttributeMetadata $attribute, \ReflectionClass $reflection)
     {
         $type = $this->getExpectedType($attribute, $reflection);
 
         switch ($type) {
             case 'array':
-                if (in_array('is-translatable', $attribute->getNormalizationContextForGroups(['docgen:read']), true)) {
+                if (\in_array('is-translatable', $attribute->getNormalizationContextForGroups(['docgen:read']), true)) {
                     return '';
                 }
 
@@ -237,7 +202,7 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
                 return $this->normalizer->normalize(
                     null,
                     $format,
-                    array_merge(
+                    \array_merge(
                         $context,
                         ['docgen:expects' => $type]
                     )
@@ -246,13 +211,11 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
     }
 
     /**
-     * @param $object
-     * @param $format
      * @param array|AttributeMetadata[] $attributes
      *
-     * @throws ExceptionInterface
-     *
      * @return array
+     *
+     * @throws ExceptionInterface
      */
     private function normalizeObject($object, $format, array $context, array $expectedGroups, ClassMetadata $metadata, array $attributes)
     {
@@ -269,10 +232,10 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
             /** @var AttributeMetadata $attribute */
             $value = $this->propertyAccess->getValue($object, $attribute->getName());
             $key = $attribute->getSerializedName() ?? $attribute->getName();
-            $objectContext = array_merge(
+            $objectContext = \array_merge(
                 $context,
                 $attribute->getNormalizationContextForGroups(
-                    is_array($context['groups']) ? $context['groups'] : [$context['groups']]
+                    \is_array($context['groups']) ? $context['groups'] : [$context['groups']]
                 )
             );
             $isTranslatable = $objectContext['is-translatable'] ?? false;
@@ -284,7 +247,7 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
                 // when normalizing collection, we should not preserve keys (to ensure that the result is a list)
                 // this is why we make call to the normalizer again to use the CollectionDocGenNormalizer
                 $data[$key] =
-                    $this->normalizer->normalize($value, $format, array_merge(
+                    $this->normalizer->normalize($value, $format, \array_merge(
                         $objectContext,
                         $attribute->getNormalizationContextForGroups($expectedGroups)
                     ));
@@ -293,15 +256,15 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
 
                 foreach ($value as $k => $v) {
                     $arr[$k] =
-                        $this->normalizer->normalize($v, $format, array_merge(
+                        $this->normalizer->normalize($v, $format, \array_merge(
                             $objectContext,
                             $attribute->getNormalizationContextForGroups($expectedGroups)
                         ));
                 }
                 $data[$key] = $arr;
-            } elseif (is_object($value)) {
+            } elseif (\is_object($value)) {
                 $data[$key] =
-                    $this->normalizer->normalize($value, $format, array_merge(
+                    $this->normalizer->normalize($value, $format, \array_merge(
                         $objectContext,
                         $attribute->getNormalizationContextForGroups($expectedGroups)
                     ));
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php b/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php
index ea66f4b59..1eada4e52 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php
@@ -13,15 +13,13 @@ namespace Chill\DocGeneratorBundle\Service\Context;
 
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class BaseContextData
 {
     public function __construct(private readonly NormalizerInterface $normalizer) {}
 
-    public function getData(?User $user = null): array
+    public function getData(User $user = null): array
     {
         $data = [];
 
@@ -30,11 +28,11 @@ class BaseContextData
             'docgen',
             ['docgen:expects' => User::class, 'groups' => ['docgen:read']]
         );
-        $data['createdAt'] = $this->normalizer->normalize(new DateTimeImmutable(), 'docgen', [
-            'docgen:expects' => DateTimeImmutable::class, 'groups' => ['docgen:read'],
+        $data['createdAt'] = $this->normalizer->normalize(new \DateTimeImmutable(), 'docgen', [
+            'docgen:expects' => \DateTimeImmutable::class, 'groups' => ['docgen:read'],
         ]);
-        $data['createdAtDate'] = $this->normalizer->normalize(new DateTimeImmutable('today'), 'docgen', [
-            'docgen:expects' => DateTimeImmutable::class, 'groups' => ['docgen:read'],
+        $data['createdAtDate'] = $this->normalizer->normalize(new \DateTimeImmutable('today'), 'docgen', [
+            'docgen:expects' => \DateTimeImmutable::class, 'groups' => ['docgen:read'],
         ]);
         $data['location'] = $this->normalizer->normalize(
             $user instanceof User ? $user->getCurrentLocation() : null,
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
index 13ee8a1bc..4918223f5 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
@@ -32,19 +32,22 @@ class Generator implements GeneratorInterface
     /**
      * @template T of File|null
      * @template B of bool
-     * @param B $isTest
+     *
+     * @param B                      $isTest
      * @param (B is true ? T : null) $testFile
+     *
      * @psalm-return (B is true ? string : null)
+     *
      * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface|\Throwable
      */
     public function generateDocFromTemplate(
         DocGeneratorTemplate $template,
-        int                  $entityId,
-        array                $contextGenerationDataNormalized,
-        ?StoredObject        $destinationStoredObject = null,
-        bool                 $isTest = false,
-        ?File                $testFile = null,
-        ?User                $creator = null
+        int $entityId,
+        array $contextGenerationDataNormalized,
+        StoredObject $destinationStoredObject = null,
+        bool $isTest = false,
+        File $testFile = null,
+        User $creator = null
     ): ?string {
         if ($destinationStoredObject instanceof StoredObject && StoredObject::STATUS_PENDING !== $destinationStoredObject->getStatus()) {
             $this->logger->info(self::LOG_PREFIX.'Aborting generation of an already generated document');
@@ -53,7 +56,7 @@ class Generator implements GeneratorInterface
 
         $this->logger->info(self::LOG_PREFIX.'Starting generation of a document', [
             'entity_id' => $entityId,
-            'destination_stored_object' => $destinationStoredObject === null ? null : $destinationStoredObject->getId()
+            'destination_stored_object' => null === $destinationStoredObject ? null : $destinationStoredObject->getId(),
         ]);
 
         $context = $this->contextManager->getContextByDocGeneratorTemplate($template);
@@ -107,12 +110,13 @@ class Generator implements GeneratorInterface
             $this->logger->info(self::LOG_PREFIX.'Finished generation of a document', [
                 'is_test' => true,
                 'entity_id' => $entityId,
-                'destination_stored_object' => $destinationStoredObject === null ? null : $destinationStoredObject->getId()
+                'destination_stored_object' => null === $destinationStoredObject ? null : $destinationStoredObject->getId(),
             ]);
+
             return $generatedResource;
         }
 
-        /** @var StoredObject $destinationStoredObject */
+        /* @var StoredObject $destinationStoredObject */
         $destinationStoredObject
             ->setType($template->getFile()->getType())
             ->setFilename(sprintf('%s_odt', uniqid('doc_', true)))
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
index abed586af..2c91942bc 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
@@ -11,15 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
-use RuntimeException;
-use Throwable;
-
-class GeneratorException extends RuntimeException
+class GeneratorException extends \RuntimeException
 {
     /**
      * @param string[] $errors
      */
-    public function __construct(private readonly array $errors = [], ?Throwable $previous = null)
+    public function __construct(private readonly array $errors = [], \Throwable $previous = null)
     {
         parent::__construct(
             'Could not generate the document',
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
index dcef8f99d..64d99f801 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
@@ -21,18 +21,21 @@ interface GeneratorInterface
     /**
      * @template T of File|null
      * @template B of bool
-     * @param B $isTest
+     *
+     * @param B                      $isTest
      * @param (B is true ? T : null) $testFile
+     *
      * @psalm-return (B is true ? string : null)
+     *
      * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface|\Throwable
      */
     public function generateDocFromTemplate(
         DocGeneratorTemplate $template,
-        int                  $entityId,
-        array                $contextGenerationDataNormalized,
-        ?StoredObject        $destinationStoredObject = null,
-        bool                 $isTest = false,
-        ?File                $testFile = null,
-        ?User                $creator = null
+        int $entityId,
+        array $contextGenerationDataNormalized,
+        StoredObject $destinationStoredObject = null,
+        bool $isTest = false,
+        File $testFile = null,
+        User $creator = null
     ): ?string;
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
index 15db2eed4..fc955362e 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
-use RuntimeException;
-
-class ObjectReadyException extends RuntimeException
+class ObjectReadyException extends \RuntimeException
 {
     public function __construct()
     {
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
index 0453975b2..a252755ea 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
@@ -11,11 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
-use RuntimeException;
-
-class RelatedEntityNotFoundException extends RuntimeException
+class RelatedEntityNotFoundException extends \RuntimeException
 {
-    public function __construct(string $relatedEntityClass, int $relatedEntityId, ?\Throwable $previous = null)
+    public function __construct(string $relatedEntityClass, int $relatedEntityId, \Throwable $previous = null)
     {
         parent::__construct(
             sprintf('Related entity not found: %s, %s', $relatedEntityClass, $relatedEntityId),
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
index 01169eeaf..54889f518 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
@@ -30,11 +30,10 @@ final readonly class OnGenerationFails implements EventSubscriberInterface
 
     public function __construct(private DocGeneratorTemplateRepository $docGeneratorTemplateRepository, private EntityManagerInterface $entityManager, private LoggerInterface $logger, private MailerInterface $mailer, private StoredObjectRepository $storedObjectRepository, private TranslatorInterface $translator, private UserRepositoryInterface $userRepository) {}
 
-
     public static function getSubscribedEvents()
     {
         return [
-            WorkerMessageFailedEvent::class => 'onMessageFailed'
+            WorkerMessageFailedEvent::class => 'onMessageFailed',
         ];
     }
 
@@ -82,11 +81,13 @@ final readonly class OnGenerationFails implements EventSubscriberInterface
 
         if (null === $creator = $this->userRepository->find($creatorId)) {
             $this->logger->error(self::LOG_PREFIX.'Creator not found with given id', ['creator_id', $creatorId]);
+
             return;
         }
 
         if (null === $creator->getEmail() || '' === $creator->getEmail()) {
             $this->logger->info(self::LOG_PREFIX.'Creator does not have any email', ['user' => $creator->getUsernameCanonical()]);
+
             return;
         }
 
@@ -104,6 +105,7 @@ final readonly class OnGenerationFails implements EventSubscriberInterface
 
         if (null === $template = $this->docGeneratorTemplateRepository->find($message->getTemplateId())) {
             $this->logger->info(self::LOG_PREFIX.'Template not found', ['template_id' => $message->getTemplateId()]);
+
             return;
         }
 
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
index 7bd65d4eb..f6723c617 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
@@ -22,7 +22,7 @@ use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 
 /**
- * Handle the request of document generation
+ * Handle the request of document generation.
  */
 class RequestGenerationHandler implements MessageHandlerInterface
 {
@@ -35,11 +35,11 @@ class RequestGenerationHandler implements MessageHandlerInterface
     public function __invoke(RequestGenerationMessage $message)
     {
         if (null === $template = $this->docGeneratorTemplateRepository->find($message->getTemplateId())) {
-            throw new \RuntimeException('template not found: ' . $message->getTemplateId());
+            throw new \RuntimeException('template not found: '.$message->getTemplateId());
         }
 
         if (null === $destinationStoredObject = $this->storedObjectRepository->find($message->getDestinationStoredObjectId())) {
-            throw new \RuntimeException('destination stored object not found : ' . $message->getDestinationStoredObjectId());
+            throw new \RuntimeException('destination stored object not found : '.$message->getDestinationStoredObjectId());
         }
 
         if ($destinationStoredObject->getGenerationTrialsCounter() >= self::AUTHORIZED_TRIALS) {
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php
index ad0c35ab1..a5aa1e9e9 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DocGenEncoderTest extends TestCase
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/CollectionDocGenNormalizerTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/CollectionDocGenNormalizerTest.php
index 7bfddadca..610135b04 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/CollectionDocGenNormalizerTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/CollectionDocGenNormalizerTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class CollectionDocGenNormalizerTest extends KernelTestCase
@@ -38,7 +39,7 @@ class CollectionDocGenNormalizerTest extends KernelTestCase
             (object) ['v' => 'baz'],
         ]);
 
-        //filter to get non continuous indexes
+        // filter to get non continuous indexes
         $criteria = new Criteria();
         $criteria->where(Criteria::expr()->neq('v', 'bar'));
 
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
index 444254a1f..a1756b325 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
@@ -24,6 +24,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DocGenObjectNormalizerTest extends KernelTestCase
@@ -238,6 +239,7 @@ class TestableParentClass
 {
     /**
      * @Serializer\Groups("docgen:read")
+     *
      * @Serializer\Context(normalizationContext={"groups": "docgen:read:foo"}, groups={"docgen:read"})
      */
     public ?TestableChildClass $child;
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php
index 427ea5687..7ce52dee0 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php
@@ -15,11 +15,11 @@ use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
 use Chill\MainBundle\Entity\User;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BaseContextDataTest extends KernelTestCase
@@ -56,7 +56,7 @@ final class BaseContextDataTest extends KernelTestCase
     }
 
     private function buildBaseContext(
-        ?NormalizerInterface $normalizer = null
+        NormalizerInterface $normalizer = null
     ): BaseContextData {
         return new BaseContextData(
             $normalizer ?? self::$container->get(NormalizerInterface::class)
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
index ea23d94b5..2272f343e 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
@@ -28,6 +28,7 @@ use Psr\Log\NullLogger;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class GeneratorTest extends TestCase
@@ -71,7 +72,6 @@ class GeneratorTest extends TestCase
         $storedObjectManager->read($templateStoredObject)->willReturn('template');
         $storedObjectManager->write($destinationStoredObject, 'generated')->shouldBeCalled();
 
-
         $generator = new Generator(
             $contextManagerInterface->reveal(),
             $driver->reveal(),
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php b/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
index 96106c745..31c80158e 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
@@ -20,6 +20,7 @@ class AdminController extends AbstractController
 {
     /**
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/document", name="chill_docstore_admin", options={null})
      */
     public function indexAction()
@@ -29,6 +30,7 @@ class AdminController extends AbstractController
 
     /**
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/document_redirect_to_main", name="chill_docstore_admin_redirect_to_admin_index", options={null})
      */
     public function redirectToAdminIndexAction()
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
index efe371337..44feb5a47 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
@@ -13,12 +13,9 @@ namespace Chill\DocStoreBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Chill\DocStoreBundle\Form\AccompanyingCourseDocumentType;
-use Chill\DocStoreBundle\Repository\AccompanyingCourseDocumentRepository;
 use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
-use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTime;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -85,7 +82,7 @@ class DocumentAccompanyingCourseController extends AbstractController
         $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::UPDATE, $document);
 
         $document->setUser($this->getUser());
-        $document->setDate(new DateTime('Now'));
+        $document->setDate(new \DateTime('Now'));
 
         $form = $this->createForm(
             AccompanyingCourseDocumentType::class,
@@ -130,7 +127,7 @@ class DocumentAccompanyingCourseController extends AbstractController
         $document = new AccompanyingCourseDocument();
         $document->setUser($this->getUser());
         $document->setCourse($course);
-        $document->setDate(new DateTime('Now'));
+        $document->setDate(new \DateTime('Now'));
 
         $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::CREATE, $document);
 
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
index 56cd71f43..fc58dff18 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
@@ -37,7 +37,7 @@ class DocumentCategoryController extends AbstractController
                 ['bundleId' => $bundleId, 'idInsideBundle' => $idInsideBundle]
             );
 
-        if ($this->isCsrfTokenValid('delete' . $bundleId . $idInsideBundle, $request->request->get('_token'))) {
+        if ($this->isCsrfTokenValid('delete'.$bundleId.$idInsideBundle, $request->request->get('_token'))) {
             $em->remove($documentCategory);
             $em->flush();
         }
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
index ffac4e103..73fffa1c4 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
@@ -13,14 +13,11 @@ namespace Chill\DocStoreBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Form\PersonDocumentType;
-use Chill\DocStoreBundle\Repository\PersonDocumentACLAwareRepositoryInterface;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
-use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use DateTime;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -92,7 +89,7 @@ class DocumentPersonController extends AbstractController
         $this->denyAccessUnlessGranted('CHILL_PERSON_DOCUMENT_UPDATE', $document);
 
         $document->setUser($this->getUser());
-        $document->setDate(new DateTime('Now'));
+        $document->setDate(new \DateTime('Now'));
 
         $form = $this->createForm(
             PersonDocumentType::class,
@@ -156,7 +153,7 @@ class DocumentPersonController extends AbstractController
         $document = new PersonDocument();
         $document->setUser($this->getUser());
         $document->setPerson($person);
-        $document->setDate(new DateTime('Now'));
+        $document->setDate(new \DateTime('Now'));
 
         $form = $this->createForm(PersonDocumentType::class, $document, [
             'role' => 'CHILL_PERSON_DOCUMENT_CREATE',
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php
index e11bbe344..e615c3b00 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php
@@ -16,12 +16,10 @@ use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Symfony\Bundle\TwigBundle\TwigEngine;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 
 final readonly class GenericDocForAccompanyingPeriodController
 {
@@ -41,7 +39,7 @@ final readonly class GenericDocForAccompanyingPeriodController
     public function list(AccompanyingPeriod $accompanyingPeriod): Response
     {
         if (!$this->security->isGranted(AccompanyingCourseDocumentVoter::SEE, $accompanyingPeriod)) {
-            throw new AccessDeniedHttpException("not allowed to see the documents for accompanying period");
+            throw new AccessDeniedHttpException('not allowed to see the documents for accompanying period');
         }
 
         $filterBuilder = $this->filterOrderHelperFactory
@@ -51,7 +49,7 @@ final readonly class GenericDocForAccompanyingPeriodController
 
         if ([] !== $places = $this->manager->placesForAccompanyingPeriod($accompanyingPeriod)) {
             $filterBuilder->addCheckbox('places', $places, [], array_map(
-                static fn (string $k) => 'generic_doc.filter.keys.' . $k,
+                static fn (string $k) => 'generic_doc.filter.keys.'.$k,
                 $places
             ));
         }
@@ -59,7 +57,7 @@ final readonly class GenericDocForAccompanyingPeriodController
         $filter = $filterBuilder
             ->build();
 
-        ['to' => $endDate, 'from' => $startDate ] = $filter->getDateRangeData('dateRange');
+        ['to' => $endDate, 'from' => $startDate] = $filter->getDateRangeData('dateRange');
         $content = $filter->getQueryString();
 
         $nb = $this->manager->countDocForAccompanyingPeriod(
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php
index 82db78350..f6fecae04 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php
@@ -20,7 +20,6 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 
 final readonly class GenericDocForPerson
 {
@@ -40,7 +39,7 @@ final readonly class GenericDocForPerson
     public function list(Person $person): Response
     {
         if (!$this->security->isGranted(PersonDocumentVoter::SEE, $person)) {
-            throw new AccessDeniedHttpException("not allowed to see the documents for person");
+            throw new AccessDeniedHttpException('not allowed to see the documents for person');
         }
 
         $filterBuilder = $this->filterOrderHelperFactory
@@ -50,7 +49,7 @@ final readonly class GenericDocForPerson
 
         if ([] !== $places = $this->manager->placesForPerson($person)) {
             $filterBuilder->addCheckbox('places', $places, [], array_map(
-                static fn (string $k) => 'generic_doc.filter.keys.' . $k,
+                static fn (string $k) => 'generic_doc.filter.keys.'.$k,
                 $places
             ));
         }
@@ -58,7 +57,7 @@ final readonly class GenericDocForPerson
         $filter = $filterBuilder
             ->build();
 
-        ['to' => $endDate, 'from' => $startDate ] = $filter->getDateRangeData('dateRange');
+        ['to' => $endDate, 'from' => $startDate] = $filter->getDateRangeData('dateRange');
         $content = $filter->getQueryString();
 
         $nb = $this->manager->countDocForPerson(
diff --git a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
index d52926626..1217c2a12 100644
--- a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
+++ b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
@@ -19,8 +19,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function in_array;
-
 /**
  * Adding acl for person document.
  */
@@ -40,10 +38,10 @@ class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface
             foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
                 printf("processing scope %s \n", $scope->getName()['en']);
-                //create permission group
+                // create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
-                        if ($scope->getName()['en'] === 'administrative') {
+                        if ('administrative' === $scope->getName()['en']) {
                             printf("denying power on administrative \n");
 
                             break 2; // we do not want any power on administrative
@@ -53,7 +51,7 @@ class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface
 
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
+                        if (\in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             printf("denying power on %s\n", $scope->getName()['en']);
 
                             break 2; // we do not want any power on social or administrative
@@ -64,7 +62,7 @@ class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface
 
                 printf(
                     'Adding Person report acl to %s '
-                        . "permission group, scope '%s' \n",
+                        ."permission group, scope '%s' \n",
                     $permissionsGroup->getName(),
                     $scope->getName()['en']
                 );
diff --git a/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php b/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
index 8651e0352..f57e675dd 100644
--- a/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
+++ b/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
@@ -32,7 +32,7 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/media.yaml');
         $loader->load('services/controller.yaml');
@@ -89,7 +89,7 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
 
     protected function prependRoute(ContainerBuilder $container)
     {
-        //declare routes for task bundle
+        // declare routes for task bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php b/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php
index 9da172b13..0fe1231a7 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php
@@ -18,19 +18,23 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_doc.accompanyingcourse_document")
  */
 class AccompanyingCourseDocument extends Document implements HasScopesInterface, HasCentersInterface
 {
     /**
      * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class)
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private ?AccompanyingPeriod $course = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -65,5 +69,4 @@ class AccompanyingCourseDocument extends Document implements HasScopesInterface,
 
         return $this;
     }
-
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/Document.php b/src/Bundle/ChillDocStoreBundle/Entity/Document.php
index 58adfe17a..786939a41 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/Document.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/Document.php
@@ -16,8 +16,6 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
-use Chill\MainBundle\Entity\User;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 
@@ -32,7 +30,9 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\DocStoreBundle\Entity\DocumentCategory")
+     *
      * @ORM\JoinColumns({
+     *
      *     @ORM\JoinColumn(name="category_bundle_id", referencedColumnName="bundle_id"),
      *     @ORM\JoinColumn(name="category_id_inside_bundle", referencedColumnName="id_inside_bundle")
      * })
@@ -54,7 +54,9 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
      *     targetEntity="Chill\DocStoreBundle\Entity\StoredObject",
      *     cascade={"persist"}
      * )
+     *
      * @Assert\Valid
+     *
      * @Assert\NotNull(
      *     message="Upload a document"
      * )
@@ -68,6 +70,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Assert\Length(
      *     min=2, max=250
      * )
@@ -84,7 +87,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
         return $this->category;
     }
 
-    public function getDate(): ?DateTimeInterface
+    public function getDate(): ?\DateTimeInterface
     {
         return $this->date;
     }
@@ -121,7 +124,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setDate(DateTimeInterface $date): self
+    public function setDate(\DateTimeInterface $date): self
     {
         $this->date = $date;
 
@@ -135,7 +138,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setObject(?StoredObject $object = null)
+    public function setObject(StoredObject $object = null)
     {
         $this->object = $object;
 
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
index 42a0edad9..a6c19584d 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
@@ -15,6 +15,7 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table("chill_doc.document_category")
+ *
  * @ORM\Entity
  */
 class DocumentCategory
@@ -33,11 +34,12 @@ class DocumentCategory
 
     /**
      * @param string $bundleId
-     * @param int $idInsideBundle
+     * @param int    $idInsideBundle
      */
     public function __construct(
         /**
          * @ORM\Id
+         *
          * @ORM\Column(type="string", name="bundle_id")
          *
          * @var string The id of the bundle that has create the category (i.e. 'person', 'activity', ....)
@@ -45,6 +47,7 @@ class DocumentCategory
         private $bundleId,
         /**
          * @ORM\Id
+         *
          * @ORM\Column(type="integer", name="id_inside_bundle")
          *
          * @var int The id which is unique inside the bundle
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
index adc1eb75c..659395034 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
@@ -19,13 +19,16 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table("chill_doc.person_document")
+ *
  * @ORM\Entity
  */
 class PersonDocument extends Document implements HasCenterInterface, HasScopeInterface
 {
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index bf2808c19..2ee60d80a 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -17,8 +17,6 @@ use ChampsLibres\WopiLib\Contract\Entity\Document;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
-use DateTime;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
@@ -28,7 +26,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * Represent a document stored in an object store.
  *
  * @ORM\Entity
+ *
  * @ORM\Table("chill_doc.stored_object")
+ *
  * @AsyncFileExists(
  *     message="The file is not stored properly"
  * )
@@ -36,57 +36,68 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 class StoredObject implements AsyncFileInterface, Document, TrackCreationInterface
 {
     use TrackCreationTrait;
-    final public const STATUS_READY = "ready";
-    final public const STATUS_PENDING = "pending";
-    final public const STATUS_FAILURE = "failure";
+    final public const STATUS_READY = 'ready';
+    final public const STATUS_PENDING = 'pending';
+    final public const STATUS_FAILURE = 'failure';
 
     /**
      * @ORM\Column(type="json", name="datas")
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private array $datas = [];
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private string $filename = '';
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private ?int $id = null;
 
     /**
      * @var int[]
+     *
      * @ORM\Column(type="json", name="iv")
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private array $iv = [];
 
     /**
      * @ORM\Column(type="json", name="key")
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private array $keyInfos = [];
 
     /**
      * @ORM\Column(type="text", name="title")
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private string $title = '';
 
     /**
      * @ORM\Column(type="text", name="type", options={"default": ""})
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private string $type = '';
 
     /**
      * @ORM\Column(type="uuid", unique=true)
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private UuidInterface $uuid;
@@ -111,27 +122,29 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
      */
     public function __construct(/**
      * @ORM\Column(type="text", options={"default": "ready"})
+     *
      * @Serializer\Groups({"read"})
      */
-        private string $status = "ready"
+        private string $status = 'ready'
     ) {
         $this->uuid = Uuid::uuid4();
     }
 
     public function addGenerationTrial(): self
     {
-        $this->generationTrialsCounter++;
+        ++$this->generationTrialsCounter;
 
         return $this;
     }
 
     /**
      * @Serializer\Groups({"read", "write"})
+     *
      * @deprecated
      */
-    public function getCreationDate(): DateTime
+    public function getCreationDate(): \DateTime
     {
-        return DateTime::createFromImmutable($this->createdAt);
+        return \DateTime::createFromImmutable($this->createdAt);
     }
 
     public function getDatas(): array
@@ -165,7 +178,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
     }
 
     /**
-     * @deprecated Use method "getFilename()".
+     * @deprecated use method "getFilename()"
      */
     public function getObjectName()
     {
@@ -202,9 +215,10 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     /**
      * @Serializer\Groups({"write"})
+     *
      * @deprecated
      */
-    public function setCreationDate(DateTime $creationDate): self
+    public function setCreationDate(\DateTime $creationDate): self
     {
         $this->createdAt = \DateTimeImmutable::createFromMutable($creationDate);
 
@@ -276,6 +290,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
     public function setTemplate(?DocGeneratorTemplate $template): StoredObject
     {
         $this->template = $template;
+
         return $this;
     }
 
diff --git a/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php b/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php
index 4836b57ee..68a978e80 100644
--- a/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php
+++ b/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php
@@ -11,12 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\DocStoreBundle\Exception;
 
-use Exception;
-use Throwable;
-
-final class StoredObjectManagerException extends Exception
+final class StoredObjectManagerException extends \Exception
 {
-    public static function errorDuringHttpRequest(Throwable $exception): self
+    public static function errorDuringHttpRequest(\Throwable $exception): self
     {
         return new self('Error during HTTP request.', 500, $exception);
     }
@@ -33,7 +30,7 @@ final class StoredObjectManagerException extends Exception
         return new self(sprintf('Unable to decrypt content (reason: %s).', $message));
     }
 
-    public static function unableToGetResponseContent(Throwable $exception): self
+    public static function unableToGetResponseContent(\Throwable $exception): self
     {
         return new self('Unable to get content from response.', 500, $exception);
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
index 5ed5b5981..0fced39d3 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
@@ -68,7 +68,7 @@ class AccompanyingCourseDocumentType extends AbstractType
                 'error_bubbling' => true,
             ])
             ->add('date', ChillDateType::class)
-            //TODO : adapt to using AccompanyingCourseDocument categories. Currently there are none...
+            // TODO : adapt to using AccompanyingCourseDocument categories. Currently there are none...
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
                 'class' => DocumentCategory::class,
diff --git a/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php b/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
index 51433d38a..77484208f 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
@@ -21,9 +21,6 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-use function json_decode;
-use function json_encode;
-
 /**
  * Form type which allow to join a document.
  */
@@ -90,7 +87,7 @@ class StoredObjectType extends AbstractType
             return null;
         }
 
-        return json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
+        return \json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
     }
 
     public function reverseTransformObject($object)
@@ -115,7 +112,7 @@ class StoredObjectType extends AbstractType
             return null;
         }
 
-        return json_encode($object, JSON_THROW_ON_ERROR);
+        return \json_encode($object, JSON_THROW_ON_ERROR);
     }
 
     public function transformObject($object = null)
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQuery.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQuery.php
index 22c51ccff..80eeaf372 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQuery.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQuery.php
@@ -77,7 +77,7 @@ class FetchQuery implements FetchQueryInterface
     public function removeWhereClause(int $index): void
     {
         if (!array_key_exists($index, $this->wheres)) {
-            throw new \UnexpectedValueException("this index does not exists");
+            throw new \UnexpectedValueException('this index does not exists');
         }
 
         unset($this->wheres[$index], $this->whereParams[$index], $this->whereTypes[$index]);
@@ -86,7 +86,7 @@ class FetchQuery implements FetchQueryInterface
     public function removeJoinClause(int $index): void
     {
         if (!array_key_exists($index, $this->joins)) {
-            throw new \UnexpectedValueException("this index does not exists");
+            throw new \UnexpectedValueException('this index does not exists');
         }
 
         unset($this->joins[$index], $this->joinParams[$index], $this->joinTypes[$index]);
@@ -102,9 +102,6 @@ class FetchQuery implements FetchQueryInterface
         return $this->selectIdentifierJsonB;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getSelectIdentifierParams(): array
     {
         return $this->selectIdentifierParams;
@@ -125,9 +122,6 @@ class FetchQuery implements FetchQueryInterface
         return $this->selectDateTypes;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getSelectDateParams(): array
     {
         return $this->selectDateParams;
@@ -135,12 +129,9 @@ class FetchQuery implements FetchQueryInterface
 
     public function getFromQuery(): string
     {
-        return $this->from . " " . implode(' ', $this->joins);
+        return $this->from.' '.implode(' ', $this->joins);
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getFromQueryParams(): array
     {
         $result = [];
@@ -168,9 +159,6 @@ class FetchQuery implements FetchQueryInterface
         return implode(' AND ', $this->wheres);
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getWhereQueryParams(): array
     {
         $result = [];
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQueryToSqlBuilder.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQueryToSqlBuilder.php
index dad645ff9..174a5014d 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQueryToSqlBuilder.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQueryToSqlBuilder.php
@@ -34,14 +34,14 @@ final readonly class FetchQueryToSqlBuilder
             '{{ identifiers }}' => $query->getSelectIdentifierJsonB(),
             '{{ date }}' => $query->getSelectDate(),
             '{{ from }}' => $query->getFromQuery(),
-            '{{ where }}' => '' === ($w = $query->getWhereQuery()) ? '' : 'WHERE ' . $w,
+            '{{ where }}' => '' === ($w = $query->getWhereQuery()) ? '' : 'WHERE '.$w,
         ]);
 
         $params = [
             ...$query->getSelectIdentifierParams(),
             ...$query->getSelectDateParams(),
             ...$query->getFromQueryParams(),
-            ...$query->getWhereQueryParams()
+            ...$query->getWhereQueryParams(),
         ];
 
         $types = [
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForAccompanyingPeriodProviderInterface.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForAccompanyingPeriodProviderInterface.php
index bffa19b53..9ceec5438 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForAccompanyingPeriodProviderInterface.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForAccompanyingPeriodProviderInterface.php
@@ -17,10 +17,10 @@ interface GenericDocForAccompanyingPeriodProviderInterface
 {
     public function buildFetchQueryForAccompanyingPeriod(
         AccompanyingPeriod $accompanyingPeriod,
-        ?\DateTimeImmutable $startDate = null,
-        ?\DateTimeImmutable $endDate = null,
-        ?string $content = null,
-        ?string $origin = null
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
+        string $origin = null
     ): FetchQueryInterface;
 
     /**
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForPersonProviderInterface.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForPersonProviderInterface.php
index 027afe834..815459f20 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForPersonProviderInterface.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForPersonProviderInterface.php
@@ -12,16 +12,15 @@ declare(strict_types=1);
 namespace Chill\DocStoreBundle\GenericDoc;
 
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 
 interface GenericDocForPersonProviderInterface
 {
     public function buildFetchQueryForPerson(
-        Person             $person,
-        ?DateTimeImmutable $startDate = null,
-        ?DateTimeImmutable $endDate = null,
-        ?string            $content = null,
-        ?string            $origin = null
+        Person $person,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
+        string $origin = null
     ): FetchQueryInterface;
 
     /**
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Manager.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Manager.php
index 1bbcf4092..bfeddc8dc 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/Manager.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Manager.php
@@ -38,13 +38,14 @@ final readonly class Manager
 
     /**
      * @param list<string> $places
+     *
      * @throws Exception
      */
     public function countDocForAccompanyingPeriod(
         AccompanyingPeriod $accompanyingPeriod,
-        ?\DateTimeImmutable $startDate = null,
-        ?\DateTimeImmutable $endDate = null,
-        ?string $content = null,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
         array $places = []
     ): int {
         ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($accompanyingPeriod, $startDate, $endDate, $content, $places);
@@ -54,7 +55,7 @@ final readonly class Manager
 
     private function countDoc(string $sql, array $params, array $types): int
     {
-        if ($sql === '') {
+        if ('' === $sql) {
             return 0;
         }
 
@@ -64,7 +65,7 @@ final readonly class Manager
         $number = $result->fetchOne();
 
         if (false === $number) {
-            throw new \UnexpectedValueException("number of documents failed to load");
+            throw new \UnexpectedValueException('number of documents failed to load');
         }
 
         return $number;
@@ -72,9 +73,9 @@ final readonly class Manager
 
     public function countDocForPerson(
         Person $person,
-        ?\DateTimeImmutable $startDate = null,
-        ?\DateTimeImmutable $endDate = null,
-        ?string $content = null,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
         array $places = []
     ): int {
         ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($person, $startDate, $endDate, $content, $places);
@@ -84,16 +85,18 @@ final readonly class Manager
 
     /**
      * @param list<string> $places places to search. When empty, search in all places
+     *
      * @return iterable<GenericDocDTO>
+     *
      * @throws Exception
      */
     public function findDocForAccompanyingPeriod(
         AccompanyingPeriod $accompanyingPeriod,
         int $offset = 0,
         int $limit = 20,
-        ?\DateTimeImmutable $startDate = null,
-        ?\DateTimeImmutable $endDate = null,
-        ?string $content = null,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
         array $places = []
     ): iterable {
         ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($accompanyingPeriod, $startDate, $endDate, $content, $places);
@@ -107,7 +110,7 @@ final readonly class Manager
      */
     private function findDocs(AccompanyingPeriod|Person $linked, string $sql, array $params, array $types, int $offset, int $limit): iterable
     {
-        if ($sql === '') {
+        if ('' === $sql) {
             return [];
         }
 
@@ -127,15 +130,16 @@ final readonly class Manager
 
     /**
      * @param list<string> $places places to search. When empty, search in all places
+     *
      * @return iterable<GenericDocDTO>
      */
     public function findDocForPerson(
         Person $person,
         int $offset = 0,
         int $limit = 20,
-        ?\DateTimeImmutable $startDate = null,
-        ?\DateTimeImmutable $endDate = null,
-        ?string $content = null,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
         array $places = []
     ): iterable {
         ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($person, $startDate, $endDate, $content, $places);
@@ -159,7 +163,7 @@ final readonly class Manager
 
     private function places(string $sql, array $params, array $types): array
     {
-        if ($sql === '') {
+        if ('' === $sql) {
             return [];
         }
 
@@ -179,9 +183,9 @@ final readonly class Manager
      */
     private function buildUnionQuery(
         AccompanyingPeriod|Person $linked,
-        ?\DateTimeImmutable $startDate = null,
-        ?\DateTimeImmutable $endDate = null,
-        ?string $content = null,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
         array $places = [],
     ): array {
         $queries = [];
@@ -210,7 +214,7 @@ final readonly class Manager
                 continue;
             }
 
-            ['sql' => $q, 'params' => $p, 'types' => $t ] = $this->builder->toSql($query);
+            ['sql' => $q, 'params' => $p, 'types' => $t] = $this->builder->toSql($query);
 
             $sql[] = $q;
             $params = [...$params, ...$p];
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProvider.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProvider.php
index d268636f6..40130e3cc 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProvider.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProvider.php
@@ -20,7 +20,6 @@ use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Security;
@@ -34,7 +33,7 @@ final readonly class AccompanyingCourseDocumentGenericDocProvider implements Gen
         private EntityManagerInterface $entityManager,
     ) {}
 
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
     {
         $classMetadata = $this->entityManager->getClassMetadata(AccompanyingCourseDocument::class);
 
@@ -42,7 +41,7 @@ final readonly class AccompanyingCourseDocumentGenericDocProvider implements Gen
             self::KEY,
             sprintf('jsonb_build_object(\'id\', %s)', $classMetadata->getIdentifierColumnNames()[0]),
             $classMetadata->getColumnName('date'),
-            $classMetadata->getSchemaName() . '.' . $classMetadata->getTableName()
+            $classMetadata->getSchemaName().'.'.$classMetadata->getTableName()
         );
 
         $query->addWhereClause(
@@ -59,7 +58,7 @@ final readonly class AccompanyingCourseDocumentGenericDocProvider implements Gen
         return $this->security->isGranted(AccompanyingCourseDocumentVoter::SEE, $accompanyingPeriod);
     }
 
-    public function buildFetchQueryForPerson(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
     {
         $classMetadata = $this->entityManager->getClassMetadata(AccompanyingCourseDocument::class);
 
@@ -67,7 +66,7 @@ final readonly class AccompanyingCourseDocumentGenericDocProvider implements Gen
             self::KEY,
             sprintf('jsonb_build_object(\'id\', %s)', $classMetadata->getIdentifierColumnNames()[0]),
             $classMetadata->getColumnName('date'),
-            $classMetadata->getSchemaName() . '.' . $classMetadata->getTableName() . ' AS acc_course_document'
+            $classMetadata->getSchemaName().'.'.$classMetadata->getTableName().' AS acc_course_document'
         );
 
         $atLeastOne = false;
@@ -98,7 +97,7 @@ final readonly class AccompanyingCourseDocumentGenericDocProvider implements Gen
             return $query;
         }
 
-        $query->addWhereClause('(' . implode(' OR ', $or) . ')', $orParams, $orTypes);
+        $query->addWhereClause('('.implode(' OR ', $or).')', $orParams, $orTypes);
 
         return $this->addWhereClause($query, $startDate, $endDate, $content);
     }
@@ -108,7 +107,7 @@ final readonly class AccompanyingCourseDocumentGenericDocProvider implements Gen
         return $this->security->isGranted(AccompanyingPeriodVoter::SEE, $person);
     }
 
-    private function addWhereClause(FetchQuery $query, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
+    private function addWhereClause(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
     {
         $classMetadata = $this->entityManager->getClassMetadata(AccompanyingCourseDocument::class);
 
@@ -135,7 +134,7 @@ final readonly class AccompanyingCourseDocumentGenericDocProvider implements Gen
                     $classMetadata->getColumnName('title'),
                     $classMetadata->getColumnName('description')
                 ),
-                ['%' . $content . '%', '%' . $content . '%'],
+                ['%'.$content.'%', '%'.$content.'%'],
                 [Types::STRING, Types::STRING]
             );
         }
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/PersonDocumentGenericDocProvider.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/PersonDocumentGenericDocProvider.php
index 60d247f0c..5f4728297 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/PersonDocumentGenericDocProvider.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/PersonDocumentGenericDocProvider.php
@@ -18,7 +18,6 @@ use Chill\DocStoreBundle\Repository\PersonDocumentACLAwareRepositoryInterface;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Symfony\Component\Security\Core\Security;
 
 final readonly class PersonDocumentGenericDocProvider implements GenericDocForPersonProviderInterface, GenericDocForAccompanyingPeriodProviderInterface
@@ -32,10 +31,10 @@ final readonly class PersonDocumentGenericDocProvider implements GenericDocForPe
 
     public function buildFetchQueryForPerson(
         Person $person,
-        ?DateTimeImmutable $startDate = null,
-        ?DateTimeImmutable $endDate = null,
-        ?string $content = null,
-        ?string $origin = null
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
+        string $origin = null
     ): FetchQueryInterface {
         return $this->personDocumentACLAwareRepository->buildFetchQueryForPerson(
             $person,
@@ -50,7 +49,7 @@ final readonly class PersonDocumentGenericDocProvider implements GenericDocForPe
         return $this->security->isGranted(PersonDocumentVoter::SEE, $person);
     }
 
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
     {
         return $this->personDocumentACLAwareRepository->buildFetchQueryForAccompanyingPeriod($accompanyingPeriod, $startDate, $endDate, $content);
     }
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Renderer/AccompanyingCourseDocumentGenericDocRenderer.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Renderer/AccompanyingCourseDocumentGenericDocRenderer.php
index 1912c326d..70175ee1b 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/Renderer/AccompanyingCourseDocumentGenericDocRenderer.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Renderer/AccompanyingCourseDocumentGenericDocRenderer.php
@@ -17,7 +17,6 @@ use Chill\DocStoreBundle\GenericDoc\Twig\GenericDocRendererInterface;
 use Chill\DocStoreBundle\GenericDoc\Providers\AccompanyingCourseDocumentGenericDocProvider;
 use Chill\DocStoreBundle\Repository\AccompanyingCourseDocumentRepository;
 use Chill\DocStoreBundle\Repository\PersonDocumentRepository;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 final readonly class AccompanyingCourseDocumentGenericDocRenderer implements GenericDocRendererInterface
 {
@@ -28,8 +27,8 @@ final readonly class AccompanyingCourseDocumentGenericDocRenderer implements Gen
 
     public function supports(GenericDocDTO $genericDocDTO, $options = []): bool
     {
-        return $genericDocDTO->key === AccompanyingCourseDocumentGenericDocProvider::KEY
-            || $genericDocDTO->key === PersonDocumentGenericDocProvider::KEY;
+        return AccompanyingCourseDocumentGenericDocProvider::KEY === $genericDocDTO->key
+            || PersonDocumentGenericDocProvider::KEY === $genericDocDTO->key;
     }
 
     public function getTemplate(GenericDocDTO $genericDocDTO, $options = []): string
@@ -47,6 +46,7 @@ final readonly class AccompanyingCourseDocumentGenericDocRenderer implements Gen
                 'context' => $genericDocDTO->getContext(),
             ];
         }
+
         // this is a person
         return [
             'document' => $doc = $this->personDocumentRepository->find($genericDocDTO->identifiers['id']),
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtension.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtension.php
index 308d85cd7..2420cc424 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtension.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtension.php
@@ -22,7 +22,7 @@ final class GenericDocExtension extends AbstractExtension
             new TwigFilter('chill_generic_doc_render', [GenericDocExtensionRuntime::class, 'renderGenericDoc'], [
                 'needs_environment' => true,
                 'is_safe' => ['html'],
-            ])
+            ]),
         ];
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtensionRuntime.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtensionRuntime.php
index f1a605d77..e64838b41 100644
--- a/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtensionRuntime.php
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtensionRuntime.php
@@ -43,6 +43,6 @@ final readonly class GenericDocExtensionRuntime implements RuntimeExtensionInter
             }
         }
 
-        throw new \LogicException("no renderer found");
+        throw new \LogicException('no renderer found');
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php b/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php
index d82c94c10..485c95078 100644
--- a/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php
+++ b/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php
@@ -15,7 +15,6 @@ use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
-use LogicException;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -28,7 +27,7 @@ final readonly class MenuBuilder implements LocalMenuBuilderInterface
         match ($menuId) {
             'accompanyingCourse' => $this->buildMenuAccompanyingCourse($menu, $parameters),
             'person' => $this->buildMenuPerson($menu, $parameters),
-            default => throw new LogicException("this menuid {$menuId} is not implemented"),
+            default => throw new \LogicException("this menuid {$menuId} is not implemented"),
         };
     }
 
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php
index 2679993c4..6c6e93fd7 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php
@@ -55,7 +55,7 @@ class AccompanyingCourseDocumentRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
index 22aeb24d2..166749f71 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
@@ -28,9 +28,6 @@ class DocumentCategoryRepository implements ObjectRepository
         $this->repository = $em->getRepository(DocumentCategory::class);
     }
 
-    /**
-     * @param mixed $id
-     */
     public function find($id): ?DocumentCategory
     {
         return $this->repository->find($id);
@@ -44,7 +41,7 @@ class DocumentCategoryRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
index bd39ba992..385e8f398 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
@@ -18,14 +18,10 @@ use Chill\DocStoreBundle\GenericDoc\Providers\PersonDocumentGenericDocProvider;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
@@ -51,15 +47,14 @@ final readonly class PersonDocumentACLAwareRepository implements PersonDocumentA
         return $qb;
     }
 
-
-    public function buildFetchQueryForPerson(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface
     {
         $query = $this->buildBaseFetchQueryForPerson($person, $startDate, $endDate, $content);
 
         return $this->addFetchQueryByPersonACL($query, $person);
     }
 
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $period, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface
     {
         $personDocMetadata = $this->em->getClassMetadata(PersonDocument::class);
         $participationMetadata = $this->em->getClassMetadata(AccompanyingPeriodParticipation::class);
@@ -118,7 +113,7 @@ final readonly class PersonDocumentACLAwareRepository implements PersonDocumentA
         return $this->addFilterClauses($query, $startDate, $endDate, $content);
     }
 
-    public function buildBaseFetchQueryForPerson(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
+    public function buildBaseFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
     {
         $personDocMetadata = $this->em->getClassMetadata(PersonDocument::class);
 
@@ -138,7 +133,7 @@ final readonly class PersonDocumentACLAwareRepository implements PersonDocumentA
         return $this->addFilterClauses($query, $startDate, $endDate, $content);
     }
 
-    private function addFilterClauses(FetchQuery $query, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
+    private function addFilterClauses(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
     {
         $personDocMetadata = $this->em->getClassMetadata(PersonDocument::class);
 
@@ -165,10 +160,11 @@ final readonly class PersonDocumentACLAwareRepository implements PersonDocumentA
                     $personDocMetadata->getColumnName('title'),
                     $personDocMetadata->getColumnName('description')
                 ),
-                ['%' . $content . '%', '%' . $content . '%'],
+                ['%'.$content.'%', '%'.$content.'%'],
                 [Types::STRING, Types::STRING]
             );
         }
+
         return $query;
     }
 
@@ -188,7 +184,7 @@ final readonly class PersonDocumentACLAwareRepository implements PersonDocumentA
         $this->addACL($qb, $person);
 
         foreach ($orderBy as $field => $order) {
-            $qb->addOrderBy('d.' . $field, $order);
+            $qb->addOrderBy('d.'.$field, $order);
         }
 
         $qb->setFirstResult($offset)->setMaxResults($limit);
@@ -207,7 +203,7 @@ final readonly class PersonDocumentACLAwareRepository implements PersonDocumentA
                     ->getReachableScopes(
                         PersonDocumentVoter::SEE,
                         $center
-                    )
+                    ),
             ];
         }
 
@@ -230,7 +226,7 @@ final readonly class PersonDocumentACLAwareRepository implements PersonDocumentA
         foreach ($this->centerResolverManager->resolveCenters($person) as $center) {
             $reachableScopes = [
                 ...$reachableScopes,
-                ...$this->authorizationHelperForCurrentUser->getReachableScopes(PersonDocumentVoter::SEE, $center)
+                ...$this->authorizationHelperForCurrentUser->getReachableScopes(PersonDocumentVoter::SEE, $center),
             ];
         }
 
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php
index f1bc70812..4bb55ce50 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php
@@ -29,15 +29,15 @@ interface PersonDocumentACLAwareRepositoryInterface
 
     public function buildFetchQueryForPerson(
         Person $person,
-        ?\DateTimeImmutable $startDate = null,
-        ?\DateTimeImmutable $endDate = null,
-        ?string $content = null
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null
     ): FetchQueryInterface;
 
     public function buildFetchQueryForAccompanyingPeriod(
         AccompanyingPeriod $period,
-        ?\DateTimeImmutable $startDate = null,
-        ?\DateTimeImmutable $endDate = null,
-        ?string $content = null
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null
     ): FetchQueryInterface;
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentRepository.php
index 40afdc220..4dfeb74fe 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentRepository.php
@@ -15,7 +15,6 @@ use Chill\DocStoreBundle\Entity\PersonDocument;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
-use UnexpectedValueException;
 
 /**
  * @template ObjectRepository<PersonDocument::class>
@@ -40,7 +39,7 @@ readonly class PersonDocumentRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php
index d2e715f7e..92644c97d 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php
@@ -44,7 +44,7 @@ final class StoredObjectRepository implements ObjectRepository
      *
      * @return array<int, StoredObject>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
index f04a6dbf8..5febc7e42 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
@@ -23,8 +23,6 @@ use Psr\Log\LoggerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Security;
 
-use function in_array;
-
 class AccompanyingCourseDocumentVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
     final public const CREATE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE';
@@ -96,7 +94,7 @@ class AccompanyingCourseDocumentVoter extends AbstractChillVoter implements Prov
 
             if (
                 AccompanyingPeriod::STEP_CLOSED === $subject->getCourse()->getStep()
-                && in_array($attribute, [self::CREATE, self::DELETE, self::UPDATE], true)
+                && \in_array($attribute, [self::CREATE, self::DELETE, self::UPDATE], true)
             ) {
                 return false;
             }
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
index c1c6b1211..21c08e9fd 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
@@ -76,7 +76,7 @@ class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHiera
     }
 
     /**
-     * @param string $attribute
+     * @param string         $attribute
      * @param PersonDocument $subject
      *
      * @return bool
diff --git a/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php b/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php
index 4627c232d..2c96f7faa 100644
--- a/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php
+++ b/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php
@@ -15,8 +15,6 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\StoredObjectRepository;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
-use function array_key_exists;
-use function is_array;
 
 class StoredObjectDenormalizer implements DenormalizerInterface
 {
@@ -37,11 +35,11 @@ class StoredObjectDenormalizer implements DenormalizerInterface
 
     public function supportsDenormalization($data, $type, $format = null)
     {
-        if (false === is_array($data)) {
+        if (false === \is_array($data)) {
             return false;
         }
 
-        if (false === array_key_exists('id', $data)) {
+        if (false === \array_key_exists('id', $data)) {
             return false;
         }
 
diff --git a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php
index 43c1aa078..34df98fa2 100644
--- a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php
+++ b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php
@@ -15,19 +15,11 @@ use Base64Url\Base64Url;
 use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
-use DateTimeImmutable;
-use DateTimeInterface;
-use DateTimeZone;
-use RuntimeException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
-use Throwable;
-use function array_key_exists;
-use const OPENSSL_RAW_DATA;
 
 final class StoredObjectManager implements StoredObjectManagerInterface
 {
@@ -37,7 +29,7 @@ final class StoredObjectManager implements StoredObjectManagerInterface
 
     public function __construct(private readonly HttpClientInterface $client, private readonly TempUrlGeneratorInterface $tempUrlGenerator) {}
 
-    public function getLastModified(StoredObject $document): DateTimeInterface
+    public function getLastModified(StoredObject $document): \DateTimeInterface
     {
         if ($this->hasCache($document)) {
             $response = $this->getResponseFromCache($document);
@@ -69,7 +61,7 @@ final class StoredObjectManager implements StoredObjectManagerInterface
 
         try {
             $data = $response->getContent();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
             throw StoredObjectManagerException::unableToGetResponseContent($e);
         }
 
@@ -82,7 +74,7 @@ final class StoredObjectManager implements StoredObjectManagerInterface
             self::ALGORITHM,
             // TODO: Why using this library and not use base64_decode() ?
             Base64Url::decode($document->getKeyInfos()['k']),
-            OPENSSL_RAW_DATA,
+            \OPENSSL_RAW_DATA,
             pack('C*', ...$document->getIv())
         );
 
@@ -105,7 +97,7 @@ final class StoredObjectManager implements StoredObjectManagerInterface
                 self::ALGORITHM,
                 // TODO: Why using this library and not use base64_decode() ?
                 Base64Url::decode($document->getKeyInfos()['k']),
-                OPENSSL_RAW_DATA,
+                \OPENSSL_RAW_DATA,
                 pack('C*', ...$document->getIv())
             )
             : $clearContent;
@@ -130,24 +122,23 @@ final class StoredObjectManager implements StoredObjectManagerInterface
             throw StoredObjectManagerException::errorDuringHttpRequest($exception);
         }
 
-        if ($response->getStatusCode() !== Response::HTTP_CREATED) {
+        if (Response::HTTP_CREATED !== $response->getStatusCode()) {
             throw StoredObjectManagerException::invalidStatusCode($response->getStatusCode());
         }
     }
 
-    private function extractLastModifiedFromResponse(ResponseInterface $response): DateTimeImmutable
+    private function extractLastModifiedFromResponse(ResponseInterface $response): \DateTimeImmutable
     {
         $lastModifiedString = (($response->getHeaders()['last-modified'] ?? [])[0] ?? '');
 
-        $date = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::RFC7231,
+        $date = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::RFC7231,
             $lastModifiedString,
-            new DateTimeZone('GMT')
+            new \DateTimeZone('GMT')
         );
 
         if (false === $date) {
-            throw new RuntimeException('the date from remote storage could not be parsed: '
-                . $lastModifiedString);
+            throw new \RuntimeException('the date from remote storage could not be parsed: '.$lastModifiedString);
         }
 
         return $date;
@@ -168,11 +159,11 @@ final class StoredObjectManager implements StoredObjectManagerInterface
                         )
                         ->url
                 );
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
             throw StoredObjectManagerException::errorDuringHttpRequest($e);
         }
 
-        if ($response->getStatusCode() !== Response::HTTP_OK) {
+        if (Response::HTTP_OK !== $response->getStatusCode()) {
             throw StoredObjectManagerException::invalidStatusCode($response->getStatusCode());
         }
 
@@ -190,7 +181,7 @@ final class StoredObjectManager implements StoredObjectManagerInterface
 
     private function hasCache(StoredObject $document): bool
     {
-        return array_key_exists($document->getUuid()->toString(), $this->inMemory);
+        return \array_key_exists($document->getUuid()->toString(), $this->inMemory);
     }
 
     private function hasKeysAndIv(StoredObject $storedObject): bool
diff --git a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php
index caafb3937..cee6586ea 100644
--- a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php
+++ b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php
@@ -12,26 +12,25 @@ declare(strict_types=1);
 namespace Chill\DocStoreBundle\Service;
 
 use Chill\DocStoreBundle\Entity\StoredObject;
-use DateTimeInterface;
 
 interface StoredObjectManagerInterface
 {
-    public function getLastModified(StoredObject $document): DateTimeInterface;
+    public function getLastModified(StoredObject $document): \DateTimeInterface;
 
     /**
      * Get the content of a StoredObject.
      *
-     * @param StoredObject $document The document.
+     * @param StoredObject $document the document
      *
-     * @return string The retrieved content in clear.
+     * @return string the retrieved content in clear
      */
     public function read(StoredObject $document): string;
 
     /**
      * Set the content of a StoredObject.
      *
-     * @param StoredObject $document The document.
-     * @param $clearContent The content to store in clear.
+     * @param StoredObject $document     the document
+     * @param              $clearContent The content to store in clear
      */
     public function write(StoredObject $document, string $clearContent): void;
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
index afd3d2d90..5f7a3c7df 100644
--- a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
+++ b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
@@ -18,8 +18,6 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Twig\Environment;
 use Twig\Extension\RuntimeExtensionInterface;
 
-use function in_array;
-
 final readonly class WopiEditTwigExtensionRuntime implements RuntimeExtensionInterface
 {
     public const SUPPORTED_MIMES = [
@@ -132,7 +130,7 @@ final readonly class WopiEditTwigExtensionRuntime implements RuntimeExtensionInt
      */
     public function isEditable(StoredObject $document): bool
     {
-        return in_array($document->getType(), self::SUPPORTED_MIMES, true);
+        return \in_array($document->getType(), self::SUPPORTED_MIMES, true);
     }
 
     /**
@@ -142,7 +140,7 @@ final readonly class WopiEditTwigExtensionRuntime implements RuntimeExtensionInt
      * @throws \Twig\Error\RuntimeError
      * @throws \Twig\Error\SyntaxError
      */
-    public function renderButtonGroup(Environment $environment, StoredObject $document, ?string $title = null, bool $canEdit = true, array $options = []): string
+    public function renderButtonGroup(Environment $environment, StoredObject $document, string $title = null, bool $canEdit = true, array $options = []): string
     {
         return $environment->render(self::TEMPLATE_BUTTON_GROUP, [
             'document' => $document,
@@ -153,7 +151,7 @@ final readonly class WopiEditTwigExtensionRuntime implements RuntimeExtensionInt
         ]);
     }
 
-    public function renderEditButton(Environment $environment, StoredObject $document, ?array $options = null): string
+    public function renderEditButton(Environment $environment, StoredObject $document, array $options = null): string
     {
         return $environment->render(self::TEMPLATE, [
             'document' => $document,
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/FetchQueryToSqlBuilderTest.php b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/FetchQueryToSqlBuilderTest.php
index f55b889a9..0994e86e0 100644
--- a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/FetchQueryToSqlBuilderTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/FetchQueryToSqlBuilderTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class FetchQueryToSqlBuilderTest extends KernelTestCase
@@ -35,21 +36,21 @@ class FetchQueryToSqlBuilderTest extends KernelTestCase
         $query->addJoinClause('LEFT JOIN other d ON a.id = d.foreign_id', ['bar_baz'], [Types::STRING]);
         $query->removeJoinClause($index);
         $query->addWhereClause('b.item = ?', ['baz'], [Types::STRING]);
-        $index = $query->addWhereClause('b.cancel', [ 'foz'], [Types::STRING]);
+        $index = $query->addWhereClause('b.cancel', ['foz'], [Types::STRING]);
         $query->removeWhereClause($index);
 
         ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
 
         $filteredSql =
-            implode(" ", array_filter(
-                explode(" ", str_replace("\n", "", $sql)),
-                fn (string $tok) => $tok !== ""
+            implode(' ', array_filter(
+                explode(' ', str_replace("\n", '', $sql)),
+                fn (string $tok) => '' !== $tok
             ))
         ;
 
         self::assertEquals(
             "SELECT 'test' AS key, jsonb_build_object('id', a.column) AS identifiers, ".
-            "a.datecolumn::date AS doc_date FROM my_table a LEFT JOIN other b ON a.id = b.foreign_id LEFT JOIN other d ON a.id = d.foreign_id WHERE b.item = ?",
+            'a.datecolumn::date AS doc_date FROM my_table a LEFT JOIN other b ON a.id = b.foreign_id LEFT JOIN other d ON a.id = d.foreign_id WHERE b.item = ?',
             $filteredSql
         );
         self::assertEquals(['foo', 'bar_baz', 'baz'], $params);
@@ -68,15 +69,15 @@ class FetchQueryToSqlBuilderTest extends KernelTestCase
         ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
 
         $filteredSql =
-            implode(" ", array_filter(
-                explode(" ", str_replace("\n", "", $sql)),
-                fn (string $tok) => $tok !== ""
+            implode(' ', array_filter(
+                explode(' ', str_replace("\n", '', $sql)),
+                fn (string $tok) => '' !== $tok
             ))
         ;
 
         self::assertEquals(
             "SELECT 'test' AS key, jsonb_build_object('id', a.column) AS identifiers, ".
-            "a.datecolumn::date AS doc_date FROM my_table a",
+            'a.datecolumn::date AS doc_date FROM my_table a',
             $filteredSql
         );
         self::assertEquals([], $params);
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/ManagerTest.php b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/ManagerTest.php
index f59779374..1b22a4d2e 100644
--- a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/ManagerTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/ManagerTest.php
@@ -19,7 +19,6 @@ use Chill\DocStoreBundle\GenericDoc\Manager;
 use Chill\DocStoreBundle\GenericDoc\GenericDocForAccompanyingPeriodProviderInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
@@ -28,6 +27,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class ManagerTest extends KernelTestCase
@@ -52,7 +52,7 @@ class ManagerTest extends KernelTestCase
             ->getSingleResult();
 
         if (null === $period) {
-            throw new \UnexpectedValueException("period not found");
+            throw new \UnexpectedValueException('period not found');
         }
 
         $manager = new Manager(
@@ -73,7 +73,7 @@ class ManagerTest extends KernelTestCase
             ->getSingleResult();
 
         if (null === $person) {
-            throw new \UnexpectedValueException("person found");
+            throw new \UnexpectedValueException('person found');
         }
 
         $manager = new Manager(
@@ -94,7 +94,7 @@ class ManagerTest extends KernelTestCase
             ->getSingleResult();
 
         if (null === $period) {
-            throw new \UnexpectedValueException("period not found");
+            throw new \UnexpectedValueException('period not found');
         }
 
         $manager = new Manager(
@@ -115,7 +115,7 @@ class ManagerTest extends KernelTestCase
             ->getSingleResult();
 
         if (null === $person) {
-            throw new \UnexpectedValueException("person not found");
+            throw new \UnexpectedValueException('person not found');
         }
 
         $manager = new Manager(
@@ -136,7 +136,7 @@ class ManagerTest extends KernelTestCase
             ->getSingleResult();
 
         if (null === $person) {
-            throw new \UnexpectedValueException("person not found");
+            throw new \UnexpectedValueException('person not found');
         }
 
         $manager = new Manager(
@@ -157,7 +157,7 @@ class ManagerTest extends KernelTestCase
             ->getSingleResult();
 
         if (null === $period) {
-            throw new \UnexpectedValueException("period not found");
+            throw new \UnexpectedValueException('period not found');
         }
 
         $manager = new Manager(
@@ -174,7 +174,7 @@ class ManagerTest extends KernelTestCase
 
 final readonly class SimpleGenericDocAccompanyingPeriodProvider implements GenericDocForAccompanyingPeriodProviderInterface
 {
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
     {
         $query = new FetchQuery(
             'accompanying_course_document_dummy',
@@ -196,7 +196,7 @@ final readonly class SimpleGenericDocAccompanyingPeriodProvider implements Gener
 
 final readonly class SimpleGenericDocPersonProvider implements GenericDocForPersonProviderInterface
 {
-    public function buildFetchQueryForPerson(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
     {
         $query = new FetchQuery(
             'dummy_person_doc',
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProviderTest.php b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProviderTest.php
index 79ced9258..edbe59c13 100644
--- a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProviderTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProviderTest.php
@@ -15,7 +15,6 @@ use Chill\DocStoreBundle\GenericDoc\FetchQueryToSqlBuilder;
 use Chill\DocStoreBundle\GenericDoc\Providers\AccompanyingCourseDocumentGenericDocProvider;
 use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -23,6 +22,7 @@ use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class AccompanyingCourseDocumentGenericDocProviderTest extends KernelTestCase
@@ -40,14 +40,14 @@ class AccompanyingCourseDocumentGenericDocProviderTest extends KernelTestCase
     /**
      * @dataProvider provideSearchArguments
      */
-    public function testWithoutAnyArgument(?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?string $content = null): void
+    public function testWithoutAnyArgument(?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, string $content = null): void
     {
         $period = $this->entityManager->createQuery('SELECT a FROM '.AccompanyingPeriod::class.' a')
             ->setMaxResults(1)
             ->getSingleResult();
 
         if (null === $period) {
-            throw new \UnexpectedValueException("period not found");
+            throw new \UnexpectedValueException('period not found');
         }
 
         $security = $this->prophesize(Security::class);
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/PersonDocumentGenericDocProviderTest.php b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/PersonDocumentGenericDocProviderTest.php
index dada613b5..6ac8d71eb 100644
--- a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/PersonDocumentGenericDocProviderTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/PersonDocumentGenericDocProviderTest.php
@@ -15,7 +15,6 @@ use Chill\DocStoreBundle\GenericDoc\FetchQueryToSqlBuilder;
 use Chill\DocStoreBundle\GenericDoc\Providers\PersonDocumentGenericDocProvider;
 use Chill\DocStoreBundle\Repository\PersonDocumentACLAwareRepositoryInterface;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -23,6 +22,7 @@ use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class PersonDocumentGenericDocProviderTest extends KernelTestCase
@@ -42,11 +42,12 @@ class PersonDocumentGenericDocProviderTest extends KernelTestCase
 
     /**
      * @dataProvider provideDataBuildFetchQueryForPerson
+     *
      * @throws \Doctrine\DBAL\Exception
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function testBuildFetchQueryForPerson(?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate, ?string $content): void
+    public function testBuildFetchQueryForPerson(?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?string $content): void
     {
         $security = $this->prophesize(Security::class);
         $person = $this->entityManager->createQuery('SELECT a FROM '.Person::class.' a')
@@ -54,7 +55,7 @@ class PersonDocumentGenericDocProviderTest extends KernelTestCase
             ->getSingleResult();
 
         if (null === $person) {
-            throw new \UnexpectedValueException("person found");
+            throw new \UnexpectedValueException('person found');
         }
 
         $provider = new PersonDocumentGenericDocProvider(
@@ -69,16 +70,16 @@ class PersonDocumentGenericDocProviderTest extends KernelTestCase
         $nb = $this->entityManager->getConnection()
             ->fetchOne("SELECT COUNT(*) AS nb FROM ({$sql}) AS sq", $params, $types);
 
-        self::assertIsInt($nb, "Test that the query is syntactically correct");
+        self::assertIsInt($nb, 'Test that the query is syntactically correct');
     }
 
     public function provideDataBuildFetchQueryForPerson(): iterable
     {
         yield [null, null, null];
-        yield [new DateTimeImmutable('1 year ago'), null, null];
-        yield [null, new DateTimeImmutable('1 year ago'), null];
-        yield [new DateTimeImmutable('2 years ago'), new DateTimeImmutable('1 year ago'), null];
+        yield [new \DateTimeImmutable('1 year ago'), null, null];
+        yield [null, new \DateTimeImmutable('1 year ago'), null];
+        yield [new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), null];
         yield [null, null, 'test'];
-        yield [new DateTimeImmutable('2 years ago'), new DateTimeImmutable('1 year ago'), 'test'];
+        yield [new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), 'test'];
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/Repository/PersonDocumentACLAwareRepositoryTest.php b/src/Bundle/ChillDocStoreBundle/Tests/Repository/PersonDocumentACLAwareRepositoryTest.php
index bb372a150..6dfd521a1 100644
--- a/src/Bundle/ChillDocStoreBundle/Tests/Repository/PersonDocumentACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/Repository/PersonDocumentACLAwareRepositoryTest.php
@@ -17,13 +17,9 @@ use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -32,6 +28,7 @@ use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
@@ -51,11 +48,12 @@ class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
 
     /**
      * @dataProvider provideDataBuildFetchQueryForPerson
+     *
      * @throws \Doctrine\DBAL\Exception
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function testBuildFetchQueryForPerson(?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null): void
+    public function testBuildFetchQueryForPerson(\DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): void
     {
         $centerManager = $this->prophesize(CenterResolverManagerInterface::class);
         $centerManager->resolveCenters(Argument::type(Person::class))
@@ -72,12 +70,12 @@ class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
             $this->prophesize(Security::class)->reveal()
         );
 
-        $person = $this->entityManager->createQuery("SELECT p FROM " . Person::class . " p")
+        $person = $this->entityManager->createQuery('SELECT p FROM '.Person::class.' p')
             ->setMaxResults(1)
             ->getSingleResult();
 
         if (null === $person) {
-            throw new \RuntimeException("person not exists in database");
+            throw new \RuntimeException('person not exists in database');
         }
 
         $query = $repository->buildFetchQueryForPerson($person, $startDate, $endDate, $content);
@@ -86,7 +84,7 @@ class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
         $nb = $this->entityManager->getConnection()
             ->fetchOne("SELECT COUNT(*) FROM ({$sql}) AS sq", $params, $types);
 
-        self::assertIsInt($nb, "test that the query could be executed");
+        self::assertIsInt($nb, 'test that the query could be executed');
     }
 
     /**
@@ -94,9 +92,9 @@ class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
      */
     public function testBuildFetchQueryForAccompanyingPeriod(
         AccompanyingPeriod $period,
-        ?\DateTimeImmutable $startDate = null,
-        ?\DateTimeImmutable $endDate = null,
-        ?string $content = null
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null
     ): void {
         $centerManager = $this->prophesize(CenterResolverManagerInterface::class);
         $centerManager->resolveCenters(Argument::type(Person::class))
@@ -122,7 +120,7 @@ class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
         $nb = $this->entityManager->getConnection()
             ->fetchOne("SELECT COUNT(*) FROM ({$sql}) AS sq", $params, $types);
 
-        self::assertIsInt($nb, "test that the query could be executed");
+        self::assertIsInt($nb, 'test that the query could be executed');
     }
 
     public function provideDateForFetchQueryForAccompanyingPeriod(): iterable
@@ -130,27 +128,27 @@ class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
         $this->setUp();
 
         if (null === $period = $this->entityManager->createQuery(
-            "SELECT p FROM " . AccompanyingPeriod::class . " p WHERE SIZE(p.participations) > 0"
+            'SELECT p FROM '.AccompanyingPeriod::class.' p WHERE SIZE(p.participations) > 0'
         )
             ->setMaxResults(1)->getSingleResult()) {
-            throw new \RuntimeException("no course found");
+            throw new \RuntimeException('no course found');
         }
 
         yield [$period, null, null, null];
-        yield [$period, new DateTimeImmutable('1 year ago'), null, null];
-        yield [$period, null, new DateTimeImmutable('1 year ago'), null];
-        yield [$period, new DateTimeImmutable('2 years ago'), new DateTimeImmutable('1 year ago'), null];
+        yield [$period, new \DateTimeImmutable('1 year ago'), null, null];
+        yield [$period, null, new \DateTimeImmutable('1 year ago'), null];
+        yield [$period, new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), null];
         yield [$period, null, null, 'test'];
-        yield [$period, new DateTimeImmutable('2 years ago'), new DateTimeImmutable('1 year ago'), 'test'];
+        yield [$period, new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), 'test'];
     }
 
     public function provideDataBuildFetchQueryForPerson(): iterable
     {
         yield [null, null, null];
-        yield [new DateTimeImmutable('1 year ago'), null, null];
-        yield [null, new DateTimeImmutable('1 year ago'), null];
-        yield [new DateTimeImmutable('2 years ago'), new DateTimeImmutable('1 year ago'), null];
+        yield [new \DateTimeImmutable('1 year ago'), null, null];
+        yield [null, new \DateTimeImmutable('1 year ago'), null];
+        yield [new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), null];
         yield [null, null, 'test'];
-        yield [new DateTimeImmutable('2 years ago'), new DateTimeImmutable('1 year ago'), 'test'];
+        yield [new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), 'test'];
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php b/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php
index 4ab576f75..bf659ba9b 100644
--- a/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php
@@ -16,9 +16,7 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
 use Chill\DocStoreBundle\Service\StoredObjectManager;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
-use Generator;
 use PHPUnit\Framework\TestCase;
-use stdClass;
 use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
@@ -32,7 +30,7 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
  */
 final class StoredObjectManagerTest extends TestCase
 {
-    public function getDataProvider(): Generator
+    public function getDataProvider(): \Generator
     {
         /* HAPPY SCENARIO */
 
@@ -92,7 +90,7 @@ final class StoredObjectManagerTest extends TestCase
     /**
      * @dataProvider getDataProvider
      */
-    public function testRead(StoredObject $storedObject, string $encodedContent, string $clearContent, ?string $exceptionClass = null)
+    public function testRead(StoredObject $storedObject, string $encodedContent, string $clearContent, string $exceptionClass = null)
     {
         if (null !== $exceptionClass) {
             $this->expectException($exceptionClass);
@@ -106,7 +104,7 @@ final class StoredObjectManagerTest extends TestCase
     /**
      * @dataProvider getDataProvider
      */
-    public function testWrite(StoredObject $storedObject, string $encodedContent, string $clearContent, ?string $exceptionClass = null)
+    public function testWrite(StoredObject $storedObject, string $encodedContent, string $clearContent, string $exceptionClass = null)
     {
         if (null !== $exceptionClass) {
             $this->expectException($exceptionClass);
@@ -144,7 +142,6 @@ final class StoredObjectManagerTest extends TestCase
 
                     case 'https://example.com/error_during_http_request.txt':
                         throw new TransportException('error_during_http_request.txt');
-
                     case 'https://example.com/invalid_statuscode.txt':
                         return new MockResponse($encodedContent, ['http_code' => 404]);
                 }
@@ -166,7 +163,7 @@ final class StoredObjectManagerTest extends TestCase
 
     private function getTempUrlGenerator(StoredObject $storedObject): TempUrlGeneratorInterface
     {
-        $response = new stdClass();
+        $response = new \stdClass();
         $response->url = $storedObject->getFilename();
 
         $tempUrlGenerator = $this->createMock(TempUrlGeneratorInterface::class);
diff --git a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
index aa8f1a00c..9d1b619f9 100644
--- a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
@@ -64,7 +64,7 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
         }
 
         return $this->translator->trans('workflow.Document (n°%doc%)', ['%doc%' => $entityWorkflow->getRelatedEntityId()])
-            . ' - ' . $doc->getTitle();
+            .' - '.$doc->getTitle();
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingCourseDocument
@@ -119,7 +119,7 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
 
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
-        return $entityWorkflow->getRelatedEntityClass() === AccompanyingCourseDocument::class;
+        return AccompanyingCourseDocument::class === $entityWorkflow->getRelatedEntityClass();
     }
 
     public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php
index 917e82186..b9a0bf336 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php
@@ -21,14 +21,14 @@ final class Version20180605102533 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP SCHEMA chill_doc CASCADE');
     }
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SCHEMA chill_doc');
         $this->addSql('CREATE SEQUENCE chill_doc.person_document_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php
index 02ff4c72b..c18778788 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php
@@ -21,7 +21,7 @@ final class Version20180606133338 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_doc.person_document DROP CONSTRAINT FK_41DA53C232D562B');
         $this->addSql('DROP SEQUENCE chill_doc.stored_object_id_seq CASCADE');
@@ -32,7 +32,7 @@ final class Version20180606133338 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE chill_doc.stored_object_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_doc.stored_object (id INT NOT NULL, filename TEXT NOT NULL, key JSON NOT NULL, iv JSON NOT NULL, creation_date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, type TEXT NOT NULL, datas JSON NOT NULL, PRIMARY KEY(id))');
diff --git a/src/Bundle/ChillEventBundle/Controller/EventController.php b/src/Bundle/ChillEventBundle/Controller/EventController.php
index 14ff0d560..0abdff8dd 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventController.php
@@ -37,11 +37,8 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function count;
-
 /**
  * Class EventController.
  */
@@ -90,7 +87,6 @@ class EventController extends AbstractController
     }
 
     /**
-     * @param $event_id
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/{event_id}/delete", name="chill_event__event_delete", requirements={"event_id"="\d+"}, methods={"GET", "DELETE"})
      */
     public function deleteAction($event_id, Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
@@ -109,7 +105,7 @@ class EventController extends AbstractController
 
         $form = $this->createDeleteForm($event_id);
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -142,9 +138,8 @@ class EventController extends AbstractController
     /**
      * Displays a form to edit an existing Event entity.
      *
-     * @param $event_id
-     *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/{event_id}/edit", name="chill_event__event_edit")
      */
     public function editAction($event_id)
@@ -168,11 +163,10 @@ class EventController extends AbstractController
     /**
      * List events subscriptions for a person.
      *
-     * @param $person_id
+     * @return \Symfony\Component\HttpFoundation\Response
      *
      * @throws \Doctrine\ORM\NonUniqueResultException
      *
-     * @return \Symfony\Component\HttpFoundation\Response
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/{person_id}/list", name="chill_event__list_by_person", methods={"GET"})
      */
     public function listByPersonAction($person_id)
@@ -233,9 +227,8 @@ class EventController extends AbstractController
     /**
      * Displays a form to create a new Event entity.
      *
-     * @param Center $center
-     *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/new", name="chill_event__event_new", methods={"GET", "POST"})
      */
     public function newAction(?Center $center, Request $request)
@@ -270,6 +263,7 @@ class EventController extends AbstractController
 
     /**
      * First step of new Event form.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/new/pick-center", name="chill_event__event_new_pickcenter", options={null})
      */
     public function newPickCenterAction()
@@ -281,7 +275,7 @@ class EventController extends AbstractController
          */
         $centers = $this->authorizationHelper->getReachableCenters($this->getUser(), $role);
 
-        if (count($centers) === 1) {
+        if (1 === \count($centers)) {
             return $this->redirectToRoute('chill_event__event_new', [
                 'center_id' => $centers[0]->getId(),
             ]);
@@ -316,9 +310,10 @@ class EventController extends AbstractController
      *
      * @ParamConverter("event", options={"id": "event_id"})
      *
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @throws \PhpOffice\PhpSpreadsheet\Exception
      *
-     * @return \Symfony\Component\HttpFoundation\Response
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/{event_id}/show", name="chill_event__event_show")
      */
     public function showAction(Event $event, Request $request)
@@ -351,7 +346,6 @@ class EventController extends AbstractController
     /**
      * Edits an existing Event entity.
      *
-     * @param $event_id
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/{event_id}/update", name="chill_event__event_update", methods={"POST", "PUT"})
      */
     public function updateAction(Request $request, $event_id): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
@@ -493,9 +487,9 @@ class EventController extends AbstractController
     }
 
     /**
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
-     *
      * @return Spreadsheet
+     *
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
      */
     protected function createExportSpreadsheet(Event $event)
     {
@@ -527,14 +521,14 @@ class EventController extends AbstractController
         $columnLetter = 'A';
 
         foreach ($columnNames as $columnName) {
-            $sheet->setCellValue($columnLetter . '8', $columnName);
+            $sheet->setCellValue($columnLetter.'8', $columnName);
             ++$columnLetter;
         }
 
         $columnValues = [];
 
         foreach ($event->getParticipations() as $participation) {
-            /** @var Participation $participation */
+            /* @var Participation $participation */
             $columnValues[] = [
                 $participation->getPerson()->getId(),
                 $participation->getPerson()->getFirstname(),
@@ -553,7 +547,7 @@ class EventController extends AbstractController
             $columnLetter = 'A';
 
             foreach ($columnValue as $value) {
-                $sheet->setCellValue($columnLetter . $i, $value);
+                $sheet->setCellValue($columnLetter.$i, $value);
                 ++$columnLetter;
             }
             ++$i;
@@ -563,9 +557,9 @@ class EventController extends AbstractController
     }
 
     /**
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
-     *
      * @return array
+     *
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
      */
     protected function exportParticipationsList(Event $event, Request $request)
     {
@@ -575,7 +569,7 @@ class EventController extends AbstractController
         if ($form->isSubmitted() && $form->isValid()) {
             $data = $form->getData();
             $format = $data['format'];
-            $filename = 'export_event' . $event->getId() . '_participations.' . $format;
+            $filename = 'export_event'.$event->getId().'_participations.'.$format;
 
             $spreadsheet = $this->createExportSpreadsheet($event);
 
@@ -604,7 +598,7 @@ class EventController extends AbstractController
 
             $response = new StreamedResponse();
             $response->headers->set('Content-Type', $contentType);
-            $response->headers->set('Content-Disposition', 'attachment;filename="' . $filename . '"');
+            $response->headers->set('Content-Disposition', 'attachment;filename="'.$filename.'"');
             $response->setPrivate();
             $response->headers->addCacheControlDirective('no-cache', true);
             $response->headers->addCacheControlDirective('must-revalidate', true);
@@ -639,8 +633,6 @@ class EventController extends AbstractController
     }
 
     /**
-     * @param $event_id
-     *
      * @return \Symfony\Component\Form\FormInterface
      */
     private function createDeleteForm($event_id)
diff --git a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
index e149b6d1f..b96fb9cb9 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
@@ -24,6 +24,7 @@ class EventTypeController extends AbstractController
 {
     /**
      * Creates a new EventType entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/create", name="chill_eventtype_admin_create", methods={"POST"})
      */
     public function createAction(Request $request)
@@ -48,6 +49,7 @@ class EventTypeController extends AbstractController
 
     /**
      * Deletes a EventType entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/{id}/delete", name="chill_eventtype_admin_delete", methods={"POST", "DELETE"})
      */
     public function deleteAction(Request $request, mixed $id)
@@ -72,6 +74,7 @@ class EventTypeController extends AbstractController
 
     /**
      * Displays a form to edit an existing EventType entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/{id}/edit", name="chill_eventtype_admin_edit")
      */
     public function editAction(mixed $id)
@@ -96,6 +99,7 @@ class EventTypeController extends AbstractController
 
     /**
      * Lists all EventType entities.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/", name="chill_eventtype_admin", options={null})
      */
     public function indexAction()
@@ -111,6 +115,7 @@ class EventTypeController extends AbstractController
 
     /**
      * Displays a form to create a new EventType entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/new", name="chill_eventtype_admin_new")
      */
     public function newAction()
@@ -126,6 +131,7 @@ class EventTypeController extends AbstractController
 
     /**
      * Finds and displays a EventType entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/{id}/show", name="chill_eventtype_admin_show")
      */
     public function showAction(mixed $id)
@@ -148,6 +154,7 @@ class EventTypeController extends AbstractController
 
     /**
      * Edits an existing EventType entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/{id}/update", name="chill_eventtype_admin_update", methods={"POST", "PUT"})
      */
     public function updateAction(Request $request, mixed $id)
diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
index 54dc763ef..bc98f11ee 100644
--- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
@@ -11,16 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\Controller;
 
-use ArrayIterator;
 use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Entity\Participation;
 use Chill\EventBundle\Form\ParticipationType;
 use Chill\EventBundle\Security\Authorization\ParticipationVoter;
 use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\ReadableCollection;
-use LogicException;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -28,8 +24,6 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-use function count;
-
 /**
  * Class ParticipationController.
  */
@@ -41,15 +35,14 @@ class ParticipationController extends AbstractController
     public function __construct(private readonly LoggerInterface $logger) {}
 
     /**
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/create", name="chill_event_participation_create")
      */
-    public function createAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    public function createAction(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         // test the request is correct
         try {
             $this->testRequest($request);
-        } catch (RuntimeException $ex) {
+        } catch (\RuntimeException $ex) {
             $this->logger->warning($ex->getMessage());
 
             return (new Response())
@@ -73,7 +66,7 @@ class ParticipationController extends AbstractController
         return (new Response())
             ->setStatusCode(Response::HTTP_BAD_REQUEST)
             ->setContent("You must provide either 'person_id' or "
-                        . "'persons_ids' argument in query");
+                        ."'persons_ids' argument in query");
     }
 
     /**
@@ -159,10 +152,7 @@ class ParticipationController extends AbstractController
         return $form;
     }
 
-    /**
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
-     */
-    public function createMultiple(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    public function createMultiple(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         $participations = $this->handleRequest($request, new Participation(), true);
 
@@ -202,10 +192,7 @@ class ParticipationController extends AbstractController
         ]);
     }
 
-    /**
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
-     */
-    public function createSingle(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    public function createSingle(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         $participation = $this->handleRequest($request, new Participation(), false);
 
@@ -246,10 +233,9 @@ class ParticipationController extends AbstractController
     /**
      * @param int $participation_id
      *
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/{participation_id}/delete", name="chill_event_participation_delete", requirements={"participation_id"="\d+"}, methods={"GET", "DELETE"})
      */
-    public function deleteAction($participation_id, Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    public function deleteAction($participation_id, Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         $em = $this->getDoctrine()->getManager();
         $participation = $em->getRepository(\Chill\EventBundle\Entity\Participation::class)->findOneBy([
@@ -265,7 +251,7 @@ class ParticipationController extends AbstractController
 
         $form = $this->createDeleteForm($participation_id);
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -293,8 +279,9 @@ class ParticipationController extends AbstractController
     /**
      * Show an edit form for the participation with the given id.
      *
-     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the participation is not found
+     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException          if the participation is not found
      * @throws \Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException if the user is not allowed to edit the participation
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/{participation_id}/edit", name="chill_event_participation_edit")
      */
     public function editAction(int $participation_id): Response
@@ -327,10 +314,9 @@ class ParticipationController extends AbstractController
      *
      * @param int $event_id
      *
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/{event_id}/edit_multiple", name="chill_event_participation_edit_multiple")
      */
-    public function editMultipleAction($event_id): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    public function editMultipleAction($event_id): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         $event = $this->getDoctrine()->getRepository(\Chill\EventBundle\Entity\Event::class)
             ->find($event_id);
@@ -341,13 +327,13 @@ class ParticipationController extends AbstractController
 
         // check for ACL, on Event level and on Participation Level
         $this->denyAccessUnlessGranted('CHILL_EVENT_SEE', $event, 'You are not allowed '
-                . 'to see this event');
+                .'to see this event');
 
         foreach ($event->getParticipations() as $participation) {
             $this->denyAccessUnlessGranted(
                 ParticipationVoter::UPDATE,
                 $participation,
-                'You are not allowed to update participation with id ' . $participation->getId()
+                'You are not allowed to update participation with id '.$participation->getId()
             );
         }
 
@@ -385,15 +371,14 @@ class ParticipationController extends AbstractController
      * and decide if it should process a single or multiple participation. Depending
      * on this, the appropriate layout and form.
      *
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/new", name="chill_event_participation_new")
      */
-    public function newAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    public function newAction(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         // test the request is correct
         try {
             $this->testRequest($request);
-        } catch (RuntimeException $ex) {
+        } catch (\RuntimeException $ex) {
             $this->logger->warning($ex->getMessage());
 
             return (new Response())
@@ -417,7 +402,7 @@ class ParticipationController extends AbstractController
         return (new Response())
             ->setStatusCode(Response::HTTP_BAD_REQUEST)
             ->setContent("You must provide either 'person_id' or "
-                        . "'persons_ids' argument in query");
+                        ."'persons_ids' argument in query");
     }
 
     /**
@@ -478,13 +463,13 @@ class ParticipationController extends AbstractController
         }
 
         $this->denyAccessUnlessGranted('CHILL_EVENT_SEE', $event, 'You are not allowed '
-                . 'to see this event');
+                .'to see this event');
 
         foreach ($event->getParticipations() as $participation) {
             $this->denyAccessUnlessGranted(
                 ParticipationVoter::UPDATE,
                 $participation,
-                'You are not allowed to update participation with id ' . $participation->getId()
+                'You are not allowed to update participation with id '.$participation->getId()
             );
         }
 
@@ -496,7 +481,7 @@ class ParticipationController extends AbstractController
             $this->getDoctrine()->getManager()->flush();
 
             $this->addFlash('success', $this->get('translator')->trans('The participations '
-                    . 'have been successfully updated.'));
+                    .'have been successfully updated.'));
 
             return $this->redirectToRoute(
                 'chill_event__event_show',
@@ -551,10 +536,10 @@ class ParticipationController extends AbstractController
      * If the request is multiple, the $participation object is cloned.
      * Limitations: the $participation should not be persisted.
      *
-     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the event/person is not found
-     * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedException if the user does not have access to event/person
+     * @return Participation|Participation[] return one single participation if $multiple == false
      *
-     * @return Participation|Participations[] return one single participation if $multiple == false
+     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException    if the event/person is not found
+     * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedException if the user does not have access to event/person
      */
     protected function handleRequest(
         Request $request,
@@ -564,8 +549,7 @@ class ParticipationController extends AbstractController
         $em = $this->getDoctrine()->getManager();
 
         if ($em->contains($participation)) {
-            throw new LogicException('The participation object should not be managed by '
-                    . 'the object manager using the method ' . __METHOD__);
+            throw new \LogicException('The participation object should not be managed by the object manager using the method '.__METHOD__);
         }
 
         $event_id = $request->query->getInt('event_id', 0); // sf4 check:
@@ -576,7 +560,7 @@ class ParticipationController extends AbstractController
                 ->find($event_id);
 
             if (null === $event) {
-                throw $this->createNotFoundException('The event with id ' . $event_id . ' is not found');
+                throw $this->createNotFoundException('The event with id '.$event_id.' is not found');
             }
 
             $this->denyAccessUnlessGranted(
@@ -598,14 +582,14 @@ class ParticipationController extends AbstractController
 
         foreach ($persons_ids as $person_id) {
             // clone if we have to reuse the $participation
-            $participation = count($persons_ids) > 1 ? clone $participation : $participation;
+            $participation = \count($persons_ids) > 1 ? clone $participation : $participation;
 
             if (null !== $person_id) {
                 $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)
                     ->find($person_id);
 
                 if (null === $person) {
-                    throw $this->createNotFoundException('The person with id ' . $person_id . ' is not found');
+                    throw $this->createNotFoundException('The person with id '.$person_id.' is not found');
                 }
 
                 $this->denyAccessUnlessGranted(
@@ -634,16 +618,14 @@ class ParticipationController extends AbstractController
      *
      * If all participations must be ignored, an error is shown and the method redirects
      * to the event 'show' view with an appropriate flash message.
-     *
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    protected function newMultiple(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    protected function newMultiple(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         $participations = $this->handleRequest($request, new Participation(), true);
         $ignoredParticipations = $newParticipations = [];
 
         foreach ($participations as $participation) {
-            /** @var Participation $participation */
+            /* @var Participation $participation */
             // check for authorization
             $this->denyAccessUnlessGranted(
                 ParticipationVoter::CREATE,
@@ -652,7 +634,6 @@ class ParticipationController extends AbstractController
             );
 
             // create a collection of person's id participating to the event
-            /** @var \Doctrine\Common\Collections\ArrayCollection $peopleParticipating */
             $peopleParticipating ??= $participation->getEvent()->getParticipations()->map(
                 static fn (Participation $p) => $p->getPerson()->getId()
             );
@@ -673,7 +654,7 @@ class ParticipationController extends AbstractController
             // if we do not have nay participants, redirect to event view
             $this->addFlash('error', $this->get('translator')->trans(
                 'None of the requested people may participate '
-                    . 'the event: they are maybe already participating.'
+                    .'the event: they are maybe already participating.'
             ));
 
             return $this->redirectToRoute('chill_event__event_show', [
@@ -681,7 +662,7 @@ class ParticipationController extends AbstractController
             ]);
         }
 
-        if (count($newParticipations) > 1) {
+        if (\count($newParticipations) > 1) {
             // if we have multiple participations, show a form with multiple participations
             $form = $this->createCreateFormMultiple($newParticipations);
 
@@ -742,7 +723,7 @@ class ParticipationController extends AbstractController
      * - `person_id` and `persons_ids` are **not** both present ;
      * - `persons_id` is correct (contains only numbers and a ','.
      *
-     * @throws RuntimeException if an error is detected
+     * @throws \RuntimeException if an error is detected
      */
     protected function testRequest(Request $request)
     {
@@ -751,28 +732,24 @@ class ParticipationController extends AbstractController
 
         if (true === $single && true === $multiple) {
             // we are not allowed to have both person_id and persons_ids
-            throw new RuntimeException("You are not allow to provide both 'person_id' and "
-                      . "'persons_ids' simulaneously");
+            throw new \RuntimeException("You are not allow to provide both 'person_id' and 'persons_ids' simulaneously");
         }
 
         if (true === $multiple) {
             $persons_ids = $request->query->get('persons_ids');
 
             if (!preg_match('/^([0-9]{1,},{0,1}){1,}[0-9]{0,}$/', (string) $persons_ids)) {
-                throw new RuntimeException('The persons_ids value should '
-                        . "contains int separated by ','");
+                throw new \RuntimeException('The persons_ids value should '."contains int separated by ','");
             }
         }
 
         // check for event_id - this could be removed later
-        if ($request->query->has('event_id') === false) {
-            throw new RuntimeException('You must provide an event_id');
+        if (false === $request->query->has('event_id')) {
+            throw new \RuntimeException('You must provide an event_id');
         }
     }
 
     /**
-     * @param $participation_id
-     *
      * @return \Symfony\Component\Form\FormInterface
      */
     private function createDeleteForm($participation_id)
diff --git a/src/Bundle/ChillEventBundle/Controller/RoleController.php b/src/Bundle/ChillEventBundle/Controller/RoleController.php
index b4c25c074..1b2ad2b25 100644
--- a/src/Bundle/ChillEventBundle/Controller/RoleController.php
+++ b/src/Bundle/ChillEventBundle/Controller/RoleController.php
@@ -24,6 +24,7 @@ class RoleController extends AbstractController
 {
     /**
      * Creates a new Role entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/create", name="chill_event_admin_role_create", methods={"POST"})
      */
     public function createAction(Request $request)
@@ -48,6 +49,7 @@ class RoleController extends AbstractController
 
     /**
      * Deletes a Role entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/{id}/delete", name="chill_event_admin_role_delete", methods={"POST", "DELETE"})
      */
     public function deleteAction(Request $request, mixed $id)
@@ -72,6 +74,7 @@ class RoleController extends AbstractController
 
     /**
      * Displays a form to edit an existing Role entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/{id}/edit", name="chill_event_admin_role_edit")
      */
     public function editAction(mixed $id)
@@ -96,6 +99,7 @@ class RoleController extends AbstractController
 
     /**
      * Lists all Role entities.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/", name="chill_event_admin_role", options={null})
      */
     public function indexAction()
@@ -111,6 +115,7 @@ class RoleController extends AbstractController
 
     /**
      * Displays a form to create a new Role entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/new", name="chill_event_admin_role_new")
      */
     public function newAction()
@@ -126,6 +131,7 @@ class RoleController extends AbstractController
 
     /**
      * Finds and displays a Role entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/{id}/show", name="chill_event_admin_role_show")
      */
     public function showAction(mixed $id)
@@ -148,6 +154,7 @@ class RoleController extends AbstractController
 
     /**
      * Edits an existing Role entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/{id}/update", name="chill_event_admin_role_update", methods={"POST", "PUT"})
      */
     public function updateAction(Request $request, mixed $id)
diff --git a/src/Bundle/ChillEventBundle/Controller/StatusController.php b/src/Bundle/ChillEventBundle/Controller/StatusController.php
index fcec6523c..90bb7c1f2 100644
--- a/src/Bundle/ChillEventBundle/Controller/StatusController.php
+++ b/src/Bundle/ChillEventBundle/Controller/StatusController.php
@@ -24,6 +24,7 @@ class StatusController extends AbstractController
 {
     /**
      * Creates a new Status entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/create", name="chill_event_admin_status_create", methods={"POST"})
      */
     public function createAction(Request $request)
@@ -48,6 +49,7 @@ class StatusController extends AbstractController
 
     /**
      * Deletes a Status entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/{id}/delete", name="chill_event_admin_status_delete", methods={"POST", "DELETE"})
      */
     public function deleteAction(Request $request, mixed $id)
@@ -72,6 +74,7 @@ class StatusController extends AbstractController
 
     /**
      * Displays a form to edit an existing Status entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/{id}/edit", name="chill_event_admin_status_edit")
      */
     public function editAction(mixed $id)
@@ -96,6 +99,7 @@ class StatusController extends AbstractController
 
     /**
      * Lists all Status entities.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/", name="chill_event_admin_status", options={null})
      */
     public function indexAction()
@@ -111,6 +115,7 @@ class StatusController extends AbstractController
 
     /**
      * Displays a form to create a new Status entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/new", name="chill_event_admin_status_new")
      */
     public function newAction()
@@ -126,6 +131,7 @@ class StatusController extends AbstractController
 
     /**
      * Finds and displays a Status entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/{id}/show", name="chill_event_admin_status_show")
      */
     public function showAction(mixed $id)
@@ -148,6 +154,7 @@ class StatusController extends AbstractController
 
     /**
      * Edits an existing Status entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/{id}/update", name="chill_event_admin_status_update", methods={"POST", "PUT"})
      */
     public function updateAction(Request $request, mixed $id)
diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
index 26a3144bf..87e676730 100644
--- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
+++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
@@ -18,8 +18,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function in_array;
-
 /**
  * Add roles to existing groups.
  */
@@ -37,10 +35,10 @@ class LoadRolesACL extends AbstractFixture implements OrderedFixtureInterface
 
             foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
-                //create permission group
+                // create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
-                        if ($scope->getName()['en'] === 'administrative') {
+                        if ('administrative' === $scope->getName()['en']) {
                             break 2; // we do not want any power on administrative
                         }
 
@@ -48,7 +46,7 @@ class LoadRolesACL extends AbstractFixture implements OrderedFixtureInterface
 
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
+                        if (\in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             break 2; // we do not want any power on social or administrative
                         }
 
@@ -57,10 +55,10 @@ class LoadRolesACL extends AbstractFixture implements OrderedFixtureInterface
 
                 printf(
                     'Adding CHILL_EVENT_UPDATE & CHILL_EVENT_CREATE '
-                        . '& CHILL_EVENT_PARTICIPATION_UPDATE & CHILL_EVENT_PARTICIPATION_CREATE '
-                        . '& CHILL_EVENT_SEE & CHILL_EVENT_SEE_DETAILS '
-                        . 'to %s '
-                        . "permission group, scope '%s' \n",
+                        .'& CHILL_EVENT_PARTICIPATION_UPDATE & CHILL_EVENT_PARTICIPATION_CREATE '
+                        .'& CHILL_EVENT_SEE & CHILL_EVENT_SEE_DETAILS '
+                        .'to %s '
+                        ."permission group, scope '%s' \n",
                     $permissionsGroup->getName(),
                     $scope->getName()['en']
                 );
diff --git a/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php b/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
index c3d723652..07c431f2f 100644
--- a/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
+++ b/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
@@ -30,7 +30,7 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/authorization.yaml');
         $loader->load('services/controller.yaml');
@@ -70,7 +70,7 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
      */
     protected function prependRoute(ContainerBuilder $container)
     {
-        //add routes for custom bundle
+        // add routes for custom bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
diff --git a/src/Bundle/ChillEventBundle/Entity/Event.php b/src/Bundle/ChillEventBundle/Entity/Event.php
index b2e00c24e..5ecc97afd 100644
--- a/src/Bundle/ChillEventBundle/Entity/Event.php
+++ b/src/Bundle/ChillEventBundle/Entity/Event.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\Entity;
 
-use ArrayIterator;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
@@ -21,13 +20,14 @@ use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Traversable;
 
 /**
  * Class Event.
  *
  * @ORM\Entity(repositoryClass="Chill\EventBundle\Repository\EventRepository")
+ *
  * @ORM\Table(name="chill_event_event")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Event implements HasCenterInterface, HasScopeInterface
@@ -48,10 +48,10 @@ class Event implements HasCenterInterface, HasScopeInterface
     private ?\DateTime $date;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -68,6 +68,7 @@ class Event implements HasCenterInterface, HasScopeInterface
 
     /**
      * @var Collection<Participation>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\EventBundle\Entity\Participation",
      * mappedBy="event")
@@ -118,7 +119,7 @@ class Event implements HasCenterInterface, HasScopeInterface
     /**
      * Get date.
      *
-     * @return DateTime
+     * @return \DateTime
      */
     public function getDate()
     {
@@ -151,17 +152,15 @@ class Event implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     * @return Collection<Participation>
+     * @return Collection<int, Participation>
      */
-    public function getParticipations(): \ArrayIterator|\Doctrine\Common\Collections\Collection|\Traversable
+    public function getParticipations(): Collection
     {
         return new ArrayCollection(iterator_to_array($this->getParticipationsOrdered()));
     }
 
     /**
      * Sort Collection of Participations.
-     *
-     * @return ArrayIterator|Traversable
      */
     public function getParticipationsOrdered(): \ArrayIterator|\Traversable
     {
@@ -169,7 +168,7 @@ class Event implements HasCenterInterface, HasScopeInterface
 
         uasort($iterator, static fn ($first, $second) => strnatcasecmp((string) $first->getPerson()->getFirstName(), (string) $second->getPerson()->getFirstName()));
 
-        return new ArrayIterator($iterator);
+        return new \ArrayIterator($iterator);
     }
 
     /**
@@ -223,7 +222,7 @@ class Event implements HasCenterInterface, HasScopeInterface
      *
      * @return Event
      */
-    public function setDate(DateTime $date)
+    public function setDate(\DateTime $date)
     {
         $this->date = $date;
 
diff --git a/src/Bundle/ChillEventBundle/Entity/EventType.php b/src/Bundle/ChillEventBundle/Entity/EventType.php
index b61a3f1f9..5eef8dc42 100644
--- a/src/Bundle/ChillEventBundle/Entity/EventType.php
+++ b/src/Bundle/ChillEventBundle/Entity/EventType.php
@@ -19,34 +19,37 @@ use Doctrine\ORM\Mapping as ORM;
  * Class EventType.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_event_event_type")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class EventType
 {
     /**
-     * @var bool
      * @ORM\Column(type="boolean", nullable=false)
      */
     private bool $active = true;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
     /**
      * @var array
+     *
      * @ORM\Column(type="json")
      */
     private $name;
 
     /**
      * @var Collection<Role>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\EventBundle\Entity\Role",
      * mappedBy="type")
@@ -55,6 +58,7 @@ class EventType
 
     /**
      * @var Collection<Status>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\EventBundle\Entity\Status",
      * mappedBy="type")
diff --git a/src/Bundle/ChillEventBundle/Entity/Participation.php b/src/Bundle/ChillEventBundle/Entity/Participation.php
index 3a84175bc..8dda85c99 100644
--- a/src/Bundle/ChillEventBundle/Entity/Participation.php
+++ b/src/Bundle/ChillEventBundle/Entity/Participation.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\Entity;
 
-use ArrayAccess;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
@@ -19,20 +18,19 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
-use RuntimeException;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-use function in_array;
-
 /**
  * Class Participation.
  *
  * @ORM\Entity(
  * repositoryClass="Chill\EventBundle\Repository\ParticipationRepository")
+ *
  * @ORM\Table(name="chill_event_participation")
+ *
  * @ORM\HasLifecycleCallbacks
  */
-class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterface
+class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterface
 {
     /**
      * @ORM\ManyToOne(
@@ -42,10 +40,10 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     private ?\Chill\EventBundle\Entity\Event $event = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -75,9 +73,8 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
      */
     public function getCenter()
     {
-        if ($this->getEvent() === null) {
-            throw new RuntimeException('The event is not linked with this instance. '
-                    . 'You should initialize the event with a valid center before.');
+        if (null === $this->getEvent()) {
+            throw new \RuntimeException('The event is not linked with this instance. You should initialize the event with a valid center before.');
         }
 
         return $this->getEvent()->getCenter();
@@ -85,10 +82,8 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
 
     /**
      * Get event.
-     *
-     * @return Event
      */
-    public function getEvent()
+    public function getEvent(): null|Event
     {
         return $this->event;
     }
@@ -106,7 +101,7 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     /**
      * Get lastUpdate.
      *
-     * @return DateTime
+     * @return \DateTime
      */
     public function getLastUpdate()
     {
@@ -125,10 +120,8 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
 
     /**
      * Get role.
-     *
-     * @return Role
      */
-    public function getRole()
+    public function getRole(): null|Role
     {
         return $this->role;
     }
@@ -138,9 +131,8 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
      */
     public function getScope()
     {
-        if ($this->getEvent() === null) {
-            throw new RuntimeException('The event is not linked with this instance. '
-                    . 'You should initialize the event with a valid center before.');
+        if (null === $this->getEvent()) {
+            throw new \RuntimeException('The event is not linked with this instance. You should initialize the event with a valid center before.');
         }
 
         return $this->getEvent()->getCircle();
@@ -148,10 +140,8 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
 
     /**
      * Get status.
-     *
-     * @return Status
      */
-    public function getStatus()
+    public function getStatus(): null|Status
     {
         return $this->status;
     }
@@ -164,7 +154,7 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
      */
     public function isConsistent(ExecutionContextInterface $context)
     {
-        if ($this->getEvent() === null || $this->getRole() === null || $this->getStatus() === null) {
+        if (null === $this->getEvent() || null === $this->getRole() || null === $this->getStatus()) {
             return;
         }
 
@@ -189,7 +179,7 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
 
     public function offsetExists(mixed $offset): bool
     {
-        return in_array($offset, [
+        return \in_array($offset, [
             'person', 'role', 'status', 'event',
         ], true);
     }
@@ -204,7 +194,7 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
             'role' => $this->getRole(),
             'status' => $this->getStatus(),
             'event' => $this->getEvent(),
-            default => throw new \LogicException("this offset does not exists : " . $offset),
+            default => throw new \LogicException('this offset does not exists : '.$offset),
         };
     }
 
@@ -241,11 +231,9 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     /**
      * Set event.
      *
-     * @param Event $event
-     *
      * @return Participation
      */
-    public function setEvent(?Event $event = null)
+    public function setEvent(Event $event = null)
     {
         if ($this->event !== $event) {
             $this->update();
@@ -259,11 +247,9 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     /**
      * Set person.
      *
-     * @param Person $person
-     *
      * @return Participation
      */
-    public function setPerson(?Person $person = null)
+    public function setPerson(Person $person = null)
     {
         if ($person !== $this->person) {
             $this->update();
@@ -277,11 +263,9 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     /**
      * Set role.
      *
-     * @param Role $role
-     *
      * @return Participation
      */
-    public function setRole(?Role $role = null)
+    public function setRole(Role $role = null)
     {
         if ($role !== $this->role) {
             $this->update();
@@ -294,11 +278,9 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     /**
      * Set status.
      *
-     * @param Status $status
-     *
      * @return Participation
      */
-    public function setStatus(?Status $status = null)
+    public function setStatus(Status $status = null)
     {
         if ($this->status !== $status) {
             $this->update();
@@ -316,7 +298,7 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
      */
     protected function update()
     {
-        $this->lastUpdate = new DateTime('now');
+        $this->lastUpdate = new \DateTime('now');
 
         return $this;
     }
diff --git a/src/Bundle/ChillEventBundle/Entity/Role.php b/src/Bundle/ChillEventBundle/Entity/Role.php
index 82e36ba0f..3d2264d2f 100644
--- a/src/Bundle/ChillEventBundle/Entity/Role.php
+++ b/src/Bundle/ChillEventBundle/Entity/Role.php
@@ -17,28 +17,30 @@ use Doctrine\ORM\Mapping as ORM;
  * Class Role.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_event_role")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Role
 {
     /**
-     * @var bool
      * @ORM\Column(type="boolean", nullable=false)
      */
     private bool $active = true;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
     /**
      * @var array
+     *
      * @ORM\Column(type="json")
      */
     private $name;
@@ -121,11 +123,9 @@ class Role
     /**
      * Set type.
      *
-     * @param EventType $type
-     *
      * @return Role
      */
-    public function setType(?EventType $type = null)
+    public function setType(EventType $type = null)
     {
         $this->type = $type;
 
diff --git a/src/Bundle/ChillEventBundle/Entity/Status.php b/src/Bundle/ChillEventBundle/Entity/Status.php
index 805b602d3..22fe8e3ed 100644
--- a/src/Bundle/ChillEventBundle/Entity/Status.php
+++ b/src/Bundle/ChillEventBundle/Entity/Status.php
@@ -17,28 +17,30 @@ use Doctrine\ORM\Mapping as ORM;
  * Class Status.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_event_status")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Status
 {
     /**
-     * @var bool
      * @ORM\Column(type="boolean", nullable=false)
      */
     private bool $active = true;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
     /**
      * @var array
+     *
      * @ORM\Column(type="json")
      */
     private $name;
@@ -121,11 +123,9 @@ class Status
     /**
      * Set type.
      *
-     * @param EventType $type
-     *
      * @return Status
      */
-    public function setType(?EventType $type = null)
+    public function setType(EventType $type = null)
     {
         $this->type = $type;
 
diff --git a/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php b/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
index 962799dbc..7507550c2 100644
--- a/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+++ b/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
@@ -13,14 +13,9 @@ namespace Chill\EventBundle\Form\ChoiceLoader;
 
 use Chill\EventBundle\Entity\Event;
 use Doctrine\ORM\EntityRepository;
-use RuntimeException;
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 
-use function call_user_func;
-use function count;
-use function in_array;
-
 /**
  * Class EventChoiceLoader.
  */
@@ -46,7 +41,7 @@ class EventChoiceLoader implements ChoiceLoaderInterface
      */
     public function __construct(
         EntityRepository $eventRepository,
-        ?array $centers = null
+        array $centers = null
     ) {
         $this->eventRepository = $eventRepository;
 
@@ -62,7 +57,7 @@ class EventChoiceLoader implements ChoiceLoaderInterface
     {
         return new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
             $this->lazyLoadedEvents,
-            static fn (Event $p) => call_user_func($value, $p)
+            static fn (Event $p) => \call_user_func($value, $p)
         );
     }
 
@@ -84,9 +79,9 @@ class EventChoiceLoader implements ChoiceLoaderInterface
 
             if (
                 $this->hasCenterFilter()
-                && !in_array($event->getCenter(), $this->centers, true)
+                && !\in_array($event->getCenter(), $this->centers, true)
             ) {
-                throw new RuntimeException('chosen an event not in correct center');
+                throw new \RuntimeException('chosen an event not in correct center');
             }
 
             $choices[] = $event;
@@ -111,7 +106,7 @@ class EventChoiceLoader implements ChoiceLoaderInterface
                 continue;
             }
 
-            $id = call_user_func($value, $choice);
+            $id = \call_user_func($value, $choice);
             $values[] = $id;
             $this->lazyLoadedEvents[$id] = $choice;
         }
@@ -124,6 +119,6 @@ class EventChoiceLoader implements ChoiceLoaderInterface
      */
     protected function hasCenterFilter()
     {
-        return count($this->centers) > 0;
+        return \count($this->centers) > 0;
     }
 }
diff --git a/src/Bundle/ChillEventBundle/Form/EventType.php b/src/Bundle/ChillEventBundle/Form/EventType.php
index a4d101047..a06999d2b 100644
--- a/src/Bundle/ChillEventBundle/Form/EventType.php
+++ b/src/Bundle/ChillEventBundle/Form/EventType.php
@@ -19,7 +19,6 @@ use Chill\MainBundle\Form\Type\UserPickerType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Role\Role;
 
 class EventType extends AbstractType
 {
diff --git a/src/Bundle/ChillEventBundle/Form/EventTypeType.php b/src/Bundle/ChillEventBundle/Form/EventTypeType.php
index 753bd4208..4b09daef0 100644
--- a/src/Bundle/ChillEventBundle/Form/EventTypeType.php
+++ b/src/Bundle/ChillEventBundle/Form/EventTypeType.php
@@ -14,7 +14,6 @@ namespace Chill\EventBundle\Form;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class EventTypeType extends AbstractType
 {
diff --git a/src/Bundle/ChillEventBundle/Form/ParticipationType.php b/src/Bundle/ChillEventBundle/Form/ParticipationType.php
index 6dcc1e2a8..af1854954 100644
--- a/src/Bundle/ChillEventBundle/Form/ParticipationType.php
+++ b/src/Bundle/ChillEventBundle/Form/ParticipationType.php
@@ -15,7 +15,6 @@ use Chill\EventBundle\Entity\EventType;
 use Chill\EventBundle\Entity\Status;
 use Chill\EventBundle\Form\Type\PickRoleType;
 use Chill\EventBundle\Form\Type\PickStatusType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/Bundle/ChillEventBundle/Form/RoleType.php b/src/Bundle/ChillEventBundle/Form/RoleType.php
index e7d7f33fe..8b9f27be2 100644
--- a/src/Bundle/ChillEventBundle/Form/RoleType.php
+++ b/src/Bundle/ChillEventBundle/Form/RoleType.php
@@ -13,12 +13,10 @@ namespace Chill\EventBundle\Form;
 
 use Chill\EventBundle\Entity\EventType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 final class RoleType extends AbstractType
 {
diff --git a/src/Bundle/ChillEventBundle/Form/StatusType.php b/src/Bundle/ChillEventBundle/Form/StatusType.php
index dd54ee735..7e8c8c1b9 100644
--- a/src/Bundle/ChillEventBundle/Form/StatusType.php
+++ b/src/Bundle/ChillEventBundle/Form/StatusType.php
@@ -15,7 +15,6 @@ use Chill\EventBundle\Form\Type\PickEventTypeType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class StatusType extends AbstractType
 {
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php b/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
index 8c3510ccf..2b85a60c8 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
@@ -19,21 +19,16 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
-use RuntimeException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Finder\Exception\AccessDeniedException;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function in_array;
-use function is_array;
-
 /**
  * Class PickEventType.
  */
@@ -79,7 +74,7 @@ final class PickEventType extends AbstractType
         // add the default options
         $resolver->setDefaults([
             'class' => Event::class,
-            'choice_label' => static fn (Event $e) => $e->getDate()->format('d/m/Y, H:i') . ' → ' .
+            'choice_label' => static fn (Event $e) => $e->getDate()->format('d/m/Y, H:i').' → '.
                     // $e->getType()->getName()['fr'] . ':  ' .    // display the type of event
                     $e->getName(),
             'placeholder' => 'Pick an event',
@@ -128,18 +123,17 @@ final class PickEventType extends AbstractType
             $selectedCenters = $centers;
         } else {
             $selectedCenters = [];
-            $optionsCenters = is_array($options['centers']) ?
+            $optionsCenters = \is_array($options['centers']) ?
                 $options['centers'] : [$options['centers']];
 
             foreach ($optionsCenters as $c) {
                 // check that every member of the array is a center
                 if (!$c instanceof Center) {
-                    throw new RuntimeException('Every member of the "centers" '
-                        . 'option must be an instance of ' . Center::class);
+                    throw new \RuntimeException('Every member of the "centers" option must be an instance of '.Center::class);
                 }
 
                 if (
-                    !in_array($c->getId(), array_map(
+                    !\in_array($c->getId(), array_map(
                         static fn (Center $c) => $c->getId(),
                         $centers
                     ), true)
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php b/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
index b1380f2ba..c8d69c119 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
@@ -14,9 +14,7 @@ namespace Chill\EventBundle\Form\Type;
 use Chill\EventBundle\Entity\EventType;
 use Chill\EventBundle\Entity\Role;
 use Chill\EventBundle\Repository\RoleRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -96,9 +94,9 @@ final class PickRoleType extends AbstractType
                 'data-event-type' => $r->getType()->getId(),
                 'data-link-category' => $r->getType()->getId(),
             ],
-            'choice_label' => static fn (Role $r) => $translatableStringHelper->localize($r->getName()) .
-                      ($r->getActive() === true ? '' :
-                            ' (' . $translator->trans('unactive') . ')'),
+            'choice_label' => static fn (Role $r) => $translatableStringHelper->localize($r->getName()).
+                      (true === $r->getActive() ? '' :
+                            ' ('.$translator->trans('unactive').')'),
         ]);
     }
 
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php b/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
index 6288c59c3..3f4ab3624 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
@@ -14,9 +14,7 @@ namespace Chill\EventBundle\Form\Type;
 use Chill\EventBundle\Entity\EventType;
 use Chill\EventBundle\Entity\Status;
 use Chill\EventBundle\Repository\StatusRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -93,9 +91,9 @@ final class PickStatusType extends AbstractType
                 'data-event-type' => $s->getType()->getId(),
                 'data-link-category' => $s->getType()->getId(),
             ],
-            'choice_label' => static fn (Status $s) => $translatableStringHelper->localize($s->getName()) .
-                      ($s->getActive() === true ? '' :
-                            ' (' . $translator->trans('unactive') . ')'),
+            'choice_label' => static fn (Status $s) => $translatableStringHelper->localize($s->getName()).
+                      (true === $s->getActive() ? '' :
+                            ' ('.$translator->trans('unactive').')'),
         ]);
     }
 
diff --git a/src/Bundle/ChillEventBundle/Repository/EventRepository.php b/src/Bundle/ChillEventBundle/Repository/EventRepository.php
index 85ec84959..7406748b4 100644
--- a/src/Bundle/ChillEventBundle/Repository/EventRepository.php
+++ b/src/Bundle/ChillEventBundle/Repository/EventRepository.php
@@ -13,7 +13,6 @@ namespace Chill\EventBundle\Repository;
 
 use Chill\EventBundle\Entity\Event;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
diff --git a/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php b/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php
index e6330ce3d..7c0c13edf 100644
--- a/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php
+++ b/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php
@@ -28,8 +28,6 @@ class ParticipationRepository extends ServiceEntityRepository
     /**
      * Count number of participations per person.
      *
-     * @param $person_id
-     *
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function countByPerson($person_id): int
@@ -44,13 +42,6 @@ class ParticipationRepository extends ServiceEntityRepository
 
     /**
      * Return paginated participations for a person and in reachables circles.
-     *
-     * @param $person_id
-     * @param $reachablesCircles
-     * @param $first
-     * @param $max
-     *
-     * @return mixed
      */
     public function findByPersonInCircle($person_id, $reachablesCircles, $first, $max)
     {
diff --git a/src/Bundle/ChillEventBundle/Repository/RoleRepository.php b/src/Bundle/ChillEventBundle/Repository/RoleRepository.php
index d38ac1354..fa0524a6d 100644
--- a/src/Bundle/ChillEventBundle/Repository/RoleRepository.php
+++ b/src/Bundle/ChillEventBundle/Repository/RoleRepository.php
@@ -21,5 +21,4 @@ class RoleRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, Role::class);
     }
-
 }
diff --git a/src/Bundle/ChillEventBundle/Search/EventSearch.php b/src/Bundle/ChillEventBundle/Search/EventSearch.php
index 40e55088a..57cb9e9c5 100644
--- a/src/Bundle/ChillEventBundle/Search/EventSearch.php
+++ b/src/Bundle/ChillEventBundle/Search/EventSearch.php
@@ -18,11 +18,7 @@ use Chill\MainBundle\Search\AbstractSearch;
 use Chill\MainBundle\Search\SearchInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface as TemplatingEngine;
-
-use function count;
 
 /**
  * Search within Events.
@@ -90,7 +86,7 @@ class EventSearch extends AbstractSearch
         foreach ($search as $item) {
             $results[] = [
                 'id' => $item->getId(),
-                'text' => $item->getDate()->format('d/m/Y, H:i') . ' → ' .
+                'text' => $item->getDate()->format('d/m/Y, H:i').' → '.
                           // $item->getType()->getName()['fr'] . ':  ' .    // display the type of event
                           $item->getName(),
             ];
@@ -115,7 +111,7 @@ class EventSearch extends AbstractSearch
             'CHILL_EVENT_SEE'
         );
 
-        if (count($reachableCenters) === 0) {
+        if (0 === \count($reachableCenters)) {
             // add a clause to block all events
             $where = $qb->expr()->isNull('e.center');
             $qb->andWhere($where);
@@ -124,18 +120,18 @@ class EventSearch extends AbstractSearch
             $orWhere = $qb->expr()->orX();
 
             foreach ($reachableCenters as $center) {
-                $n = $n + 1;
+                ++$n;
                 $circles = $this->authorizationHelper->getReachableScopes(
                     $this->security->getUser(),
                     'CHILL_EVENT_SEE',
                     $center
                 );
                 $where = $qb->expr()->andX(
-                    $qb->expr()->eq('e.center', ':center_' . $n),
-                    $qb->expr()->in('e.circle', ':circle_' . $n)
+                    $qb->expr()->eq('e.center', ':center_'.$n),
+                    $qb->expr()->in('e.circle', ':circle_'.$n)
                 );
-                $qb->setParameter('center_' . $n, $center);
-                $qb->setParameter('circle_' . $n, $circles);
+                $qb->setParameter('center_'.$n, $center);
+                $qb->setParameter('circle_'.$n, $circles);
                 $orWhere->add($where);
             }
 
@@ -150,7 +146,7 @@ class EventSearch extends AbstractSearch
             $name = $terms['name'] ?? $terms['_default'];
 
             $where = $qb->expr()->like('UNACCENT(LOWER(e.name))', ':name');
-            $qb->setParameter('name', '%' . $name . '%');
+            $qb->setParameter('name', '%'.$name.'%');
             $qb->andWhere($where);
         }
 
diff --git a/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php b/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
index 7d77bd279..c88f2804a 100644
--- a/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
+++ b/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
@@ -21,10 +21,6 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
-use Symfony\Component\Security\Core\Role\Role;
-
-use function count;
-use function in_array;
 
 /**
  * Description of EventVoter.
@@ -90,14 +86,14 @@ class EventVoter extends AbstractChillVoter implements ProvideRoleHierarchyInter
 
     public function supports($attribute, $subject)
     {
-        return ($subject instanceof Event && in_array($attribute, self::ROLES, true))
-            || ($subject instanceof Person && in_array($attribute, [self::CREATE, self::SEE], true))
+        return ($subject instanceof Event && \in_array($attribute, self::ROLES, true))
+            || ($subject instanceof Person && \in_array($attribute, [self::CREATE, self::SEE], true))
             || (null === $subject && self::SEE === $attribute);
     }
 
     /**
      * @param string $attribute
-     * @param Event $subject
+     * @param Event  $subject
      *
      * @return bool
      */
@@ -121,7 +117,7 @@ class EventVoter extends AbstractChillVoter implements ProvideRoleHierarchyInter
         $centers = $this->authorizationHelper
             ->getReachableCenters($token->getUser(), $attribute);
 
-        return count($centers) > 0;
+        return \count($centers) > 0;
 
         if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
             return false;
diff --git a/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php b/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
index b6b8c7b3b..ad2e90377 100644
--- a/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
+++ b/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
@@ -21,10 +21,6 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
-use Symfony\Component\Security\Core\Role\Role;
-
-use function count;
-use function in_array;
 
 class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
@@ -87,13 +83,13 @@ class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierar
 
     public function supports($attribute, $subject)
     {
-        return ($subject instanceof Participation && in_array($attribute, self::ROLES, true))
-            || ($subject instanceof Person && in_array($attribute, [self::CREATE, self::SEE], true))
+        return ($subject instanceof Participation && \in_array($attribute, self::ROLES, true))
+            || ($subject instanceof Person && \in_array($attribute, [self::CREATE, self::SEE], true))
             || (null === $subject && self::SEE === $attribute);
     }
 
     /**
-     * @param string $attribute
+     * @param string        $attribute
      * @param Participation $subject
      *
      * @return bool
@@ -118,7 +114,7 @@ class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierar
         $centers = $this->authorizationHelper
             ->getReachableCenters($token->getUser(), $attribute);
 
-        return count($centers) > 0;
+        return \count($centers) > 0;
 
         if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
             return false;
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php
index a7e316d5d..4af365b75 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EventControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php
index d5fec449c..0fd2e38d5 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EventTypeControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
index 7de774e92..6532f76ac 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
@@ -13,12 +13,12 @@ namespace Chill\EventBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use function count;
-use function in_array;
 
 /**
  * Test the creation of participation controller.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ParticipationControllerTest extends WebTestCase
@@ -83,7 +83,7 @@ final class ParticipationControllerTest extends WebTestCase
             400,
             $this->client->getResponse()->getStatusCode(),
             'Test that /fr/event/participation/create fail if '
-                . 'both person_id and persons_ids are missing'
+                .'both person_id and persons_ids are missing'
         );
 
         // having both person_id and persons_ids
@@ -103,7 +103,7 @@ final class ParticipationControllerTest extends WebTestCase
             400,
             $this->client->getResponse()->getStatusCode(),
             'test that /fr/event/participation/create fail if both person_id and '
-                . 'persons_ids are set'
+                .'persons_ids are set'
         );
 
         // missing event_id
@@ -141,7 +141,7 @@ final class ParticipationControllerTest extends WebTestCase
         /** @var \Chill\EventBundle\Entity\Event $event */
         $event = $this->getRandomEventWithMultipleParticipations();
 
-        $crawler = $this->client->request('GET', '/fr/event/participation/' . $event->getId() .
+        $crawler = $this->client->request('GET', '/fr/event/participation/'.$event->getId().
                 '/edit_multiple');
 
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
@@ -157,7 +157,7 @@ final class ParticipationControllerTest extends WebTestCase
         ]);
 
         $this->assertTrue($this->client->getResponse()
-            ->isRedirect('/fr/event/event/' . $event->getId() . '/show'));
+            ->isRedirect('/fr/event/event/'.$event->getId().'/show'));
     }
 
     public function testNewActionWrongParameters()
@@ -177,7 +177,7 @@ final class ParticipationControllerTest extends WebTestCase
             400,
             $this->client->getResponse()->getStatusCode(),
             'Test that /fr/event/participation/new fail if '
-                . 'both person_id and persons_ids are missing'
+                .'both person_id and persons_ids are missing'
         );
 
         // having both person_id and persons_ids
@@ -197,7 +197,7 @@ final class ParticipationControllerTest extends WebTestCase
             400,
             $this->client->getResponse()->getStatusCode(),
             'test that /fr/event/participation/new fail if both person_id and '
-                . 'persons_ids are set'
+                .'persons_ids are set'
         );
 
         // missing event_id
@@ -285,11 +285,11 @@ final class ParticipationControllerTest extends WebTestCase
         $crawler = $this->client->followRedirect();
 
         $span1 = $crawler->filter('table td span.entity-person a:contains("'
-                . $person1->getFirstName() . '"):contains("' . $person1->getLastname() . '")');
-        $this->assertGreaterThan(0, count($span1));
+                .$person1->getFirstName().'"):contains("'.$person1->getLastname().'")');
+        $this->assertGreaterThan(0, \count($span1));
         $span2 = $crawler->filter('table td span.entity-person a:contains("'
-                . $person2->getFirstName() . '"):contains("' . $person2->getLastname() . '")');
-        $this->assertGreaterThan(0, count($span2));
+                .$person2->getFirstName().'"):contains("'.$person2->getLastname().'")');
+        $this->assertGreaterThan(0, \count($span2));
 
         // as the container has reloaded, reload the event
         $event = $this->em->getRepository(\Chill\EventBundle\Entity\Event::class)->find($event->getId());
@@ -338,10 +338,7 @@ final class ParticipationControllerTest extends WebTestCase
         $newPerson = $this->getRandomPerson();
 
         // build the `persons_ids` parameter
-        $persons_ids_string = implode(',', array_merge(
-            $persons_id,
-            [$newPerson->getId()]
-        ));
+        $persons_ids_string = implode(',', [...$persons_id, $newPerson->getId()]);
 
         $crawler = $this->client->request(
             'GET',
@@ -360,8 +357,8 @@ final class ParticipationControllerTest extends WebTestCase
 
         // count that the one UL contains the new person string
         $firstPerson = $event->getParticipations()->first()->getPerson();
-        $ul = $crawler->filter('ul:contains("' . $firstPerson->getLastName() . '")'
-                . ':contains("' . $firstPerson->getFirstName() . '")');
+        $ul = $crawler->filter('ul:contains("'.$firstPerson->getLastName().'")'
+                .':contains("'.$firstPerson->getFirstName().'")');
 
         $this->assertEquals(
             1,
@@ -434,9 +431,9 @@ final class ParticipationControllerTest extends WebTestCase
         $crawler = $this->client->followRedirect();
 
         $span = $crawler->filter('table td span.entity-person a:contains("'
-                . $person->getFirstName() . '"):contains("' . $person->getLastname() . '")');
+                .$person->getFirstName().'"):contains("'.$person->getLastname().'")');
 
-        $this->assertGreaterThan(0, count($span));
+        $this->assertGreaterThan(0, \count($span));
 
         // as the container has reloaded, reload the event
         $event = $this->em->getRepository(\Chill\EventBundle\Entity\Event::class)->find($event->getId());
@@ -446,7 +443,6 @@ final class ParticipationControllerTest extends WebTestCase
     }
 
     /**
-     *
      * @return \Chill\EventBundle\Entity\Event
      */
     protected function getRandomEvent(mixed $centerName = 'Center A', mixed $circleName = 'social')
@@ -456,7 +452,7 @@ final class ParticipationControllerTest extends WebTestCase
 
         $circles = $this->em->getRepository(\Chill\MainBundle\Entity\Scope::class)
             ->findAll();
-        array_filter($circles, static fn ($circle) => in_array($circleName, $circle->getName(), true));
+        array_filter($circles, static fn ($circle) => \in_array($circleName, $circle->getName(), true));
         $circle = $circles[0];
 
         $events = $this->em->getRepository(\Chill\EventBundle\Entity\Event::class)
@@ -469,7 +465,7 @@ final class ParticipationControllerTest extends WebTestCase
      * Return a random event only if he has more than one participation.
      *
      * @param string $centerName
-     * @param type $circleName
+     * @param type   $circleName
      *
      * @return \Chill\EventBundle\Entity\Event
      */
@@ -507,7 +503,7 @@ final class ParticipationControllerTest extends WebTestCase
 
         $person = $persons[array_rand($persons)];
 
-        if (in_array($person->getId(), $this->personsIdsCache, true)) {
+        if (\in_array($person->getId(), $this->personsIdsCache, true)) {
             return $this->getRandomPerson($centerName); // we try another time
         }
         $this->personsIdsCache[] = $person->getId();
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php
index aaa7fad5a..03f6f4600 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RoleControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php
index 7a35a0a3f..1cc00f9e5 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class StatusControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php
index ffc26c6fd..c37566fe7 100644
--- a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php
@@ -15,12 +15,12 @@ use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Search\EventSearch;
 use DateTime;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use function in_array;
 
 /**
  * Test the EventSearch class.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class EventSearchTest extends WebTestCase
@@ -150,9 +150,9 @@ final class EventSearchTest extends WebTestCase
             'q' => '@events date-from:2016-05-30 date-to:2016-06-20',
         ]);
 
-        /** @var DateTime $dateFrom the date from in DateTime */
-        $dateFrom = DateTime::createFromFormat('Y-m-d', '2016-05-30');
-        $dateTo = DateTime::createFromFormat('Y-m-d', '2016-06-20');
+        /** @var \DateTime $dateFrom the date from in DateTime */
+        $dateFrom = \DateTime::createFromFormat('Y-m-d', '2016-05-30');
+        $dateTo = \DateTime::createFromFormat('Y-m-d', '2016-06-20');
 
         $dates = $this->iterateOnRowsToFindDate($crawler->filter('tr'));
 
@@ -164,7 +164,7 @@ final class EventSearchTest extends WebTestCase
         // there should not have any other results, but if any other bundle
         // add some other event, we go on next pages
 
-        if ($crawler->selectLink('Voir tous les résultats')->count() === 0) {
+        if (0 === $crawler->selectLink('Voir tous les résultats')->count()) {
             return;
         }
 
@@ -178,7 +178,7 @@ final class EventSearchTest extends WebTestCase
             $this->assertLessThanOrEqual($dateTo, $date);
         }
 
-        //iterate on pagination
+        // iterate on pagination
         $crawlerAllResults->filter('.pagination a')->each(function ($a, $i) use ($dateFrom) {
             $page = $this->client->click($a->link());
             $dates = $this->iterateOnRowsToFindDate($page->filter('tr'));
@@ -196,8 +196,8 @@ final class EventSearchTest extends WebTestCase
         $crawler = $this->client->request('GET', '/fr/search', [
             'q' => '@events date-from:2016-05-30',
         ]);
-        /** @var DateTime $dateFrom the date from in DateTime */
-        $dateFrom = DateTime::createFromFormat('Y-m-d', '2016-05-30');
+        /** @var \DateTime $dateFrom the date from in DateTime */
+        $dateFrom = \DateTime::createFromFormat('Y-m-d', '2016-05-30');
 
         $dates = $this->iterateOnRowsToFindDate($crawler->filter('tr'));
 
@@ -214,7 +214,7 @@ final class EventSearchTest extends WebTestCase
             $this->assertGreaterThanOrEqual($dateFrom, $date);
         }
 
-        //iterate on pagination
+        // iterate on pagination
         $crawlerAllResults->filter('.pagination a')->each(function ($a, $i) use ($dateFrom) {
             $page = $this->client->click($a->link());
             $dates = $this->iterateOnRowsToFindDate($page->filter('tr'));
@@ -232,8 +232,8 @@ final class EventSearchTest extends WebTestCase
             'q' => '@events date:2016-05-30',
         ]);
 
-        /** @var DateTime $dateFrom the date from in DateTime */
-        $dateTo = DateTime::createFromFormat('Y-m-d', '2016-05-30');
+        /** @var \DateTime $dateFrom the date from in DateTime */
+        $dateTo = \DateTime::createFromFormat('Y-m-d', '2016-05-30');
 
         $dates = $this->iterateOnRowsToFindDate($crawler->filter('tr'));
 
@@ -241,7 +241,7 @@ final class EventSearchTest extends WebTestCase
             $this->assertLessThanOrEqual($dateTo, $date);
         }
 
-        if ($crawler->selectLink('Voir tous les résultats')->count() === 0) {
+        if (0 === $crawler->selectLink('Voir tous les résultats')->count()) {
             return;
         }
 
@@ -254,7 +254,7 @@ final class EventSearchTest extends WebTestCase
             $this->assertLessThanOrEqual($dateTo, $date);
         }
 
-        //iterate on pagination
+        // iterate on pagination
         $crawlerAllResults->filter('.pagination a')->each(function ($a, $i) {
             $page = $this->client->click($a->link());
             $dates = $this->iterateOnRowsToFindDate($page->filter('tr'));
@@ -307,7 +307,7 @@ final class EventSearchTest extends WebTestCase
     {
         $event1 = (new Event())
             ->setCenter($this->centerA)
-            ->setDate(new DateTime('2016-05-30'))
+            ->setDate(new \DateTime('2016-05-30'))
             ->setName('Printemps européen')
             ->setType($this->eventType)
             ->setCircle($this->getCircle());
@@ -316,7 +316,7 @@ final class EventSearchTest extends WebTestCase
 
         $event2 = (new Event())
             ->setCenter($this->centerA)
-            ->setDate(new DateTime('2016-06-24'))
+            ->setDate(new \DateTime('2016-06-24'))
             ->setName('Hiver de la droite')
             ->setType($this->eventType)
             ->setCircle($this->getCircle());
@@ -338,7 +338,7 @@ final class EventSearchTest extends WebTestCase
 
         /** @var \Chill\MainBundle\Entity\Scope $circle */
         foreach ($circles as $circle) {
-            if (in_array($name, $circle->getName(), true)) {
+            if (\in_array($name, $circle->getName(), true)) {
                 return $circle;
             }
         }
@@ -348,7 +348,7 @@ final class EventSearchTest extends WebTestCase
      * this function iterate on row from results of events and return the content
      * of the second column (which should contains the date) in DateTime objects.
      *
-     * @return DateTime[]
+     * @return \DateTime[]
      */
     private function iterateOnRowsToFindDate(\Symfony\Component\DomCrawler\Crawler $trs)
     {
@@ -375,8 +375,8 @@ final class EventSearchTest extends WebTestCase
                 // transform the date, which should be in french, into a DateTime object
                 $parts = explode(' ', (string) $tdDate->text());
 
-                return DateTime::createFromFormat('Y-m-d', $parts[2] .
-                        '-' . $months[$parts[1]] . '-' . $parts[0]);
+                return \DateTime::createFromFormat('Y-m-d', $parts[2].
+                        '-'.$months[$parts[1]].'-'.$parts[0]);
             }
         });
 
diff --git a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
index 2624e42f5..9e35a6757 100644
--- a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
+++ b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
@@ -20,12 +20,8 @@ use Chill\MainBundle\Timeline\TimelineSingleQuery;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
-use LogicException;
-use RuntimeException;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
-use function count;
-
 /**
  * Class TimelineEventProvider.
  */
@@ -58,7 +54,7 @@ class TimelineEventProvider implements TimelineProviderInterface
         $this->helper = $helper;
 
         if (!$storage->getToken()->getUser() instanceof User) {
-            throw new RuntimeException('A user should be authenticated !');
+            throw new \RuntimeException('A user should be authenticated !');
         }
         $this->user = $storage->getToken()->getUser();
     }
@@ -66,9 +62,9 @@ class TimelineEventProvider implements TimelineProviderInterface
     /**
      * @param string $context
      *
-     * @throws \Doctrine\ORM\Mapping\MappingException
-     *
      * @return array|string[]
+     *
+     * @throws \Doctrine\ORM\Mapping\MappingException
      */
     public function fetchQuery($context, array $args)
     {
@@ -79,9 +75,9 @@ class TimelineEventProvider implements TimelineProviderInterface
         $metadataPerson = $this->em->getClassMetadata('ChillPersonBundle:Person');
 
         return TimelineSingleQuery::fromArray([
-            'id' => $metadataEvent->getTableName() . '.' . $metadataEvent->getColumnName('id'),
+            'id' => $metadataEvent->getTableName().'.'.$metadataEvent->getColumnName('id'),
             'type' => 'event',
-            'date' => $metadataEvent->getTableName() . '.' . $metadataEvent->getColumnName('date'),
+            'date' => $metadataEvent->getTableName().'.'.$metadataEvent->getColumnName('date'),
             'FROM' => $this->getFromClause($metadataEvent, $metadataParticipation, $metadataPerson),
             'WHERE' => $this->getWhereClause($metadataEvent, $metadataParticipation, $metadataPerson, $args['person']),
             'parameters' => [],
@@ -106,7 +102,7 @@ class TimelineEventProvider implements TimelineProviderInterface
     }
 
     /**
-     * @param Event $entity
+     * @param Event  $entity
      * @param string $context
      *
      * @return array|mixed[]
@@ -140,20 +136,19 @@ class TimelineEventProvider implements TimelineProviderInterface
      *
      * @param string $context
      *
-     * @throws LogicException if the context is not supported
+     * @throws \LogicException if the context is not supported
      */
     private function checkContext($context)
     {
         if ('person' !== $context) {
-            throw new LogicException("The context '{$context}' is not "
-                . "supported. Currently only 'person' is supported");
+            throw new \LogicException("The context '{$context}' is not supported. Currently only 'person' is supported");
         }
     }
 
     /**
-     * @throws \Doctrine\ORM\Mapping\MappingException
-     *
      * @return string
+     *
+     * @throws \Doctrine\ORM\Mapping\MappingException
      */
     private function getFromClause(
         ClassMetadata $metadataEvent,
@@ -164,23 +159,23 @@ class TimelineEventProvider implements TimelineProviderInterface
         $participationPersonMapping = $metadataParticipation->getAssociationMapping('person');
 
         return $metadataEvent->getTableName()
-            . ' JOIN ' . $metadataParticipation->getTableName()
-            . ' ON ' . $metadataParticipation->getTableName()
-            . '.' . $eventParticipationMapping['joinColumns'][0]['name']
-            . ' = ' . $metadataEvent->getTableName()
-            . '.' . $eventParticipationMapping['joinColumns'][0]['referencedColumnName']
+            .' JOIN '.$metadataParticipation->getTableName()
+            .' ON '.$metadataParticipation->getTableName()
+            .'.'.$eventParticipationMapping['joinColumns'][0]['name']
+            .' = '.$metadataEvent->getTableName()
+            .'.'.$eventParticipationMapping['joinColumns'][0]['referencedColumnName']
 
-            . ' JOIN ' . $metadataPerson->getTableName()
-            . ' ON ' . $metadataPerson->getTableName()
-            . '.' . $participationPersonMapping['joinColumns'][0]['referencedColumnName']
-            . ' = ' . $metadataParticipation->getTableName()
-            . '.' . $participationPersonMapping['joinColumns'][0]['name'];
+            .' JOIN '.$metadataPerson->getTableName()
+            .' ON '.$metadataPerson->getTableName()
+            .'.'.$participationPersonMapping['joinColumns'][0]['referencedColumnName']
+            .' = '.$metadataParticipation->getTableName()
+            .'.'.$participationPersonMapping['joinColumns'][0]['name'];
     }
 
     /**
-     * @throws \Doctrine\ORM\Mapping\MappingException
-     *
      * @return string
+     *
+     * @throws \Doctrine\ORM\Mapping\MappingException
      */
     private function getWhereClause(
         ClassMetadata $metadataEvent,
@@ -193,7 +188,7 @@ class TimelineEventProvider implements TimelineProviderInterface
         $reachableCenters = $this->helper->getReachableCenters($this->user, $role);
         $associationMapping = $metadataParticipation->getAssociationMapping('person');
 
-        if (count($reachableCenters) === 0) {
+        if (0 === \count($reachableCenters)) {
             return 'FALSE = TRUE';
         }
 
@@ -213,15 +208,15 @@ class TimelineEventProvider implements TimelineProviderInterface
             );
             $centerAndScopeLines[] = sprintf(
                 '(%s = %d AND %s IN (%s))',
-                $metadataPerson->getTableName() . '.' .
+                $metadataPerson->getTableName().'.'.
                 $metadataPerson->getAssociationMapping('center')['joinColumns'][0]['name'],
                 $center->getId(),
-                $metadataEvent->getTableName() . '.' .
+                $metadataEvent->getTableName().'.'.
                 $metadataEvent->getAssociationMapping('circle')['joinColumns'][0]['name'],
                 implode(',', $reachableCircleId)
             );
         }
-        $whereClause .= ' AND (' . implode(' OR ', $centerAndScopeLines) . ')';
+        $whereClause .= ' AND ('.implode(' OR ', $centerAndScopeLines).')';
 
         return $whereClause;
     }
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php b/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
index ab7669cc2..4689fe413 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
@@ -22,7 +22,7 @@ class Version20160318111334 extends AbstractMigration
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_event_role DROP CONSTRAINT FK_AA714E54C54C8C93');
         $this->addSql('ALTER TABLE chill_event_status DROP CONSTRAINT FK_A6CC85D0C54C8C93');
@@ -51,7 +51,7 @@ class Version20160318111334 extends AbstractMigration
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE chill_event_event_type_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE chill_event_role_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
@@ -59,37 +59,37 @@ class Version20160318111334 extends AbstractMigration
         $this->addSql('CREATE SEQUENCE chill_event_event_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE chill_event_participation_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_event_event_type ('
-                . 'id INT NOT NULL, name JSON NOT NULL, '
-                . 'active BOOLEAN NOT NULL, PRIMARY KEY(id))');
+                .'id INT NOT NULL, name JSON NOT NULL, '
+                .'active BOOLEAN NOT NULL, PRIMARY KEY(id))');
         $this->addSql('CREATE TABLE chill_event_role ('
-                . 'id INT NOT NULL, '
-                . 'type_id INT DEFAULT NULL, '
-                . 'name JSON NOT NULL, '
-                . 'active BOOLEAN NOT NULL, '
-                . 'PRIMARY KEY(id))');
+                .'id INT NOT NULL, '
+                .'type_id INT DEFAULT NULL, '
+                .'name JSON NOT NULL, '
+                .'active BOOLEAN NOT NULL, '
+                .'PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_AA714E54C54C8C93 ON chill_event_role (type_id)');
         $this->addSql('CREATE TABLE chill_event_status (id INT NOT NULL, '
-                . 'type_id INT DEFAULT NULL, '
-                . 'name JSON NOT NULL, '
-                . 'active BOOLEAN NOT NULL, '
-                . 'PRIMARY KEY(id))');
+                .'type_id INT DEFAULT NULL, '
+                .'name JSON NOT NULL, '
+                .'active BOOLEAN NOT NULL, '
+                .'PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_A6CC85D0C54C8C93 ON chill_event_status (type_id)');
         $this->addSql('CREATE TABLE chill_event_event ('
-                . 'id INT NOT NULL, '
-                . 'name VARCHAR(150) NOT NULL, '
-                . 'date DATE NOT NULL, '
-                . 'center_id INT DEFAULT NULL, '
-                . 'type_id INT DEFAULT NULL, '
-                . 'circle_id INT DEFAULT NULL, '
-                . 'PRIMARY KEY(id))');
+                .'id INT NOT NULL, '
+                .'name VARCHAR(150) NOT NULL, '
+                .'date DATE NOT NULL, '
+                .'center_id INT DEFAULT NULL, '
+                .'type_id INT DEFAULT NULL, '
+                .'circle_id INT DEFAULT NULL, '
+                .'PRIMARY KEY(id))');
         $this->addSql('CREATE TABLE chill_event_participation ('
-                . 'id INT NOT NULL, '
-                . 'event_id INT DEFAULT NULL, '
-                . 'person_id INT DEFAULT NULL, '
-                . 'role_id INT DEFAULT NULL, '
-                . 'status_id INT DEFAULT NULL, '
-                . 'lastUpdate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, '
-                . 'PRIMARY KEY(id))');
+                .'id INT NOT NULL, '
+                .'event_id INT DEFAULT NULL, '
+                .'person_id INT DEFAULT NULL, '
+                .'role_id INT DEFAULT NULL, '
+                .'status_id INT DEFAULT NULL, '
+                .'lastUpdate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, '
+                .'PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_4E7768AC71F7E88B ON chill_event_participation (event_id)');
         $this->addSql('CREATE INDEX IDX_4E7768AC217BBB47 ON chill_event_participation (person_id)');
         $this->addSql('CREATE INDEX IDX_4E7768ACD60322AC ON chill_event_participation (role_id)');
@@ -99,44 +99,44 @@ class Version20160318111334 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_FA320FC870EE2FF6 ON chill_event_event (circle_id)');
 
         $this->addSql('ALTER TABLE chill_event_event '
-              . 'ADD CONSTRAINT FK_FA320FC85932F377 FOREIGN KEY (center_id) '
-              . 'REFERENCES centers (id) '
-              . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'ADD CONSTRAINT FK_FA320FC85932F377 FOREIGN KEY (center_id) '
+              .'REFERENCES centers (id) '
+              .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_event '
-              . 'ADD CONSTRAINT FK_FA320FC870EE2FF6 FOREIGN KEY (circle_id) '
-              . 'REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'ADD CONSTRAINT FK_FA320FC870EE2FF6 FOREIGN KEY (circle_id) '
+              .'REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_event '
-              . 'ADD CONSTRAINT FK_FA320FC8C54C8C93 FOREIGN KEY (type_id) '
-              . 'REFERENCES chill_event_event_type (id) '
-              . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'ADD CONSTRAINT FK_FA320FC8C54C8C93 FOREIGN KEY (type_id) '
+              .'REFERENCES chill_event_event_type (id) '
+              .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_role '
-                . 'ADD CONSTRAINT FK_AA714E54C54C8C93 FOREIGN KEY (type_id) '
-                . 'REFERENCES chill_event_event_type (id) '
-                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_AA714E54C54C8C93 FOREIGN KEY (type_id) '
+                .'REFERENCES chill_event_event_type (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_status '
-                . 'ADD CONSTRAINT FK_A6CC85D0C54C8C93 '
-                . 'FOREIGN KEY (type_id) '
-                . 'REFERENCES chill_event_event_type (id) '
-                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_A6CC85D0C54C8C93 '
+                .'FOREIGN KEY (type_id) '
+                .'REFERENCES chill_event_event_type (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_participation '
-                . 'ADD CONSTRAINT FK_4E7768AC71F7E88B '
-                . 'FOREIGN KEY (event_id) '
-                . 'REFERENCES chill_event_event (id) '
-                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_4E7768AC71F7E88B '
+                .'FOREIGN KEY (event_id) '
+                .'REFERENCES chill_event_event (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_participation '
-                . 'ADD CONSTRAINT FK_4E7768AC217BBB47 '
-                . 'FOREIGN KEY (person_id) '
-                . 'REFERENCES Person (id) '
-                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_4E7768AC217BBB47 '
+                .'FOREIGN KEY (person_id) '
+                .'REFERENCES Person (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_participation '
-                . 'ADD CONSTRAINT FK_4E7768ACD60322AC '
-                . 'FOREIGN KEY (role_id) '
-                . 'REFERENCES chill_event_role (id) '
-                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_4E7768ACD60322AC '
+                .'FOREIGN KEY (role_id) '
+                .'REFERENCES chill_event_role (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_participation '
-                . 'ADD CONSTRAINT FK_4E7768AC6BF700BD '
-                . 'FOREIGN KEY (status_id) '
-                . 'REFERENCES chill_event_status (id) '
-                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_4E7768AC6BF700BD '
+                .'FOREIGN KEY (status_id) '
+                .'REFERENCES chill_event_status (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
 }
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php b/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php
index b28a758ff..bc004119e 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php
@@ -21,7 +21,7 @@ final class Version20190110140538 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_event_event ALTER date TYPE DATE');
         $this->addSql('ALTER TABLE chill_event_event ALTER date DROP DEFAULT');
@@ -29,7 +29,7 @@ final class Version20190110140538 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_event_event ALTER date TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
         $this->addSql('ALTER TABLE chill_event_event ALTER date DROP DEFAULT');
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php b/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php
index 1ab430f00..c0ced1044 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php
@@ -22,7 +22,7 @@ final class Version20190115140042 extends AbstractMigration
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_event_event DROP CONSTRAINT FK_FA320FC8D0AFA354');
         $this->addSql('DROP INDEX IDX_FA320FC8D0AFA354');
@@ -32,7 +32,7 @@ final class Version20190115140042 extends AbstractMigration
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_event_event ADD moderator_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_event_event ADD CONSTRAINT FK_FA320FC8D0AFA354 FOREIGN KEY (moderator_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php b/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php
index 64764ac5b..f9d64da75 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php
@@ -22,7 +22,7 @@ final class Version20190201143121 extends AbstractMigration
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_event_event DROP CONSTRAINT fk_fa320fc8d0afa354');
         $this->addSql('ALTER TABLE chill_event_event ADD CONSTRAINT fk_fa320fc8d0afa354 FOREIGN KEY (moderator_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
@@ -31,7 +31,7 @@ final class Version20190201143121 extends AbstractMigration
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_event_event DROP CONSTRAINT FK_FA320FC8D0AFA354');
         $this->addSql('ALTER TABLE chill_event_event ADD CONSTRAINT FK_FA320FC8D0AFA354 FOREIGN KEY (moderator_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
diff --git a/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php b/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php
index 891cf8072..c3c7b9dc1 100644
--- a/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php
@@ -38,10 +38,10 @@ class CRUDControllerCompilerPass implements CompilerPassInterface
     private function configureCrudController(ContainerBuilder $container, array $crudEntry, string $apiOrCrud): void
     {
         $controllerClass = $crudEntry['controller'];
-        $controllerServiceName = 'cs' . $apiOrCrud . '_' . $crudEntry['name'] . '_controller';
+        $controllerServiceName = 'cs'.$apiOrCrud.'_'.$crudEntry['name'].'_controller';
 
         // create config parameter in container
-        $param = 'chill_main_' . $apiOrCrud . '_config_' . $crudEntry['name'];
+        $param = 'chill_main_'.$apiOrCrud.'_config_'.$crudEntry['name'];
         $container->setParameter($param, $crudEntry);
 
         if ($container->hasDefinition($controllerClass)) {
@@ -51,7 +51,7 @@ class CRUDControllerCompilerPass implements CompilerPassInterface
 
             // add the "addMethodCall"
             $container->getDefinition($controllerClass)
-                ->addMethodCall('setCrudConfig', ['%' . $param . '%']);
+                ->addMethodCall('setCrudConfig', ['%'.$param.'%']);
         } else {
             $controller = new Definition($controllerClass);
 
@@ -59,7 +59,7 @@ class CRUDControllerCompilerPass implements CompilerPassInterface
             $controller->setAutoconfigured(true);
             $controller->setPublic(true);
 
-            $controller->addMethodCall('setCrudConfig', ['%' . $param . '%']);
+            $controller->addMethodCall('setCrudConfig', ['%'.$param.'%']);
 
             $container->setDefinition($controllerServiceName, $controller);
         }
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
index c538cc4d6..cfbe52218 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
@@ -23,8 +23,6 @@ use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_merge;
-
 abstract class AbstractCRUDController extends AbstractController
 {
     /**
@@ -49,14 +47,12 @@ abstract class AbstractCRUDController extends AbstractController
             return $this->crudConfig['base_role'];
         }
 
-        throw new \RuntimeException(sprintf('the config does not have any role for the ' .
-            'method %s nor a global role for the whole action. Add those to your ' .
-            'configuration or override the required method', $request->getMethod()));
+        throw new \RuntimeException(sprintf('the config does not have any role for the method %s nor a global role for the whole action. Add those to your configuration or override the required method', $request->getMethod()));
     }
 
     public static function getSubscribedServices(): array
     {
-        return array_merge(
+        return \array_merge(
             parent::getSubscribedServices(),
             [
                 'chill_main.paginator_factory' => PaginatorFactory::class,
@@ -153,7 +149,7 @@ abstract class AbstractCRUDController extends AbstractController
     }
 
     /**
-     * @return string The crud name.
+     * @return string the crud name
      */
     protected function getCrudName(): string
     {
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
index 1209a8f07..345da5bc5 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
@@ -13,9 +13,6 @@ namespace Chill\MainBundle\CRUD\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
-use Exception;
-use LogicException;
-use RuntimeException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -24,15 +21,11 @@ use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 
-use function array_merge;
-use function ucfirst;
-
 class ApiController extends AbstractCRUDController
 {
     /**
      * Base method for handling api action.
      *
-     * @param string $_format
      * @return void
      */
     public function entityApi(Request $request, mixed $id, ?string $_format = 'json'): Response
@@ -51,8 +44,7 @@ class ApiController extends AbstractCRUDController
         $entity = $this->getEntity($action, $id, $request);
 
         if (null === $entity) {
-            throw $this->createNotFoundException(sprintf('The %s with id %s '
-                . 'is not found', $this->getCrudName(), $id));
+            throw $this->createNotFoundException(sprintf('The %s with id %s is not found', $this->getCrudName(), $id));
         }
 
         $response = $this->checkACL($action, $request, $_format, $entity);
@@ -119,8 +111,7 @@ class ApiController extends AbstractCRUDController
         }
 
         if (null === $entity) {
-            throw $this->createNotFoundException(sprintf('The %s with id %s '
-                . 'is not found', $this->getCrudName(), $id));
+            throw $this->createNotFoundException(sprintf('The %s with id %s is not found', $this->getCrudName(), $id));
         }
 
         $response = $this->checkACL($action, $request, $_format, $entity);
@@ -214,10 +205,11 @@ class ApiController extends AbstractCRUDController
      *
      * @param string action
      * @param mixed id
-     * @param string $property the name of the property. This will be used to make a `add+$property` and `remove+$property` method
-     * @param string $postedDataType the type of the posted data (the content)
+     * @param string $property          the name of the property. This will be used to make a `add+$property` and `remove+$property` method
+     * @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 bool   $forcePersist      force to persist the created element (only for POST request)
+     *
      * @throw BadRequestException if unable to deserialize the posted data
      * @throw BadRequestException if the method is not POST or DELETE
      */
@@ -252,15 +244,14 @@ class ApiController extends AbstractCRUDController
         try {
             $postedData = $this->getSerializer()->deserialize($request->getContent(), $postedDataType, $_format, $postedDataContext);
         } catch (\Symfony\Component\Serializer\Exception\UnexpectedValueException $e) {
-            throw new BadRequestHttpException(sprintf('Unable to deserialize posted ' .
-                'data: %s', $e->getMessage()), $e, 0);
+            throw new BadRequestHttpException(sprintf('Unable to deserialize posted data: %s', $e->getMessage()), $e, 0);
         }
 
         match ($request->getMethod()) {
-            /* @phpstan-ignore-next-line  */
-            Request::METHOD_DELETE => $entity->{'remove' . ucfirst($property)}($postedData),
-            /* @phpstan-ignore-next-line  */
-            Request::METHOD_POST => $entity->{'add' . ucfirst($property)}($postedData),
+            /* @phpstan-ignore-next-line */
+            Request::METHOD_DELETE => $entity->{'remove'.\ucfirst($property)}($postedData),
+            /* @phpstan-ignore-next-line */
+            Request::METHOD_POST => $entity->{'add'.\ucfirst($property)}($postedData),
             default => throw new BadRequestHttpException('this method is not supported'),
         };
 
@@ -277,7 +268,7 @@ class ApiController extends AbstractCRUDController
             return $this->json($errors, 422);
         }
 
-        if ($forcePersist && $request->getMethod() === Request::METHOD_POST) {
+        if ($forcePersist && Request::METHOD_POST === $request->getMethod()) {
             $this->getDoctrine()->getManager()->persist($postedData);
         }
 
@@ -288,6 +279,7 @@ class ApiController extends AbstractCRUDController
         if ($response instanceof Response) {
             return $response;
         }
+
         return match ($request->getMethod()) {
             Request::METHOD_DELETE => $this->json('', Response::HTTP_OK),
             Request::METHOD_POST => $this->json(
@@ -296,7 +288,7 @@ class ApiController extends AbstractCRUDController
                 [],
                 $this->getContextForSerializationPostAlter($action, $request, $_format, $entity, [$postedData])
             ),
-            default => throw new Exception('Unable to handle such request method.'),
+            default => throw new \Exception('Unable to handle such request method.'),
         };
     }
 
@@ -313,7 +305,7 @@ class ApiController extends AbstractCRUDController
             $default[AbstractNormalizer::OBJECT_TO_POPULATE] = $entity;
         }
 
-        $context = array_merge(
+        $context = \array_merge(
             $default,
             $this->getContextForSerialization($action, $request, $_format, $entity)
         );
@@ -438,7 +430,7 @@ class ApiController extends AbstractCRUDController
         return match ($request->getMethod()) {
             Request::METHOD_GET => ['groups' => ['read']],
             Request::METHOD_PUT, Request::METHOD_PATCH, Request::METHOD_POST => ['groups' => ['write']],
-            default => throw new LogicException('get context for serialization is not implemented for this method'),
+            default => throw new \LogicException('get context for serialization is not implemented for this method'),
         };
     }
 
@@ -453,7 +445,6 @@ class ApiController extends AbstractCRUDController
         return ['groups' => ['read']];
     }
 
-
     protected function getSerializer(): SerializerInterface
     {
         return $this->get('serializer');
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index c23b2b536..39cef87b7 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -19,7 +19,6 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\FormInterface;
@@ -30,9 +29,6 @@ use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-use function array_merge;
-
 class CRUDController extends AbstractController
 {
     /**
@@ -47,9 +43,6 @@ class CRUDController extends AbstractController
         return new Response($parameter);
     }
 
-    /**
-     * @param $id
-     */
     public function delete(Request $request, $id): Response
     {
         return $this->deleteAction('delete', $request, $id);
@@ -75,7 +68,7 @@ class CRUDController extends AbstractController
 
     public static function getSubscribedServices(): array
     {
-        return array_merge(
+        return \array_merge(
             parent::getSubscribedServices(),
             [
                 'chill_main.paginator_factory' => PaginatorFactory::class,
@@ -178,7 +171,6 @@ class CRUDController extends AbstractController
      * Throw an \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
      * if not accessible.
      *
-     *
      * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
      */
     protected function checkACL(string $action, mixed $entity)
@@ -189,7 +181,7 @@ class CRUDController extends AbstractController
     /**
      * Count the number of entities.
      */
-    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    protected function countEntities(string $action, Request $request, FilterOrderHelper $filterOrder = null): int
     {
         return $this->buildQueryEntities($action, $request)
             ->select('COUNT(e)')
@@ -217,10 +209,8 @@ class CRUDController extends AbstractController
      *
      * It is preferable to override customizeForm instead of overriding
      * this method.
-     *
-     * @param string $formClass
      */
-    protected function createFormFor(string $action, mixed $entity, ?string $formClass = null, array $formOptions = []): FormInterface
+    protected function createFormFor(string $action, mixed $entity, string $formClass = null, array $formOptions = []): FormInterface
     {
         $formClass ??= $this->getFormClassFor($action);
 
@@ -239,7 +229,6 @@ class CRUDController extends AbstractController
     protected function customizeQuery(string $action, Request $request, $query): void {}
 
     /**
-     * @param $id
      * @param null $formClass
      */
     protected function deleteAction(string $action, Request $request, $id, $formClass = null): Response
@@ -255,13 +244,7 @@ class CRUDController extends AbstractController
         }
 
         if (null === $entity) {
-            throw $this->createNotFoundException(
-                sprintf(
-                    'The %s with id %s is not found',
-                    $this->getCrudName(),
-                    $id
-                )
-            );
+            throw $this->createNotFoundException(sprintf('The %s with id %s is not found', $this->getCrudName(), $id));
         }
 
         $response = $this->checkACL($action, $entity);
@@ -300,7 +283,7 @@ class CRUDController extends AbstractController
                 return $result;
             }
 
-            return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_view', ['id' => $entity->getId()]);
+            return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', ['id' => $entity->getId()]);
         }
 
         if ($form->isSubmitted()) {
@@ -321,8 +304,6 @@ class CRUDController extends AbstractController
 
     /**
      * Duplicate an entity.
-     *
-     * @return mixed
      */
     protected function duplicateEntity(string $action, Request $request)
     {
@@ -419,7 +400,7 @@ class CRUDController extends AbstractController
                 return $result;
             }
 
-            return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_view', ['id' => $entity->getId()]);
+            return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', ['id' => $entity->getId()]);
         }
 
         if ($form->isSubmitted()) {
@@ -475,20 +456,15 @@ class CRUDController extends AbstractController
      *     The parameters may be personnalized using `generateTemplateParameter`.
      *
      * @param class-string $formClass
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    protected function formEditAction(string $action, Request $request, mixed $id, ?string $formClass = null, array $formOptions = []): Response
+    protected function formEditAction(string $action, Request $request, mixed $id, string $formClass = null, array $formOptions = []): Response
     {
         $entity = $this->getEntity($action, $id, $request);
 
         if (null === $entity) {
-            throw $this->createNotFoundException(
-                sprintf(
-                    'The %s with id %s is not found',
-                    $this->getCrudName(),
-                    $id
-                )
-            );
+            throw $this->createNotFoundException(sprintf('The %s with id %s is not found', $this->getCrudName(), $id));
         }
 
         $response = $this->checkACL($action, $entity);
@@ -523,7 +499,7 @@ class CRUDController extends AbstractController
                 return $result;
             }
 
-            return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_index');
+            return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_index');
         }
 
         if ($form->isSubmitted()) {
@@ -574,7 +550,6 @@ class CRUDController extends AbstractController
     /**
      * Customize template parameters.
      *
-     *
      * @return array
      */
     protected function generateTemplateParameter(
@@ -588,8 +563,6 @@ class CRUDController extends AbstractController
 
     /**
      *  Include services.
-     *
-     * @return mixed
      */
     protected function getActionConfig(string $action)
     {
@@ -623,8 +596,6 @@ class CRUDController extends AbstractController
      * get the instance of the entity with the given id.
      *
      * @param string $id
-     *
-     * @return object
      */
     protected function getEntity(mixed $action, $id, Request $request): ?object
     {
@@ -679,15 +650,13 @@ class CRUDController extends AbstractController
 
     /**
      * Get the result of the query.
-     *
-     * @return mixed
      */
     protected function getQueryResult(
         string $action,
         Request $request,
         int $totalItems,
         PaginatorInterface $paginator,
-        ?FilterOrderHelper $filterOrder = null
+        FilterOrderHelper $filterOrder = null
     ) {
         $query = $this->queryEntities($action, $request, $paginator, $filterOrder);
 
@@ -697,7 +666,7 @@ class CRUDController extends AbstractController
     /**
      * @return \Chill\MainBundle\Entity\Center[]
      */
-    protected function getReachableCenters(string $role, ?Scope $scope = null)
+    protected function getReachableCenters(string $role, Scope $scope = null)
     {
         return $this->getAuthorizationHelper()
             ->getReachableCenters($this->getUser(), $role, $scope);
@@ -712,7 +681,7 @@ class CRUDController extends AbstractController
      */
     protected function getRoleFor($action)
     {
-        if (array_key_exists('role', $this->getActionConfig($action))) {
+        if (\array_key_exists('role', $this->getActionConfig($action))) {
             return $this->getActionConfig($action)['role'];
         }
 
@@ -727,11 +696,11 @@ class CRUDController extends AbstractController
      * and view.
      *
      * @param string $action
-     * @param mixed $entity the entity for the current request, or an array of entities
-     *
-     * @throws LogicException if no template are available
+     * @param mixed  $entity the entity for the current request, or an array of entities
      *
      * @return string the path to the template
+     *
+     * @throws \LogicException if no template are available
      */
     protected function getTemplateFor($action, mixed $entity, Request $request)
     {
@@ -745,9 +714,7 @@ class CRUDController extends AbstractController
             'index' => '@ChillMain/CRUD/index.html.twig',
             'view' => '@ChillMain/CRUD/view.html.twig',
             'delete' => '@ChillMain/CRUD/delete.html.twig',
-            default => throw new LogicException("the view for action {$action} is not "
-                . 'defined. You should override ' . __METHOD__ . ' to add this '
-                . 'action'),
+            default => throw new \LogicException("the view for action {$action} is not ".'defined. You should override '.__METHOD__.' to add this action'),
         };
     }
 
@@ -756,10 +723,6 @@ class CRUDController extends AbstractController
         return $this->container->get('translator');
     }
 
-    /**
-     * @param $action
-     * @param $entity
-     */
     protected function hasCustomTemplate($action, $entity, Request $request): bool
     {
         return !empty($this->getActionConfig($action)['template']);
@@ -869,9 +832,9 @@ class CRUDController extends AbstractController
         $next = $request->request->get('submit', 'save-and-close');
 
         return match ($next) {
-            'save-and-close' => $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_index'),
-            'save-and-new' => $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_new', $request->query->all()),
-            default => $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_view', [
+            'save-and-close' => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_index'),
+            'save-and-new' => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_new', $request->query->all()),
+            default => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', [
                 'id' => $entity->getId(),
             ]),
         };
@@ -879,27 +842,16 @@ class CRUDController extends AbstractController
 
     protected function onFormValid(string $action, object $entity, FormInterface $form, Request $request) {}
 
-    /**
-     * @param $action
-     * @param $entity
-     */
     protected function onPostCheckACL($action, Request $request, $entity): ?Response
     {
         return null;
     }
 
-    /**
-     * @param $action
-     * @param $entity
-     */
     protected function onPostFetchEntity($action, Request $request, $entity): ?Response
     {
         return null;
     }
 
-    /**
-     * @param $entity
-     */
     protected function onPostFlush(string $action, $entity, FormInterface $form, Request $request) {}
 
     /**
@@ -912,21 +864,12 @@ class CRUDController extends AbstractController
      */
     protected function onPostIndexFetchQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, mixed $entities) {}
 
-    /**
-     * @param $entity
-     */
     protected function onPostPersist(string $action, $entity, FormInterface $form, Request $request) {}
 
-    /**
-     * @param $entity
-     */
     protected function onPostRemove(string $action, $entity, FormInterface $form, Request $request) {}
 
     protected function onPreDelete(string $action, Request $request) {}
 
-    /**
-     * @param $entity
-     */
     protected function onPreFlush(string $action, $entity, FormInterface $form, Request $request) {}
 
     protected function onPreIndex(string $action, Request $request) {}
@@ -936,14 +879,8 @@ class CRUDController extends AbstractController
      */
     protected function onPreIndexBuildQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator) {}
 
-    /**
-     * @param $entity
-     */
     protected function onPrePersist(string $action, $entity, FormInterface $form, Request $request) {}
 
-    /**
-     * @param $entity
-     */
     protected function onPreRemove(string $action, $entity, FormInterface $form, Request $request) {}
 
     /**
@@ -969,7 +906,7 @@ class CRUDController extends AbstractController
      *
      * @return type
      */
-    protected function queryEntities(string $action, Request $request, PaginatorInterface $paginator, ?FilterOrderHelper $filterOrder = null)
+    protected function queryEntities(string $action, Request $request, PaginatorInterface $paginator, FilterOrderHelper $filterOrder = null)
     {
         $query = $this->buildQueryEntities($action, $request)
             ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
@@ -979,9 +916,6 @@ class CRUDController extends AbstractController
         return $this->orderQuery($action, $query, $request, $paginator);
     }
 
-    /**
-     * @param $entity
-     */
     protected function removeEntity(string $action, $entity, FormInterface $form, Request $request)
     {
         $this->getDoctrine()
@@ -1021,13 +955,7 @@ class CRUDController extends AbstractController
         }
 
         if (null === $entity) {
-            throw $this->createNotFoundException(
-                sprintf(
-                    'The %s with id %s is not found',
-                    $this->getCrudName(),
-                    $id
-                )
-            );
+            throw $this->createNotFoundException(sprintf('The %s with id %s is not found', $this->getCrudName(), $id));
         }
 
         $response = $this->checkACL($action, $entity);
diff --git a/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php b/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
index 6068a5391..535e47c91 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
@@ -12,10 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\CRUD\Resolver;
 
 use Doctrine\ORM\EntityManagerInterface;
-use LogicException;
-
-use function array_key_exists;
-use function strtoupper;
 
 /**
  * Class Resolver.
@@ -65,28 +61,22 @@ class Resolver
     }
 
     /**
-     * @param $crudName
-     * @param $action
-     *
      * @return string
      */
     public function buildDefaultRole($crudName, $action)
     {
         if (empty($this->crudConfig[$crudName]['base_role'])) {
-            throw new LogicException(sprintf('the base role is not defined. You must define '
-                . 'on or override %s or %s methods', __METHOD__, 'getRoleFor'));
+            throw new \LogicException(sprintf('the base role is not defined. You must define on or override %s or %s methods', __METHOD__, 'getRoleFor'));
         }
 
-        return strtoupper(
-            $this->crudConfig[$crudName]['base_role'] .
-            '_' .
+        return \strtoupper(
+            $this->crudConfig[$crudName]['base_role'].
+            '_'.
             $action
         );
     }
 
     /**
-     * @param $key
-     * @param $crudName
      * @param null $action
      *
      * @return string
@@ -102,14 +92,11 @@ class Resolver
     }
 
     /**
-     * @param $crudName
-     * @param $action
-     *
      * @return bool
      */
     public function hasAction($crudName, $action)
     {
-        return array_key_exists(
+        return \array_key_exists(
             $action,
             $this->crudConfig[$crudName]['actions']
         );
diff --git a/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php b/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
index f77113579..7399d7884 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
@@ -11,20 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\CRUD\Routing;
 
-use RuntimeException;
 use Symfony\Component\Config\Loader\Loader;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
-use function array_filter;
-use function array_keys;
-use function array_search;
-use function count;
-use function in_array;
-
-use const ARRAY_FILTER_USE_BOTH;
-
 class CRUDRoutesLoader extends Loader
 {
     private const ALL_INDEX_METHODS = [Request::METHOD_GET, Request::METHOD_HEAD];
@@ -46,13 +37,12 @@ class CRUDRoutesLoader extends Loader
     /**
      * Load routes for CRUD and CRUD Api.
      *
-     * @param mixed $resource
      * @param mixed|null $type
      */
     public function load($resource, $type = null): RouteCollection
     {
         if (true === $this->isLoaded) {
-            throw new RuntimeException('Do not add the "CRUD" loader twice');
+            throw new \RuntimeException('Do not add the "CRUD" loader twice');
         }
 
         $collection = new RouteCollection();
@@ -69,7 +59,6 @@ class CRUDRoutesLoader extends Loader
     }
 
     /**
-     * @param mixed $resource
      * @param null $type
      *
      * @return bool
@@ -81,13 +70,11 @@ class CRUDRoutesLoader extends Loader
 
     /**
      * Load routes for api single.
-     *
-     * @param $crudConfig
      */
     protected function loadApi(array $crudConfig): RouteCollection
     {
         $collection = new RouteCollection();
-        $controller = 'csapi_' . $crudConfig['name'] . '_controller';
+        $controller = 'csapi_'.$crudConfig['name'].'_controller';
 
         foreach ($crudConfig['actions'] as $name => $action) {
             // filter only on single actions
@@ -100,40 +87,38 @@ class CRUDRoutesLoader extends Loader
             $controllerAction = match ($name) {
                 '_entity' => 'entityApi',
                 '_index' => 'indexApi',
-                default => $name . 'Api',
+                default => $name.'Api',
             };
 
             $defaults = [
-                '_controller' => $controller . ':' . ($action['controller_action'] ?? $controllerAction),
+                '_controller' => $controller.':'.($action['controller_action'] ?? $controllerAction),
             ];
 
             // path are rewritten
             // if name === 'default', we rewrite it to nothing :-)
-            $localName = in_array($name, ['_entity', '_index'], true) ? '' : '/' . $name;
+            $localName = \in_array($name, ['_entity', '_index'], true) ? '' : '/'.$name;
 
             if ('collection' === $action['single_collection'] || '_index' === $name) {
-                $localPath = $action['path'] ?? $localName . '.{_format}';
+                $localPath = $action['path'] ?? $localName.'.{_format}';
             } else {
-                $localPath = $action['path'] ?? '/{id}' . $localName . '.{_format}';
+                $localPath = $action['path'] ?? '/{id}'.$localName.'.{_format}';
             }
-            $path = $crudConfig['base_path'] . $localPath;
+            $path = $crudConfig['base_path'].$localPath;
 
             $requirements = $action['requirements'] ?? ['{id}' => '\d+'];
 
-            $methods = array_keys(array_filter(
+            $methods = \array_keys(\array_filter(
                 $action['methods'],
                 static fn ($value, $key) => $value,
-                ARRAY_FILTER_USE_BOTH
+                \ARRAY_FILTER_USE_BOTH
             ));
 
-            if (count($methods) === 0) {
-                throw new RuntimeException("The api configuration named \"{$crudConfig['name']}\", action \"{$name}\", " .
-                    'does not have any allowed methods. You should remove this action from the config ' .
-                    'or allow, at least, one method');
+            if (0 === \count($methods)) {
+                throw new \RuntimeException("The api configuration named \"{$crudConfig['name']}\", action \"{$name}\", ".'does not have any allowed methods. You should remove this action from the config or allow, at least, one method');
             }
 
-            if ('_entity' === $name && in_array(Request::METHOD_POST, $methods, true)) {
-                unset($methods[array_search(Request::METHOD_POST, $methods, true)]);
+            if ('_entity' === $name && \in_array(Request::METHOD_POST, $methods, true)) {
+                unset($methods[\array_search(Request::METHOD_POST, $methods, true)]);
                 $entityPostRoute = $this->createEntityPostRoute(
                     $name,
                     $crudConfig,
@@ -146,7 +131,7 @@ class CRUDRoutesLoader extends Loader
                 );
             }
 
-            if (count($methods) === 0) {
+            if (0 === \count($methods)) {
                 // the only method was POST,
                 // continue to next
                 continue;
@@ -155,7 +140,7 @@ class CRUDRoutesLoader extends Loader
             $route = new Route($path, $defaults, $requirements);
             $route->setMethods($methods);
 
-            $collection->add('chill_api_single_' . $crudConfig['name'] . '_' . $name, $route);
+            $collection->add('chill_api_single_'.$crudConfig['name'].'_'.$name, $route);
         }
 
         return $collection;
@@ -163,35 +148,33 @@ class CRUDRoutesLoader extends Loader
 
     /**
      * Load routes for CRUD (without api).
-     *
-     * @param $crudConfig
      */
     protected function loadCrudConfig($crudConfig): RouteCollection
     {
         $collection = new RouteCollection();
-        $controller = 'cscrud_' . $crudConfig['name'] . '_controller';
+        $controller = 'cscrud_'.$crudConfig['name'].'_controller';
 
         foreach ($crudConfig['actions'] as $name => $action) {
             // defaults (controller name)
             $defaults = [
-                '_controller' => $controller . ':' . ($action['controller_action'] ?? $name),
+                '_controller' => $controller.':'.($action['controller_action'] ?? $name),
             ];
 
             if ('index' === $name) {
-                $path = '{_locale}' . $crudConfig['base_path'];
+                $path = '{_locale}'.$crudConfig['base_path'];
                 $route = new Route($path, $defaults);
             } elseif ('new' === $name) {
-                $path = '{_locale}' . $crudConfig['base_path'] . '/' . $name;
+                $path = '{_locale}'.$crudConfig['base_path'].'/'.$name;
                 $route = new Route($path, $defaults);
             } else {
-                $path = '{_locale}' . $crudConfig['base_path'] . ($action['path'] ?? '/{id}/' . $name);
+                $path = '{_locale}'.$crudConfig['base_path'].($action['path'] ?? '/{id}/'.$name);
                 $requirements = $action['requirements'] ?? [
                     '{id}' => '\d+',
                 ];
                 $route = new Route($path, $defaults, $requirements);
             }
 
-            $collection->add('chill_crud_' . $crudConfig['name'] . '_' . $name, $route);
+            $collection->add('chill_crud_'.$crudConfig['name'].'_'.$name, $route);
         }
 
         return $collection;
@@ -199,11 +182,11 @@ class CRUDRoutesLoader extends Loader
 
     private function createEntityPostRoute(string $name, $crudConfig, array $action, $controller): Route
     {
-        $localPath = $action['path'] . '.{_format}';
+        $localPath = $action['path'].'.{_format}';
         $defaults = [
-            '_controller' => $controller . ':' . ($action['controller_action'] ?? 'entityPost'),
+            '_controller' => $controller.':'.($action['controller_action'] ?? 'entityPost'),
         ];
-        $path = $crudConfig['base_path'] . $localPath;
+        $path = $crudConfig['base_path'].$localPath;
         $requirements = $action['requirements'] ?? [];
         $route = new Route($path, $defaults, $requirements);
         $route->setMethods([Request::METHOD_POST]);
diff --git a/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php b/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php
index 845bc145b..27476fcf2 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php
@@ -35,8 +35,6 @@ class TwigCRUDResolver extends AbstractExtension
     }
 
     /**
-     * @param $configKey
-     * @param $crudName
      * @param null $action
      *
      * @return string
@@ -66,9 +64,6 @@ class TwigCRUDResolver extends AbstractExtension
     }
 
     /**
-     * @param $crudName
-     * @param $action
-     *
      * @return bool
      */
     public function hasAction($crudName, $action)
diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php
index 8ecd5e611..b7cf4e289 100644
--- a/src/Bundle/ChillMainBundle/ChillMainBundle.php
+++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Cron\CronJobInterface;
 use Chill\MainBundle\CRUD\CompilerPass\CRUDControllerCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\ACLFlagsCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\ExportsCompilerPass;
-use Chill\MainBundle\DependencyInjection\CompilerPass\GroupingCenterCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\MenuCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\NotificationCounterCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
diff --git a/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php b/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
index e053827db..0d6dd0998 100644
--- a/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
@@ -17,11 +17,9 @@ use Chill\MainBundle\Entity\PermissionsGroup;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\UserRepository;
 use Doctrine\ORM\EntityManagerInterface;
-use Exception;
 use League\Csv\Reader;
 use League\Csv\Writer;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -33,15 +31,6 @@ use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
-use function array_key_exists;
-use function array_keys;
-use function array_merge;
-use function bin2hex;
-use function count;
-use function implode;
-use function random_bytes;
-use function trim;
-
 class ChillImportUsersCommand extends Command
 {
     /**
@@ -91,7 +80,7 @@ class ChillImportUsersCommand extends Command
             $str[] = $e->getMessage();
         }
 
-        return implode(';', $str);
+        return \implode(';', $str);
     }
 
     protected function configure()
@@ -107,8 +96,8 @@ class ChillImportUsersCommand extends Command
 
     protected function createOrGetGroupCenter(Center $center, PermissionsGroup $pg): GroupCenter
     {
-        if (array_key_exists($center->getId(), $this->groupCenters)) {
-            if (array_key_exists($pg->getId(), $this->groupCenters[$center->getId()])) {
+        if (\array_key_exists($center->getId(), $this->groupCenters)) {
+            if (\array_key_exists($pg->getId(), $this->groupCenters[$center->getId()])) {
                 return $this->groupCenters[$center->getId()][$pg->getId()];
             }
         }
@@ -138,12 +127,12 @@ class ChillImportUsersCommand extends Command
     {
         $user = new User();
         $user
-            ->setEmail(trim((string) $data['email']))
-            ->setUsername(trim((string) $data['username']))
+            ->setEmail(\trim((string) $data['email']))
+            ->setUsername(\trim((string) $data['username']))
             ->setEnabled(true)
             ->setPassword($this->passwordEncoder->encodePassword(
                 $user,
-                bin2hex(random_bytes(32))
+                \bin2hex(\random_bytes(32))
             ));
 
         $errors = $this->validator->validate($user);
@@ -154,8 +143,7 @@ class ChillImportUsersCommand extends Command
             $this->tempOutput->writeln(sprintf('%d errors found with user with username "%s" at line %d', $errors->count(), $data['username'], $offset));
             $this->tempOutput->writeln($errorMessages);
 
-            throw new RuntimeException('Found errors while creating an user. '
-                . 'Watch messages in command output');
+            throw new \RuntimeException('Found errors while creating an user. Watch messages in command output');
         }
 
         $pgs = $this->getPermissionGroup($data['permission group']);
@@ -215,9 +203,10 @@ class ChillImportUsersCommand extends Command
 
         try {
             $this->loadUsers();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             throw $e;
         }
+
         return 0;
     }
 
@@ -239,9 +228,9 @@ class ChillImportUsersCommand extends Command
     protected function getCenters($name)
     {
         // sanitize
-        $name = trim($name);
+        $name = \trim($name);
 
-        if (array_key_exists($name, $this->centers)) {
+        if (\array_key_exists($name, $this->centers)) {
             return $this->centers[$name];
         }
 
@@ -274,8 +263,7 @@ class ChillImportUsersCommand extends Command
                 $this->tempOutput->writeln(sprintf('%d errors found with center with name "%s"', $errors->count(), $name));
                 $this->tempOutput->writeln($errorMessages);
 
-                throw new RuntimeException('Found errors while creating one center. '
-                    . 'Watch messages in command output');
+                throw new \RuntimeException('Found errors while creating one center. Watch messages in command output');
             }
 
             $this->em->persist($center);
@@ -288,7 +276,7 @@ class ChillImportUsersCommand extends Command
 
     protected function getPermissionGroup($alias)
     {
-        if (array_key_exists($alias, $this->permissionGroups)) {
+        if (\array_key_exists($alias, $this->permissionGroups)) {
             return $this->permissionGroups[$alias];
         }
 
@@ -301,30 +289,29 @@ class ChillImportUsersCommand extends Command
             $permissionGroupsByName[$permissionGroup->getName()] = $permissionGroup;
         }
 
-        if (count($permissionGroupsByName) === 0) {
-            throw new RuntimeException('no permission groups found. Create them '
-                . 'before importing users');
+        if (0 === \count($permissionGroupsByName)) {
+            throw new \RuntimeException('no permission groups found. Create them before importing users');
         }
 
         $question = new ChoiceQuestion(
             "To which permission groups associate with \"{$alias}\" ?",
-            array_keys($permissionGroupsByName)
+            \array_keys($permissionGroupsByName)
         );
         $question
             ->setMultiselect(true)
-            ->setAutocompleterValues(array_keys($permissionGroupsByName))
+            ->setAutocompleterValues(\array_keys($permissionGroupsByName))
             ->setNormalizer(static function ($value) {
                 if (null === $value) {
                     return '';
                 }
 
-                return trim((string) $value);
+                return \trim((string) $value);
             });
         $helper = $this->getHelper('question');
 
         $keys = $helper->ask($this->tempInput, $this->tempOutput, $question);
 
-        $this->tempOutput->writeln('You have chosen ' . implode(', ', $keys));
+        $this->tempOutput->writeln('You have chosen '.\implode(', ', $keys));
 
         if (
             $helper->ask(
@@ -343,7 +330,7 @@ class ChillImportUsersCommand extends Command
         $this->logger->error('Error while responding to a a question');
         $this->tempOutput->writeln('Ok, I accept, but I do not know what to do. Please try again.');
 
-        throw new RuntimeException('Error while responding to a question');
+        throw new \RuntimeException('Error while responding to a question');
     }
 
     protected function loadUsers()
@@ -358,7 +345,7 @@ class ChillImportUsersCommand extends Command
 
             if ($this->doesUserExists($r)) {
                 $this->tempOutput->writeln(sprintf("User with username '%s' already "
-                    . 'exists, skipping', $r['username']));
+                    .'exists, skipping', $r['username']));
 
                 $this->logger->info('One user already exists, skipping creation', [
                     'username_in_file' => $r['username'],
@@ -381,7 +368,7 @@ class ChillImportUsersCommand extends Command
 
         foreach ($reader->getRecords() as $r) {
             $this->centers[$r['alias']] =
-                array_merge(
+                \array_merge(
                     $this->centers[$r['alias']] ?? [],
                     $this->getCenters(
                         $r['center']
diff --git a/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php b/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
index d6516c983..0c68798f9 100644
--- a/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
@@ -14,10 +14,7 @@ namespace Chill\MainBundle\Command;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Notification\Mailer;
 use Chill\MainBundle\Security\PasswordRecover\RecoverPasswordHelper;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
-use Exception;
-use InvalidArgumentException;
 use League\Csv\Reader;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
@@ -27,11 +24,6 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
-use function array_key_exists;
-use function array_merge;
-use function in_array;
-use function trim;
-
 /**
  * Class ChillUserSendRenewPasswordCodeCommand.
  */
@@ -115,19 +107,20 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
 
             $this->sendRecoverCode($user);
         }
+
         return 0;
     }
 
     /**
-     * @throws Exception
-     *
      * @return Reader
+     *
+     * @throws \Exception
      */
     protected function getReader()
     {
         try {
             $reader = Reader::createFromPath($this->input->getArgument('csvfile'));
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $this->logger->error('The csv file could not be read', [
                 'path' => $this->input->getArgument('csvfile'),
             ]);
@@ -140,11 +133,10 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
         $headers = $reader->getHeader();
 
         if (
-            false === in_array('username', $headers, true)
-            && false === in_array('email', $headers, true)
+            false === \in_array('username', $headers, true)
+            && false === \in_array('email', $headers, true)
         ) {
-            throw new InvalidArgumentException('The csv file does not have an '
-                . 'username or email header');
+            throw new \InvalidArgumentException('The csv file does not have an username or email header');
         }
 
         return $reader;
@@ -156,16 +148,16 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
         $userRepository = $this->em->getRepository(User::class);
 
         try {
-            if (array_key_exists('email', $row)) {
-                return $userRepository->findOneByUsernameOrEmail(trim((string) $row['email']));
+            if (\array_key_exists('email', $row)) {
+                return $userRepository->findOneByUsernameOrEmail(\trim((string) $row['email']));
             }
         } catch (\Doctrine\ORM\NoResultException) {
             // continue, we will try username
         }
 
         try {
-            if (array_key_exists('username', $row)) {
-                return $userRepository->findOneByUsernameOrEmail(trim((string) $row['username']));
+            if (\array_key_exists('username', $row)) {
+                return $userRepository->findOneByUsernameOrEmail(\trim((string) $row['username']));
             }
         } catch (\Doctrine\ORM\NoResultException) {
             return null;
@@ -174,7 +166,7 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
 
     protected function onUserNotFound($row, $offset)
     {
-        $this->logger->alert('User not found', array_merge([
+        $this->logger->alert('User not found', \array_merge([
             'offset' => $offset,
         ], $row));
     }
@@ -191,7 +183,7 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
         }
 
         $template = $this->input->getOption('template');
-        $expiration = DateTime::createFromFormat(
+        $expiration = \DateTime::createFromFormat(
             'U',
             $this->input->getOption('expiration')
         );
diff --git a/src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANOCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANOCommand.php
index 8f51a7335..89a159fc4 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANOCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANOCommand.php
@@ -34,7 +34,7 @@ class LoadAddressesFRFromBANOCommand extends Command
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         foreach ($input->getArgument('departementNo') as $departementNo) {
-            $output->writeln('Import addresses for ' . $departementNo);
+            $output->writeln('Import addresses for '.$departementNo);
 
             $this->addressReferenceFromBano->import($departementNo);
         }
diff --git a/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
index 0f4caee19..e5833e580 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
@@ -17,10 +17,7 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Intl\Intl;
-
 use Symfony\Component\Intl\Languages;
-use function in_array;
 
 /*
  * Load or update the languages entities command
@@ -41,8 +38,6 @@ class LoadAndUpdateLanguagesCommand extends Command
 
     /**
      * LoadCountriesCommand constructor.
-     *
-     * @param $availableLanguages
      */
     public function __construct(private readonly EntityManager $entityManager, private $availableLanguages)
     {
@@ -58,21 +53,21 @@ class LoadAndUpdateLanguagesCommand extends Command
     {
         $this
             ->setName('chill:main:languages:populate')
-            ->setDescription('Load or update languages in db. This command does not delete existing ' .
+            ->setDescription('Load or update languages in db. This command does not delete existing '.
                 'languages, but will update names according to available languages')
             ->addOption(
                 self::INCLUDE_REGIONAL_VERSION,
                 null,
                 InputOption::VALUE_NONE,
                 'Include the regional languages. The regional languages are languages with code containing _ excepted '
-                        . implode(',', $this->regionalVersionToInclude) . '.'
+                        .implode(',', $this->regionalVersionToInclude).'.'
             )
             ->addOption(
                 self::INCLUDE_ANCIENT,
                 null,
                 InputOption::VALUE_NONE,
                 'Include the ancient languages that are languages with code '
-                        . implode(', ', $this->ancientToExclude) . '.'
+                        .implode(', ', $this->ancientToExclude).'.'
             );
     }
 
@@ -96,10 +91,10 @@ class LoadAndUpdateLanguagesCommand extends Command
                 (
                     !$input->getOption(self::INCLUDE_REGIONAL_VERSION)
                     && strpos($code, '_')
-                    && !in_array($code, $this->regionalVersionToInclude, true)
+                    && !\in_array($code, $this->regionalVersionToInclude, true)
                 ) || (
                     !$input->getOption(self::INCLUDE_ANCIENT)
-                    && in_array($code, $this->ancientToExclude, true)
+                    && \in_array($code, $this->ancientToExclude, true)
                 )
             );
 
@@ -125,6 +120,7 @@ class LoadAndUpdateLanguagesCommand extends Command
         }
 
         $em->flush();
+
         return 0;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
index 69831d2a0..92106d200 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
@@ -17,14 +17,11 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Intl\Countries;
-use Symfony\Component\Intl\Intl;
 
 class LoadCountriesCommand extends Command
 {
     /**
      * LoadCountriesCommand constructor.
-     *
-     * @param $availableLanguages
      */
     public function __construct(private readonly EntityManager $entityManager, private $availableLanguages)
     {
@@ -59,7 +56,7 @@ class LoadCountriesCommand extends Command
     protected function configure()
     {
         $this->setName('chill:main:countries:populate')
-            ->setDescription('Load or update countries in db. This command does not delete existing countries, ' .
+            ->setDescription('Load or update countries in db. This command does not delete existing countries, '.
                 'but will update names according to available languages');
     }
 
@@ -85,6 +82,7 @@ class LoadCountriesCommand extends Command
         }
 
         $em->flush();
+
         return 0;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index c68cf6762..b22027499 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -15,8 +15,6 @@ use Chill\MainBundle\Doctrine\Model\Point;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\PostalCode;
 use Doctrine\ORM\EntityManagerInterface;
-use Exception;
-use RuntimeException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -25,9 +23,6 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
-use function count;
-use function strlen;
-
 class LoadPostalCodesCommand extends Command
 {
     public function __construct(private readonly EntityManagerInterface $entityManager, private readonly ValidatorInterface $validator)
@@ -40,15 +35,15 @@ class LoadPostalCodesCommand extends Command
         $this->setName('chill:main:postal-code:populate')
             ->setDescription('Add the postal code from a csv file.')
             ->setHelp('This script will try to avoid existing postal code '
-                        . "using the postal code and name. \n"
-                        . 'The CSV file must have the following columns: '
-                        . 'postal code, label, country code.'
-                        . 'Optionally, the csv file can have the following '
-                        . 'columns after the country code: reference code, latitude, longitude, source. '
-                        . 'The latitude and longitude columns are supposed to be in WGS84 and expressed in decimal degrees. '
-                        . 'The CSV file should not have any header row.')
+                        ."using the postal code and name. \n"
+                        .'The CSV file must have the following columns: '
+                        .'postal code, label, country code.'
+                        .'Optionally, the csv file can have the following '
+                        .'columns after the country code: reference code, latitude, longitude, source. '
+                        .'The latitude and longitude columns are supposed to be in WGS84 and expressed in decimal degrees. '
+                        .'The CSV file should not have any header row.')
             ->addArgument('csv_file', InputArgument::REQUIRED, 'the path to '
-                        . 'the csv file. See the help for specifications.')
+                        .'the csv file. See the help for specifications.')
             ->addOption(
                 'delimiter',
                 'd',
@@ -76,7 +71,7 @@ class LoadPostalCodesCommand extends Command
     {
         $csv = $this->getCSVResource($input);
 
-        if ($output->getVerbosity() === OutputInterface::VERBOSITY_VERY_VERBOSE) {
+        if (OutputInterface::VERBOSITY_VERY_VERBOSE === $output->getVerbosity()) {
             $output->writeln('The content of the file is ...');
             $output->write(file_get_contents($input->getArgument('csv_file')));
         }
@@ -97,28 +92,29 @@ class LoadPostalCodesCommand extends Command
                 $this->addPostalCode($row, $output);
                 ++$num;
             } catch (CountryCodeNotFoundException|ExistingPostalCodeException|PostalCodeNotValidException $ex) {
-                $output->writeln('<warning> on line ' . $line . ' : ' . $ex->getMessage() . '</warning>');
+                $output->writeln('<warning> on line '.$line.' : '.$ex->getMessage().'</warning>');
             }
             ++$line;
         }
 
         $this->entityManager->flush();
 
-        $output->writeln('<info>' . $num . ' were added !</info>');
+        $output->writeln('<info>'.$num.' were added !</info>');
+
         return 0;
     }
 
     private function addPostalCode($row, OutputInterface $output)
     {
-        if ('FR' === $row[2] && strlen((string) $row[0]) === 4) {
+        if ('FR' === $row[2] && 4 === \strlen((string) $row[0])) {
             // CP in FRANCE are on 5 digit
             // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
             // add a zero if CP from FR and on 4 digit
-            $row[0] = '0' . $row[0];
+            $row[0] = '0'.$row[0];
         }
 
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
-            $output->writeln('handling row: ' . $row[0] . ' | ' . $row[1] . ' | ' . $row[2]);
+            $output->writeln('handling row: '.$row[0].' | '.$row[1].' | '.$row[2]);
         }
         $em = $this->entityManager;
         $country = $em
@@ -126,12 +122,7 @@ class LoadPostalCodesCommand extends Command
             ->findOneBy(['countryCode' => $row[2]]);
 
         if (null === $country) {
-            throw new CountryCodeNotFoundException(sprintf(
-                'The country with code %s is not found. Aborting to insert postal code with %s - %s',
-                $row[2],
-                $row[0],
-                $row[1]
-            ));
+            throw new CountryCodeNotFoundException(sprintf('The country with code %s is not found. Aborting to insert postal code with %s - %s', $row[2], $row[0], $row[1]));
         }
 
         // try to find an existing postal code
@@ -139,12 +130,8 @@ class LoadPostalCodesCommand extends Command
             ->getRepository(PostalCode::class)
             ->findBy(['code' => $row[0], 'name' => $row[1]]);
 
-        if (count($existingPC) > 0) {
-            throw new ExistingPostalCodeException(sprintf(
-                'A postal code with code : %s and name : %s already exists, skipping',
-                $row[0],
-                $row[1]
-            ));
+        if (\count($existingPC) > 0) {
+            throw new ExistingPostalCodeException(sprintf('A postal code with code : %s and name : %s already exists, skipping', $row[0], $row[1]));
         }
 
         $postalCode = (new PostalCode())
@@ -166,13 +153,13 @@ class LoadPostalCodesCommand extends Command
 
         $errors = $this->validator->validate($postalCode);
 
-        if ($errors->count() === 0) {
+        if (0 === $errors->count()) {
             $em->persist($postalCode);
         } else {
             $msg = '';
 
             foreach ($errors as $error) {
-                $msg .= ' ' . $error->getMessage();
+                $msg .= ' '.$error->getMessage();
             }
 
             throw new PostalCodeNotValidException($msg);
@@ -194,22 +181,21 @@ class LoadPostalCodesCommand extends Command
         $filename = $input->getArgument('csv_file');
 
         if (!$fs->exists($filename)) {
-            throw new RuntimeException('The file does not exists or you do not '
-                    . 'have the right to read it.');
+            throw new \RuntimeException('The file does not exists or you do not have the right to read it.');
         }
 
         $resource = fopen($filename, 'rb');
 
         if (false === $resource) {
-            throw new RuntimeException("The file '{$filename}' could not be opened.");
+            throw new \RuntimeException("The file '{$filename}' could not be opened.");
         }
 
         return $resource;
     }
 }
 
-class ExistingPostalCodeException extends Exception {}
+class ExistingPostalCodeException extends \Exception {}
 
-class CountryCodeNotFoundException extends Exception {}
+class CountryCodeNotFoundException extends \Exception {}
 
-class PostalCodeNotValidException extends Exception {}
+class PostalCodeNotValidException extends \Exception {}
diff --git a/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php b/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
index d27f18848..c38272d06 100644
--- a/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Command;
 
 use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\EntityManager;
-use LogicException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -59,7 +58,7 @@ class SetPasswordCommand extends Command
         $this->setName('chill:user:set_password')
             ->setDescription('set a password to user')
             ->addArgument('username', InputArgument::REQUIRED, 'the user\'s '
-                    . 'username you want to change password')
+                    .'username you want to change password')
             ->addArgument('password', InputArgument::OPTIONAL, 'the new password');
     }
 
@@ -68,8 +67,7 @@ class SetPasswordCommand extends Command
         $user = $this->_getUser($input->getArgument('username'));
 
         if (null === $user) {
-            throw new LogicException("The user with username '" .
-                  $input->getArgument('username') . "' is not found");
+            throw new \LogicException("The user with username '".$input->getArgument('username')."' is not found");
         }
 
         $password = $input->getArgument('password');
@@ -77,10 +75,11 @@ class SetPasswordCommand extends Command
         if (null === $password) {
             $dialog = $this->getHelperSet()->get('dialog');
             $password = $dialog->askHiddenResponse($output, '<question>the new password :'
-                  . '</question>');
+                  .'</question>');
         }
 
         $this->_setPassword($user, $password);
+
         return 0;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
index f0e138dcb..b3cf68849 100644
--- a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
@@ -24,8 +24,6 @@ use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 
-use function trim;
-
 final class AddressReferenceAPIController extends ApiController
 {
     public function __construct(private readonly AddressReferenceRepository $addressReferenceRepository, private readonly PaginatorFactory $paginatorFactory) {}
@@ -43,7 +41,7 @@ final class AddressReferenceAPIController extends ApiController
 
         $pattern = $request->query->get('q');
 
-        if ('' === trim((string) $pattern)) {
+        if ('' === \trim((string) $pattern)) {
             throw new BadRequestHttpException('the search pattern is empty');
         }
 
diff --git a/src/Bundle/ChillMainBundle/Controller/DefaultController.php b/src/Bundle/ChillMainBundle/Controller/DefaultController.php
index 45b831052..389c89767 100644
--- a/src/Bundle/ChillMainBundle/Controller/DefaultController.php
+++ b/src/Bundle/ChillMainBundle/Controller/DefaultController.php
@@ -72,22 +72,22 @@ class DefaultController extends AbstractController
                     ],
                     [
                         'name' => 'Link 2',
-                        //'link' => "http://localhost",
+                        // 'link' => "http://localhost",
                         'content' => 'Dui sapien eget mi proin sed libero. Neque volutpat ac tincidunt vitae semper quis lectus nulla. Turpis nunc eget lorem dolor. Phasellus egestas tellus rutrum tellus. Diam sit amet nisl suscipit adipiscing bibendum est ultricies integer. Duis ultricies lacus sed turpis tincidunt id. Nisl suscipit adipiscing bibendum est ultricies integer. Elementum nibh tellus molestie nunc non blandit massa enim. Faucibus in ornare quam viverra orci sagittis eu. Neque volutpat ac tincidunt vitae semper quis lectus nulla. Accumsan sit amet nulla facilisi morbi. Leo vel fringilla est ullamcorper eget nulla facilisi etiam dignissim. Amet est placerat in egestas erat imperdiet sed euismod. Quis auctor elit sed vulputate mi. Mauris nunc congue nisi vitae suscipit tellus mauris a diam. At volutpat diam ut venenatis. Facilisis gravida neque convallis a cras semper.',
                     ],
                     [
                         'name' => 'Link 3',
-                        //'link' => "http://localhost",
+                        // 'link' => "http://localhost",
                         'content' => 'In ornare quam viverra orci sagittis eu volutpat. Ac tincidunt vitae semper quis lectus nulla at volutpat. Placerat duis ultricies lacus sed turpis tincidunt. Augue interdum velit euismod in pellentesque. Felis eget nunc lobortis mattis aliquam. Volutpat lacus laoreet non curabitur gravida arcu. Gravida cum sociis natoque penatibus et magnis dis parturient montes. Nisl pretium fusce id velit ut tortor. Nunc scelerisque viverra mauris in aliquam sem fringilla ut. Magna eget est lorem ipsum dolor sit. Non consectetur a erat nam at lectus urna. Eget est lorem ipsum dolor sit amet consectetur adipiscing elit. Sed velit dignissim sodales ut.',
                     ],
                     [
                         'name' => 'Link 4',
                         'link' => 'http://localhost',
-                        //'content' => "Ut tellus elementum sagittis vitae et. Vitae purus faucibus ornare suspendisse sed nisi lacus sed viverra. Hendrerit gravida rutrum quisque non tellus orci ac auctor augue. Eleifend quam adipiscing vitae proin sagittis nisl rhoncus mattis rhoncus. Dictumst quisque sagittis purus sit. Suspendisse sed nisi lacus sed viverra. Pretium quam vulputate dignissim suspendisse in est ante. Id eu nisl nunc mi ipsum. Ut venenatis tellus in metus vulputate. Ut morbi tincidunt augue interdum velit euismod.",
+                        // 'content' => "Ut tellus elementum sagittis vitae et. Vitae purus faucibus ornare suspendisse sed nisi lacus sed viverra. Hendrerit gravida rutrum quisque non tellus orci ac auctor augue. Eleifend quam adipiscing vitae proin sagittis nisl rhoncus mattis rhoncus. Dictumst quisque sagittis purus sit. Suspendisse sed nisi lacus sed viverra. Pretium quam vulputate dignissim suspendisse in est ante. Id eu nisl nunc mi ipsum. Ut venenatis tellus in metus vulputate. Ut morbi tincidunt augue interdum velit euismod.",
                     ],
                     [
                         'name' => 'Link 5',
-                        //'link' => "http://localhost",
+                        // 'link' => "http://localhost",
                         'content' => 'Vel elit scelerisque mauris pellentesque pulvinar. Ornare suspendisse sed nisi lacus sed viverra tellus. Massa tincidunt dui ut ornare lectus sit. Congue nisi vitae suscipit tellus mauris a diam. At auctor urna nunc id cursus metus aliquam. Viverra accumsan in nisl nisi scelerisque eu ultrices vitae. Mattis aliquam faucibus purus in massa tempor nec feugiat. Et leo duis ut diam quam. Auctor augue mauris augue neque. Purus ut faucibus pulvinar elementum integer enim neque volutpat. Scelerisque felis imperdiet proin fermentum leo. Diam sit amet nisl suscipit adipiscing bibendum est ultricies. Consectetur libero id faucibus nisl tincidunt. Vel fringilla est ullamcorper eget nulla facilisi. Pharetra diam sit amet nisl suscipit adipiscing. Dignissim diam quis enim lobortis. Auctor eu augue ut lectus arcu bibendum at varius.',
                     ],
                 ],
diff --git a/src/Bundle/ChillMainBundle/Controller/ExportController.php b/src/Bundle/ChillMainBundle/Controller/ExportController.php
index d2e1767b7..abae07f9c 100644
--- a/src/Bundle/ChillMainBundle/Controller/ExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ExportController.php
@@ -25,9 +25,7 @@ use Chill\MainBundle\Redis\ChillRedis;
 use Chill\MainBundle\Repository\SavedExportRepositoryInterface;
 use Chill\MainBundle\Security\Authorization\SavedExportVoter;
 use Doctrine\ORM\EntityManagerInterface;
-use LogicException;
 use Psr\Log\LoggerInterface;
-use RedisException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -39,12 +37,8 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
-
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
-use function serialize;
-use function unserialize;
 
 /**
  * Class ExportController
@@ -109,6 +103,7 @@ class ExportController extends AbstractController
      * @param string $alias
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/exports/generate/{alias}", name="chill_main_export_generate", methods={"GET"})
      */
     public function generateAction(Request $request, $alias)
@@ -131,7 +126,7 @@ class ExportController extends AbstractController
     /**
      * @Route("/{_locale}/exports/generate-from-saved/{id}", name="chill_main_export_generate_from_saved")
      *
-     * @throws RedisException
+     * @throws \RedisException
      */
     public function generateFromSavedExport(SavedExport $savedExport): RedirectResponse
     {
@@ -139,7 +134,7 @@ class ExportController extends AbstractController
 
         $key = md5(uniqid((string) random_int(0, mt_getrandmax()), false));
 
-        $this->redis->setEx($key, 3600, serialize($savedExport->getOptions()));
+        $this->redis->setEx($key, 3600, \serialize($savedExport->getOptions()));
 
         return $this->redirectToRoute(
             'chill_main_export_download',
@@ -153,6 +148,7 @@ class ExportController extends AbstractController
 
     /**
      * Render the list of available exports.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/exports/", name="chill_main_export_index")
      */
     public function indexAction(): Response
@@ -186,7 +182,7 @@ class ExportController extends AbstractController
         $exportManager = $this->exportManager;
         $export = $exportManager->getExport($alias);
 
-        if ($exportManager->isGrantedForElement($export) === false) {
+        if (false === $exportManager->isGrantedForElement($export)) {
             throw $this->createAccessDeniedException('The user does not have access to this export');
         }
 
@@ -279,7 +275,7 @@ class ExportController extends AbstractController
         $options = match ($step) {
             'export', 'generate_export' => [
                 'export_alias' => $alias,
-                'picked_centers' => $exportManager->getPickedCenters($data['centers'])
+                'picked_centers' => $exportManager->getPickedCenters($data['centers']),
             ],
             'formatter', 'generate_formatter' => [
                 'export_alias' => $alias,
@@ -332,7 +328,7 @@ class ExportController extends AbstractController
      * When the method is POST, the form is stored if valid, and a redirection
      * is done to next step.
      */
-    private function exportFormStep(Request $request, DirectExportInterface|ExportInterface $export, string $alias, ?SavedExport $savedExport = null): Response
+    private function exportFormStep(Request $request, DirectExportInterface|ExportInterface $export, string $alias, SavedExport $savedExport = null): Response
     {
         $exportManager = $this->exportManager;
 
@@ -350,7 +346,7 @@ class ExportController extends AbstractController
 
         $form = $this->createCreateFormExport($alias, 'export', $data, $savedExport);
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -365,11 +361,11 @@ class ExportController extends AbstractController
                 );
                 $this->session->set('export_step', $data);
 
-                //redirect to next step
+                // redirect to next step
                 return $this->redirectToRoute('chill_main_export_new', [
                     'step' => $this->getNextStep('export', $export),
                     'alias' => $alias,
-                    'from_saved' => $request->get('from_saved', '')
+                    'from_saved' => $request->get('from_saved', ''),
                 ]);
             }
             $this->logger->debug('form export is invalid', [
@@ -390,7 +386,7 @@ class ExportController extends AbstractController
      * If the form is posted and valid, store the data in session and
      * redirect to the next step.
      */
-    private function formatterFormStep(Request $request, DirectExportInterface|ExportInterface $export, string $alias, ?SavedExport $savedExport = null): Response
+    private function formatterFormStep(Request $request, DirectExportInterface|ExportInterface $export, string $alias, SavedExport $savedExport = null): Response
     {
         // check we have data from the previous step (export step)
         $data = $this->session->get('export_step', null);
@@ -404,7 +400,7 @@ class ExportController extends AbstractController
 
         $form = $this->createCreateFormExport($alias, 'formatter', $data, $savedExport);
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -415,7 +411,7 @@ class ExportController extends AbstractController
                     $request->request->all()
                 );
 
-                //redirect to next step
+                // redirect to next step
                 return $this->redirectToRoute('chill_main_export_new', [
                     'alias' => $alias,
                     'step' => $this->getNextStep('formatter', $export),
@@ -440,12 +436,11 @@ class ExportController extends AbstractController
      *
      * The data from previous steps is removed from session.
      *
-     * @param \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export
      * @param string $alias
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    private function forwardToGenerate(Request $request, \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export, $alias, ?SavedExport $savedExport)
+    private function forwardToGenerate(Request $request, DirectExportInterface|ExportInterface $export, $alias, ?SavedExport $savedExport)
     {
         $dataCenters = $this->session->get('centers_step_raw', null);
         $dataFormatter = $this->session->get('formatter_step_raw', null);
@@ -468,7 +463,7 @@ class ExportController extends AbstractController
         unset($parameters['_token']);
         $key = md5(uniqid((string) random_int(0, mt_getrandmax()), false));
 
-        $this->redis->setEx($key, 3600, serialize($parameters));
+        $this->redis->setEx($key, 3600, \serialize($parameters));
 
         // remove data from session
         $this->session->remove('export_step_raw');
@@ -497,7 +492,7 @@ class ExportController extends AbstractController
         $formExport->submit($rawData['export']);
         $dataExport = $formExport->getData();
 
-        if (count($rawData['formatter']) > 0) {
+        if (\count($rawData['formatter']) > 0) {
             $formFormatter = $this->createCreateFormExport(
                 $alias,
                 'generate_formatter',
@@ -513,16 +508,17 @@ class ExportController extends AbstractController
 
     /**
      * @param string $alias
+     *
      * @return Response
      */
-    private function selectCentersStep(Request $request, \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export, $alias, ?SavedExport $savedExport = null)
+    private function selectCentersStep(Request $request, DirectExportInterface|ExportInterface $export, $alias, SavedExport $savedExport = null)
     {
         /** @var \Chill\MainBundle\Export\ExportManager $exportManager */
         $exportManager = $this->exportManager;
 
         $form = $this->createCreateFormExport($alias, 'centers', [], $savedExport);
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -533,14 +529,13 @@ class ExportController extends AbstractController
 
                 // check ACL
                 if (
-                    $exportManager->isGrantedForElement(
+                    false === $exportManager->isGrantedForElement(
                         $export,
                         null,
                         $exportManager->getPickedCenters($data['centers'])
-                    ) === false
+                    )
                 ) {
-                    throw $this->createAccessDeniedException('you do not have '
-                            . 'access to this export for those centers');
+                    throw $this->createAccessDeniedException('you do not have access to this export for those centers');
                 }
 
                 $this->session->set(
@@ -589,20 +584,19 @@ class ExportController extends AbstractController
      *
      * This method provides a centralized way of handling next/previous step.
      *
-     * @param string $step the current step
-     * @param \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export
-     * @param bool $reverse set to true to get the previous step
-     *
-     * @throws LogicException if there is no step before or after the given step
+     * @param string $step    the current step
+     * @param bool   $reverse set to true to get the previous step
      *
      * @return string the next/current step
+     *
+     * @throws \LogicException if there is no step before or after the given step
      */
-    private function getNextStep($step, \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export, $reverse = false)
+    private function getNextStep($step, DirectExportInterface|ExportInterface $export, $reverse = false)
     {
         switch ($step) {
             case 'centers':
                 if (false !== $reverse) {
-                    throw new LogicException("there is no step before 'export'");
+                    throw new \LogicException("there is no step before 'export'");
                 }
 
                 return 'export';
@@ -622,13 +616,13 @@ class ExportController extends AbstractController
 
             case 'generate':
                 if (false === $reverse) {
-                    throw new LogicException("there is no step after 'generate'");
+                    throw new \LogicException("there is no step after 'generate'");
                 }
 
                 return 'formatter';
 
             default:
-                throw new LogicException("the step {$step} is not defined.");
+                throw new \LogicException("the step {$step} is not defined.");
         }
     }
 
@@ -638,7 +632,7 @@ class ExportController extends AbstractController
             throw $this->createNotFoundException('key does not exists');
         }
 
-        if ($this->redis->exists($key) !== 1) {
+        if (1 !== $this->redis->exists($key)) {
             $this->addFlash('error', $this->translator->trans('This report is not available any more'));
 
             throw $this->createNotFoundException('key does not exists');
@@ -647,10 +641,10 @@ class ExportController extends AbstractController
         $serialized = $this->redis->get($key);
 
         if (false === $serialized) {
-            throw new LogicException('the key could not be reached from redis');
+            throw new \LogicException('the key could not be reached from redis');
         }
 
-        $rawData = unserialize($serialized);
+        $rawData = \unserialize($serialized);
 
         $this->logger->notice('[export] choices for an export unserialized', [
             'key' => $key,
@@ -668,7 +662,7 @@ class ExportController extends AbstractController
         };
 
         if (null !== $savedExport && !$this->security->isGranted(SavedExportVoter::EDIT, $savedExport)) {
-            throw new AccessDeniedHttpException("saved export edition not allowed");
+            throw new AccessDeniedHttpException('saved export edition not allowed');
         }
 
         return $savedExport;
diff --git a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
index 7e26bec32..c5b9cd74f 100644
--- a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
@@ -36,7 +36,6 @@ class LocationApiController extends ApiController
 
     /**
      * @param QueryBuilder $query
-     * @param mixed $_format
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
     {
diff --git a/src/Bundle/ChillMainBundle/Controller/LoginController.php b/src/Bundle/ChillMainBundle/Controller/LoginController.php
index ee6b0e321..df295d0b2 100644
--- a/src/Bundle/ChillMainBundle/Controller/LoginController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LoginController.php
@@ -35,6 +35,7 @@ class LoginController extends AbstractController
      * Show a login form.
      *
      * @return Response
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/login", name="login")
      */
     public function loginAction(Request $request)
diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php b/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
index daa93e275..16599b9a2 100644
--- a/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
@@ -19,14 +19,12 @@ use Chill\MainBundle\Security\Authorization\NotificationVoter;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\MainBundle\Serializer\Model\Counter;
 use Doctrine\ORM\EntityManagerInterface;
-use RuntimeException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\SerializerInterface;
-use UnexpectedValueException;
 
 /**
  * @Route("/api/1.0/main/notification")
@@ -91,13 +89,13 @@ class NotificationApiController
         $user = $this->security->getUser();
 
         if (!$user instanceof User) {
-            throw new RuntimeException('not possible to mark as read by this user');
+            throw new \RuntimeException('not possible to mark as read by this user');
         }
 
         match ($target) {
             'read' => $notification->markAsReadBy($user),
             'unread' => $notification->markAsUnreadBy($user),
-            default => throw new UnexpectedValueException("target not supported: {$target}"),
+            default => throw new \UnexpectedValueException("target not supported: {$target}"),
         };
 
         $this->entityManager->flush();
diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
index 859fdfd8b..4131ba714 100644
--- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
@@ -148,7 +148,7 @@ class NotificationController extends AbstractController
             throw new AccessDeniedHttpException('You must be authenticated and a user to create a notification');
         }
 
-        foreach (['accessKey'/*, 'email'*/] as $param) {
+        foreach (['accessKey'/* , 'email' */] as $param) {
             if (!$request->query->has($param)) {
                 throw new BadRequestHttpException("Missing {$param} parameter");
             }
@@ -191,7 +191,7 @@ class NotificationController extends AbstractController
         $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');
         $currentUser = $this->security->getUser();
 
-        $notificationsNbr = $this->notificationRepository->countAllForAttendee(($currentUser));
+        $notificationsNbr = $this->notificationRepository->countAllForAttendee($currentUser);
         $paginator = $this->paginatorFactory->create($notificationsNbr);
 
         $notifications = $this->notificationRepository->findAllForAttendee(
@@ -264,7 +264,7 @@ class NotificationController extends AbstractController
 
                     return $this->redirectToRoute('chill_main_notification_show', [
                         'id' => $notification->getId(),
-                        '_fragment' => 'comment-' . $commentId,
+                        '_fragment' => 'comment-'.$commentId,
                     ]);
                 }
 
diff --git a/src/Bundle/ChillMainBundle/Controller/PasswordController.php b/src/Bundle/ChillMainBundle/Controller/PasswordController.php
index dc0856cc0..04ec22977 100644
--- a/src/Bundle/ChillMainBundle/Controller/PasswordController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PasswordController.php
@@ -17,8 +17,6 @@ use Chill\MainBundle\Security\PasswordRecover\PasswordRecoverEvent;
 use Chill\MainBundle\Security\PasswordRecover\PasswordRecoverVoter;
 use Chill\MainBundle\Security\PasswordRecover\RecoverPasswordHelper;
 use Chill\MainBundle\Security\PasswordRecover\TokenManager;
-use DateInterval;
-use DateTimeImmutable;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -88,6 +86,7 @@ class PasswordController extends AbstractController
 
     /**
      * @return Response
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/public/{_locale}/password/request-changed", name="password_request_recover_changed")
      */
     public function changeConfirmedAction()
@@ -96,15 +95,14 @@ class PasswordController extends AbstractController
     }
 
     /**
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
      * @\Symfony\Component\Routing\Annotation\Route(path="/public/{_locale}/password/recover", name="password_recover")
      */
-    public function recoverAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    public function recoverAction(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         if (false === $this->isGranted(PasswordRecoverVoter::ASK_TOKEN)) {
             return new Response($this->translator->trans('You are not allowed '
-                . 'to try to recover password, due to mitigating possible '
-                . 'attack. Try to contact your system administrator'), Response::HTTP_FORBIDDEN);
+                .'to try to recover password, due to mitigating possible '
+                .'attack. Try to contact your system administrator'), Response::HTTP_FORBIDDEN);
         }
 
         $query = $request->query;
@@ -165,15 +163,14 @@ class PasswordController extends AbstractController
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      *
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
      * @\Symfony\Component\Routing\Annotation\Route(path="/public/{_locale}/password/request-recover", name="password_request_recover")
      */
-    public function requestRecoverAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    public function requestRecoverAction(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         if (false === $this->isGranted(PasswordRecoverVoter::ASK_TOKEN)) {
             return new Response($this->translator->trans('You are not allowed '
-                . 'to try to recover password, due to mitigating possible '
-                . 'attack. Try to contact your system administrator'), Response::HTTP_FORBIDDEN);
+                .'to try to recover password, due to mitigating possible '
+                .'attack. Try to contact your system administrator'), Response::HTTP_FORBIDDEN);
         }
 
         $form = $this->requestRecoverForm();
@@ -194,17 +191,17 @@ class PasswordController extends AbstractController
 
             if (empty($user->getEmail())) {
                 $this->addFlash('error', $this->translator->trans('This account does not have an email address. '
-                    . 'Please ask your administrator to renew your password.'));
+                    .'Please ask your administrator to renew your password.'));
             } else {
                 if (false === $this->isGranted(PasswordRecoverVoter::ASK_TOKEN, $user)) {
                     return new Response($this->translator->trans('You are not allowed '
-                        . 'to try to recover password, due to mitigating possible '
-                        . 'attack. Try to contact your system administrator'), Response::HTTP_FORBIDDEN);
+                        .'to try to recover password, due to mitigating possible '
+                        .'attack. Try to contact your system administrator'), Response::HTTP_FORBIDDEN);
                 }
 
                 $this->recoverPasswordHelper->sendRecoverEmail(
                     $user,
-                    (new DateTimeImmutable('now'))->add(new DateInterval('PT30M'))
+                    (new \DateTimeImmutable('now'))->add(new \DateInterval('PT30M'))
                 );
 
                 // logging for prod
@@ -238,6 +235,7 @@ class PasswordController extends AbstractController
 
     /**
      * @return Response
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/public/{_locale}/password/request-confirm", name="password_request_recover_confirm")
      */
     public function requestRecoverConfirmAction()
@@ -247,6 +245,7 @@ class PasswordController extends AbstractController
 
     /**
      * @return Response
+     *
      * @Route("/{_locale}/my/password", name="change_my_password")
      */
     public function UserPasswordAction(Request $request)
@@ -310,7 +309,7 @@ class PasswordController extends AbstractController
                                 ->orWhere($qb->expr()->eq('u.emailCanonical', 'UNACCENT(LOWER(:pattern))'))
                                 ->setParameter('pattern', $pattern);
 
-                            if ((int) $qb->getQuery()->getSingleScalarResult() !== 1) {
+                            if (1 !== (int) $qb->getQuery()->getSingleScalarResult()) {
                                 $context->addViolation('This username or email does not exists');
                             }
                         },
diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php b/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php
index 3f2c4dc48..8b0561635 100644
--- a/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php
@@ -19,9 +19,6 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
-use function array_key_exists;
-use function json_decode;
-
 class PermissionApiController extends AbstractController
 {
     public function __construct(private readonly DenormalizerInterface $denormalizer, private readonly Security $security) {}
@@ -35,21 +32,17 @@ class PermissionApiController extends AbstractController
     {
         $this->denyAccessUnlessGranted('ROLE_USER');
 
-        $data = json_decode($request->getContent(), true);
+        $data = \json_decode($request->getContent(), true);
 
         if (null === $data) {
-            throw new BadRequestHttpException(sprintf(
-                'Could not decode json received, or data invalid: %s, %s',
-                json_last_error(),
-                json_last_error_msg()
-            ));
+            throw new BadRequestHttpException(sprintf('Could not decode json received, or data invalid: %s, %s', json_last_error(), json_last_error_msg()));
         }
 
-        if (!array_key_exists('object', $data)) {
+        if (!\array_key_exists('object', $data)) {
             throw new BadRequestHttpException('the object key is not present');
         }
 
-        if (!array_key_exists('class', $data)) {
+        if (!\array_key_exists('class', $data)) {
             throw new BadRequestHttpException('the class key is not present');
         }
 
diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
index 85a858855..681046ca1 100644
--- a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
@@ -21,7 +21,6 @@ use Chill\MainBundle\Repository\RoleScopeRepository;
 use Chill\MainBundle\Security\RoleProvider;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityManagerInterface;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormInterface;
@@ -31,8 +30,6 @@ use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-
 /**
  * Class PermissionsGroupController.
  */
@@ -75,7 +72,7 @@ final class PermissionsGroupController extends AbstractController
             $permissionsGroup->addRoleScope($roleScope);
             $violations = $this->validator->validate($permissionsGroup);
 
-            if ($violations->count() === 0) {
+            if (0 === $violations->count()) {
                 $this->em->flush();
 
                 $this->addFlash(
@@ -132,6 +129,7 @@ final class PermissionsGroupController extends AbstractController
 
     /**
      * Creates a new PermissionsGroup entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/create", name="admin_permissionsgroup_create", methods={"POST"})
      */
     public function createAction(Request $request): Response
@@ -155,6 +153,7 @@ final class PermissionsGroupController extends AbstractController
 
     /**
      * remove an association between permissionsGroup and roleScope.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/{pgid}/delete_link_role_scope/{rsid}", name="admin_permissionsgroup_delete_role_scope", methods={"DELETE"})
      */
     public function deleteLinkRoleScopeAction(int $pgid, int $rsid): Response
@@ -172,11 +171,11 @@ final class PermissionsGroupController extends AbstractController
 
         try {
             $permissionsGroup->removeRoleScope($roleScope);
-        } catch (RuntimeException) {
+        } catch (\RuntimeException) {
             $this->addFlash(
                 'notice',
                 $this->translator->trans("The role '%role%' and circle "
-                        . "'%scope%' is not associated with this permission group", [
+                        ."'%scope%' is not associated with this permission group", [
                             '%role%' => $this->translator->trans($roleScope->getRole()),
                             '%scope%' => $this->translatableStringHelper
                                 ->localize($roleScope->getScope()->getName()),
@@ -188,11 +187,11 @@ final class PermissionsGroupController extends AbstractController
 
         $this->em->flush();
 
-        if ($roleScope->getScope() !== null) {
+        if (null !== $roleScope->getScope()) {
             $this->addFlash(
                 'notice',
                 $this->translator->trans("The role '%role%' on circle "
-                        . "'%scope%' has been removed", [
+                        ."'%scope%' has been removed", [
                             '%role%' => $this->translator->trans($roleScope->getRole()),
                             '%scope%' => $this->translatableStringHelper
                                 ->localize($roleScope->getScope()->getName()),
@@ -212,6 +211,7 @@ final class PermissionsGroupController extends AbstractController
 
     /**
      * Displays a form to edit an existing PermissionsGroup entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/{id}/edit", name="admin_permissionsgroup_edit")
      */
     public function editAction(int $id): Response
@@ -259,6 +259,7 @@ final class PermissionsGroupController extends AbstractController
 
     /**
      * Lists all PermissionsGroup entities.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/", name="admin_permissionsgroup")
      */
     public function indexAction(): Response
@@ -272,6 +273,7 @@ final class PermissionsGroupController extends AbstractController
 
     /**
      * Displays a form to create a new PermissionsGroup entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/new", name="admin_permissionsgroup_new")
      */
     public function newAction(): Response
@@ -287,6 +289,7 @@ final class PermissionsGroupController extends AbstractController
 
     /**
      * Finds and displays a PermissionsGroup entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/{id}/show", name="admin_permissionsgroup_show")
      */
     public function showAction(int $id): Response
@@ -304,11 +307,11 @@ final class PermissionsGroupController extends AbstractController
         usort(
             $roleScopes,
             static function (RoleScope $a, RoleScope $b) use ($translatableStringHelper) {
-                if ($a->getScope() === null) {
+                if (null === $a->getScope()) {
                     return 1;
                 }
 
-                if ($b->getScope() === null) {
+                if (null === $b->getScope()) {
                     return +1;
                 }
 
@@ -339,6 +342,7 @@ final class PermissionsGroupController extends AbstractController
 
     /**
      * Edits an existing PermissionsGroup entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/{id}/update", name="admin_permissionsgroup_update", methods={"POST", "PUT"})
      */
     public function updateAction(Request $request, int $id): Response
@@ -347,8 +351,7 @@ final class PermissionsGroupController extends AbstractController
             ->find($id);
 
         if (!$permissionsGroup) {
-            throw $this->createNotFoundException('Unable to find Permissions'
-                . 'Group entity.');
+            throw $this->createNotFoundException('Unable to find PermissionsGroup entity.');
         }
 
         $editForm = $this->createEditForm($permissionsGroup);
@@ -396,7 +399,7 @@ final class PermissionsGroupController extends AbstractController
      * get a role scope by his parameters. The role scope is persisted if it
      * doesn't exist in database.
      */
-    protected function getPersistentRoleScopeBy(string $role, ?Scope $scope = null): RoleScope
+    protected function getPersistentRoleScopeBy(string $role, Scope $scope = null): RoleScope
     {
         $roleScope = $this->roleScopeRepository
             ->findOneBy(['role' => $role, 'scope' => $scope]);
@@ -487,7 +490,7 @@ final class PermissionsGroupController extends AbstractController
         $expandedRoles = [];
 
         foreach ($roleScopes as $roleScope) {
-            if (!array_key_exists($roleScope->getRole(), $expandedRoles)) {
+            if (!\array_key_exists($roleScope->getRole(), $expandedRoles)) {
                 $expandedRoles[$roleScope->getRole()] =
                       array_map(
                           static fn ($role) => $role,
diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
index 91de40985..f186561d5 100644
--- a/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
@@ -19,8 +19,6 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 
-use function array_map;
-
 /**
  * Class PostalCodeController.
  */
@@ -55,21 +53,21 @@ class PostalCodeController extends AbstractController
             ->createQuery(
                 sprintf(
                     'SELECT p.id AS id, p.name AS name, p.code AS code, '
-                    . 'country.name AS country_name, '
-                    . 'country.countryCode AS country_code '
-                    . 'FROM %s p '
-                    . 'JOIN p.country country '
-                    . 'WHERE LOWER(p.name) LIKE LOWER(:pattern) OR LOWER(p.code) LIKE LOWER(:pattern) '
-                    . 'ORDER BY code',
+                    .'country.name AS country_name, '
+                    .'country.countryCode AS country_code '
+                    .'FROM %s p '
+                    .'JOIN p.country country '
+                    .'WHERE LOWER(p.name) LIKE LOWER(:pattern) OR LOWER(p.code) LIKE LOWER(:pattern) '
+                    .'ORDER BY code',
                     PostalCode::class
                 )
             )
-            ->setParameter('pattern', '%' . $pattern . '%')
+            ->setParameter('pattern', '%'.$pattern.'%')
             ->setMaxResults(30);
 
-        $results = array_map(function ($row) {
+        $results = \array_map(function ($row) {
             $row['country_name'] = $this->translatableStringHelper->localize($row['country_name']);
-            $row['text'] = $row['code'] . ' ' . $row['name'] . ' (' . $row['country_name'] . ')';
+            $row['text'] = $row['code'].' '.$row['name'].' ('.$row['country_name'].')';
 
             return $row;
         }, $query->getResult(Query::HYDRATE_ARRAY));
diff --git a/src/Bundle/ChillMainBundle/Controller/SavedExportController.php b/src/Bundle/ChillMainBundle/Controller/SavedExportController.php
index 789a4d5da..15bfcb9bb 100644
--- a/src/Bundle/ChillMainBundle/Controller/SavedExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/SavedExportController.php
@@ -30,9 +30,7 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 
 class SavedExportController
 {
@@ -139,7 +137,7 @@ class SavedExportController
                 '@ChillMain/SavedExport/index.html.twig',
                 [
                     'grouped_exports' => $exportsGrouped,
-                    'total' => count($exports),
+                    'total' => \count($exports),
                 ]
             )
         );
diff --git a/src/Bundle/ChillMainBundle/Controller/ScopeController.php b/src/Bundle/ChillMainBundle/Controller/ScopeController.php
index d34d240cd..727796256 100644
--- a/src/Bundle/ChillMainBundle/Controller/ScopeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ScopeController.php
@@ -24,6 +24,7 @@ class ScopeController extends AbstractController
 {
     /**
      * Creates a new Scope entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/scope/create", name="admin_scope_create", methods={"POST"})
      */
     public function createAction(Request $request)
@@ -48,6 +49,7 @@ class ScopeController extends AbstractController
 
     /**
      * Displays a form to edit an existing Scope entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/scope/{id}/edit", name="admin_scope_edit")
      */
     public function editAction(mixed $id)
@@ -70,6 +72,7 @@ class ScopeController extends AbstractController
 
     /**
      * Lists all Scope entities.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/scope/", name="admin_scope")
      */
     public function indexAction()
@@ -85,6 +88,7 @@ class ScopeController extends AbstractController
 
     /**
      * Displays a form to create a new Scope entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/scope/new", name="admin_scope_new")
      */
     public function newAction()
@@ -118,6 +122,7 @@ class ScopeController extends AbstractController
 
     /**
      * Edits an existing Scope entity.
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/scope/{id}/update", name="admin_scope_update", methods={"POST", "PUT"})
      */
     public function updateAction(Request $request, mixed $id)
diff --git a/src/Bundle/ChillMainBundle/Controller/SearchController.php b/src/Bundle/ChillMainBundle/Controller/SearchController.php
index 7172af57b..6324561cc 100644
--- a/src/Bundle/ChillMainBundle/Controller/SearchController.php
+++ b/src/Bundle/ChillMainBundle/Controller/SearchController.php
@@ -27,10 +27,6 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function count;
-use function key;
-use function reset;
-
 /**
  * Class SearchController.
  */
@@ -50,8 +46,7 @@ class SearchController extends AbstractController
             $search = $this->searchProvider
                 ->getHasAdvancedFormByName($name);
         } catch (\Chill\MainBundle\Search\UnknowSearchNameException) {
-            throw $this->createNotFoundException('no advanced search for '
-                . "{$name}");
+            throw $this->createNotFoundException('no advanced search for '."{$name}");
         }
 
         if ($request->query->has('q')) {
@@ -96,7 +91,7 @@ class SearchController extends AbstractController
         $advancedSearchProviders = $searchProvider
             ->getHasAdvancedFormSearchServices();
 
-        if (count($advancedSearchProviders) === 1) {
+        if (1 === \count($advancedSearchProviders)) {
             return $this->redirectToRoute('chill_main_advanced_search', [
                 'name' => array_key_first($advancedSearchProviders),
             ]);
@@ -119,7 +114,7 @@ class SearchController extends AbstractController
                         '@ChillMain/Search/error.html.twig',
                         [
                             'message' => $this->translator->trans('Your search is empty. '
-                                  . 'Please provide search terms.'),
+                                  .'Please provide search terms.'),
                             'pattern' => $pattern,
                         ]
                     );
@@ -138,7 +133,7 @@ class SearchController extends AbstractController
             if (null === $name) {
                 if ('json' === $_format) {
                     return new JsonResponse('Currently, we still do not aggregate results '
-                        . 'from different providers', JsonResponse::HTTP_BAD_REQUEST);
+                        .'from different providers', JsonResponse::HTTP_BAD_REQUEST);
                 }
 
                 // no specific search selected. Rendering result in "preview" mode
@@ -166,7 +161,7 @@ class SearchController extends AbstractController
                     ), ];
 
                 if ('json' === $_format) {
-                    return new JsonResponse(reset($results));
+                    return new JsonResponse(\reset($results));
                 }
             }
         } catch (UnknowSearchDomainException $ex) {
@@ -174,18 +169,18 @@ class SearchController extends AbstractController
                 '@ChillMain/Search/error.html.twig',
                 [
                     'message' => $this->translator->trans('The domain %domain% '
-                          . 'is unknow. Please check your search.', ['%domain%' => $ex->getDomain()]),
+                          .'is unknow. Please check your search.', ['%domain%' => $ex->getDomain()]),
                     'pattern' => $pattern,
                 ]
             );
         } catch (UnknowSearchNameException $ex) {
-            throw $this->createNotFoundException('The name ' . $ex->getName() . ' is not found');
+            throw $this->createNotFoundException('The name '.$ex->getName().' is not found');
         } catch (ParsingException $ex) {
             return $this->render(
                 '@ChillMain/Search/error.html.twig',
                 [
-                    'message' => $this->translator->trans('Invalid terms') .
-                    ': ' . $this->translator->trans($ex->getMessage()),
+                    'message' => $this->translator->trans('Invalid terms').
+                    ': '.$this->translator->trans($ex->getMessage()),
                     'pattern' => $pattern,
                 ]
             );
@@ -202,13 +197,12 @@ class SearchController extends AbstractController
      */
     public function searchApi(Request $request, mixed $_format): JsonResponse
     {
-        //TODO this is an incomplete implementation
+        // TODO this is an incomplete implementation
         $query = $request->query->get('q', '');
         $types = $request->query->get('type', []);
 
-        if (count($types) === 0) {
-            throw new BadRequestHttpException('The request must contains at '
-                . ' one type');
+        if (0 === \count($types)) {
+            throw new BadRequestHttpException('The request must contains at  one type');
         }
 
         try {
diff --git a/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php b/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
index ffdfaa02a..ebbd7a360 100644
--- a/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
+++ b/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
@@ -18,8 +18,6 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
 
-use function count;
-
 class TimelineCenterController extends AbstractController
 {
     public function __construct(protected TimelineBuilder $timelineBuilder, protected PaginatorFactory $paginatorFactory, private readonly Security $security) {}
@@ -40,7 +38,7 @@ class TimelineCenterController extends AbstractController
             $centers[] = $group->getCenter();
         }
 
-        if (0 === count($centers)) {
+        if (0 === \count($centers)) {
             throw $this->createNotFoundException();
         }
 
diff --git a/src/Bundle/ChillMainBundle/Controller/UserApiController.php b/src/Bundle/ChillMainBundle/Controller/UserApiController.php
index 0eb6c711c..6809d3289 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserApiController.php
@@ -68,10 +68,6 @@ class UserApiController extends ApiController
         }
     }
 
-    /**
-     * @param mixed $query
-     * @param mixed $_format
-     */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
     {
         return $query->orderBy('e.label', 'ASC');
diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index be6229257..1ffd72c33 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -22,7 +22,6 @@ use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Form;
@@ -63,11 +62,11 @@ class UserController extends CRUDController
             );
             $user->addGroupCenter($groupCenter);
 
-            if ($this->validator->validate($user)->count() === 0) {
+            if (0 === $this->validator->validate($user)->count()) {
                 $em->flush();
 
                 $this->addFlash('success', $this->get('translator')->trans('The '
-                    . 'permissions have been successfully added to the user'));
+                    .'permissions have been successfully added to the user'));
 
                 $returnPathParams = $request->query->has('returnPath') ?
                     ['returnPath' => $request->query->get('returnPath')] : [];
@@ -115,7 +114,7 @@ class UserController extends CRUDController
 
         try {
             $user->removeGroupCenter($groupCenter);
-        } catch (RuntimeException $ex) {
+        } catch (\RuntimeException $ex) {
             $this->addFlash('error', $this->get('translator')->trans($ex->getMessage()));
 
             return $this->redirectToRoute('chill_crud_admin_user_edit', ['id' => $uid]);
@@ -135,13 +134,7 @@ class UserController extends CRUDController
         $entity = $this->getEntity($action, $id, $request);
 
         if (null === $entity) {
-            throw $this->createNotFoundException(
-                sprintf(
-                    'The %s with id %s is not found',
-                    $this->getCrudName(),
-                    $id
-                )
-            );
+            throw $this->createNotFoundException(sprintf('The %s with id %s is not found', $this->getCrudName(), $id));
         }
 
         $response = $this->checkACL($action, $entity);
@@ -176,7 +169,7 @@ class UserController extends CRUDController
                 return $result;
             }
 
-            return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_index');
+            return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_index');
         }
 
         if ($form->isSubmitted()) {
@@ -272,7 +265,7 @@ class UserController extends CRUDController
             ->build();
     }
 
-    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    protected function countEntities(string $action, Request $request, FilterOrderHelper $filterOrder = null): int
     {
         if (!$filterOrder instanceof FilterOrderHelper) {
             return parent::countEntities($action, $request, $filterOrder);
@@ -285,7 +278,7 @@ class UserController extends CRUDController
         return $this->userRepository->countByUsernameOrEmail($filterOrder->getQueryString());
     }
 
-    protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
+    protected function createFormFor(string $action, $entity, string $formClass = null, array $formOptions = []): FormInterface
     {
         // for "new", add special config
         if ('new' === $action) {
@@ -329,7 +322,7 @@ class UserController extends CRUDController
         Request $request,
         int $totalItems,
         PaginatorInterface $paginator,
-        ?FilterOrderHelper $filterOrder = null
+        FilterOrderHelper $filterOrder = null
     ) {
         if (0 === $totalItems) {
             return [];
diff --git a/src/Bundle/ChillMainBundle/Controller/UserExportController.php b/src/Bundle/ChillMainBundle/Controller/UserExportController.php
index fe318c4ae..7f14b5e64 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserExportController.php
@@ -47,7 +47,7 @@ final readonly class UserExportController
         $csv = Writer::createFromPath('php://temp', 'r+');
         $csv->insertOne(
             array_map(
-                fn (string $e) => $this->translator->trans('admin.users.export.' . $e),
+                fn (string $e) => $this->translator->trans('admin.users.export.'.$e),
                 [
                     'id',
                     //  'username',
@@ -57,7 +57,7 @@ final readonly class UserExportController
                     'civility_abbreviation',
                     'civility_name',
                     'label',
-                    'mainCenter_id' ,
+                    'mainCenter_id',
                     'mainCenter_name',
                     'mainScope_id',
                     'mainScope_name',
@@ -67,7 +67,7 @@ final readonly class UserExportController
                     'currentLocation_name',
                     'mainLocation_id',
                     'mainLocation_name',
-                    'absenceStart'
+                    'absenceStart',
                 ]
             )
         );
@@ -94,6 +94,7 @@ final readonly class UserExportController
      * @throws \League\Csv\CannotInsertRecord
      * @throws \League\Csv\Exception
      * @throws \League\Csv\UnavailableStream
+     *
      * @Route("/{_locale}/admin/main/users/export/permissions.{_format}", requirements={"_format": "csv"}, name="chill_main_users_export_permissions")
      */
     public function userPermissionsList(string $_format = 'csv'): StreamedResponse
@@ -107,7 +108,7 @@ final readonly class UserExportController
         $csv = Writer::createFromPath('php://temp', 'r+');
         $csv->insertOne(
             array_map(
-                fn (string $e) => $this->translator->trans('admin.users.export.' . $e),
+                fn (string $e) => $this->translator->trans('admin.users.export.'.$e),
                 [
                     'id',
                     'username',
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
index 71233d7e4..4c4d8218c 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\MainBundle\Serializer\Model\Counter;
 use Doctrine\ORM\EntityManagerInterface;
-use LogicException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -142,12 +141,12 @@ class WorkflowApiController
             'final' => match ($action) {
                 'subscribe' => $entityWorkflow->addSubscriberToFinal($user),
                 'unsubscribe' => $entityWorkflow->removeSubscriberToFinal($user),
-                default => throw new LogicException(),
+                default => throw new \LogicException(),
             },
             'step' => match ($action) {
                 'subscribe' => $entityWorkflow->addSubscriberToStep($user),
                 'unsubscribe' => $entityWorkflow->removeSubscriberToStep($user),
-                default => throw new LogicException(),
+                default => throw new \LogicException(),
             },
             default => throw new BadRequestHttpException('subscribe parameter must be equal to "step" or "final"'),
         };
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
index 75d38050c..b641ed46a 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
@@ -35,7 +35,6 @@ use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\TransitionBlocker;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 
 class WorkflowController extends AbstractController
 {
@@ -67,11 +66,11 @@ class WorkflowController extends AbstractController
 
         $errors = $this->validator->validate($entityWorkflow, null, ['creation']);
 
-        if (count($errors) > 0) {
+        if (\count($errors) > 0) {
             $msg = [];
 
             foreach ($errors as $error) {
-                /** @var \Symfony\Component\Validator\ConstraintViolationInterface $error */
+                /* @var \Symfony\Component\Validator\ConstraintViolationInterface $error */
                 $msg[] = $error->getMessage();
             }
 
@@ -294,7 +293,7 @@ class WorkflowController extends AbstractController
         $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
         $errors = [];
 
-        if (count($workflow->getEnabledTransitions($entityWorkflow)) > 0) {
+        if (\count($workflow->getEnabledTransitions($entityWorkflow)) > 0) {
             // possible transition
 
             $usersInvolved = $entityWorkflow->getUsersInvolved();
@@ -310,7 +309,7 @@ class WorkflowController extends AbstractController
                 [
                     'transition' => true,
                     'entity_workflow' => $entityWorkflow,
-                    'suggested_users' => $usersInvolved
+                    'suggested_users' => $usersInvolved,
                 ]
             );
 
@@ -324,12 +323,7 @@ class WorkflowController extends AbstractController
                         $tb->getParameters()
                     ), iterator_to_array($blockers));
 
-                    throw $this->createAccessDeniedException(
-                        sprintf(
-                            "not allowed to apply transition {$transition}: %s",
-                            implode(', ', $msgs)
-                        )
-                    );
+                    throw $this->createAccessDeniedException(sprintf("not allowed to apply transition {$transition}: %s", implode(', ', $msgs)));
                 }
 
                 // TODO symfony 5: add those "future" on context ($workflow->apply($entityWorkflow, $transition, $context)
@@ -374,7 +368,7 @@ class WorkflowController extends AbstractController
                 'transition_form' => isset($transitionForm) ? $transitionForm->createView() : null,
                 'entity_workflow' => $entityWorkflow,
                 'transition_form_errors' => $errors,
-                //'comment_form' => $commentForm->createView(),
+                // 'comment_form' => $commentForm->createView(),
             ]
         );
     }
diff --git a/src/Bundle/ChillMainBundle/Cron/CronJobInterface.php b/src/Bundle/ChillMainBundle/Cron/CronJobInterface.php
index 69edf8464..41e4b41a8 100644
--- a/src/Bundle/ChillMainBundle/Cron/CronJobInterface.php
+++ b/src/Bundle/ChillMainBundle/Cron/CronJobInterface.php
@@ -20,11 +20,12 @@ interface CronJobInterface
     public function getKey(): string;
 
     /**
-     * Execute the cronjob
+     * Execute the cronjob.
      *
      * If data is returned, this data is passed as argument on the next execution
      *
      * @param array $lastExecutionData the data which was returned from the previous execution
+     *
      * @return array|null optionally return an array with the same data than the previous execution
      */
     public function run(array $lastExecutionData): null|array;
diff --git a/src/Bundle/ChillMainBundle/Cron/CronManager.php b/src/Bundle/ChillMainBundle/Cron/CronManager.php
index f69999216..3db7d5dc3 100644
--- a/src/Bundle/ChillMainBundle/Cron/CronManager.php
+++ b/src/Bundle/ChillMainBundle/Cron/CronManager.php
@@ -13,12 +13,10 @@ namespace Chill\MainBundle\Cron;
 
 use Chill\MainBundle\Entity\CronJobExecution;
 use Chill\MainBundle\Repository\CronJobExecutionRepositoryInterface;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;
 use Psr\Log\LoggerInterface;
-use function array_key_exists;
 
 /**
  * Manage cronjob and execute them.
@@ -43,11 +41,11 @@ final readonly class CronManager implements CronManagerInterface
 {
     private const LOG_PREFIX = '[cron manager] ';
 
-    private const UPDATE_AFTER_EXEC = 'UPDATE ' . CronJobExecution::class . ' cr SET cr.lastEnd = :now, cr.lastStatus = :status WHERE cr.key = :key';
+    private const UPDATE_AFTER_EXEC = 'UPDATE '.CronJobExecution::class.' cr SET cr.lastEnd = :now, cr.lastStatus = :status WHERE cr.key = :key';
 
-    private const UPDATE_BEFORE_EXEC = 'UPDATE ' . CronJobExecution::class . ' cr SET cr.lastStart = :now WHERE cr.key = :key';
+    private const UPDATE_BEFORE_EXEC = 'UPDATE '.CronJobExecution::class.' cr SET cr.lastStart = :now WHERE cr.key = :key';
 
-    private const UPDATE_LAST_EXECUTION_DATA = 'UPDATE ' . CronJobExecution::class . ' cr SET cr.lastExecutionData = :data WHERE cr.key = :key';
+    private const UPDATE_LAST_EXECUTION_DATA = 'UPDATE '.CronJobExecution::class.' cr SET cr.lastExecutionData = :data WHERE cr.key = :key';
 
     /**
      * @param CronJobInterface[] $jobs
@@ -59,7 +57,7 @@ final readonly class CronManager implements CronManagerInterface
         private LoggerInterface $logger
     ) {}
 
-    public function run(?string $forceJob = null): void
+    public function run(string $forceJob = null): void
     {
         if (null !== $forceJob) {
             $this->runForce($forceJob);
@@ -71,13 +69,13 @@ final readonly class CronManager implements CronManagerInterface
 
         foreach ($orderedJobs as $job) {
             if ($job->canRun($lasts[$job->getKey()] ?? null)) {
-                if (array_key_exists($job->getKey(), $lasts)) {
+                if (\array_key_exists($job->getKey(), $lasts)) {
                     $executionData = $lasts[$job->getKey()]->getLastExecutionData();
 
                     $this->entityManager
                         ->createQuery(self::UPDATE_BEFORE_EXEC)
                         ->setParameters([
-                            'now' => new DateTimeImmutable('now'),
+                            'now' => new \DateTimeImmutable('now'),
                             'key' => $job->getKey(),
                         ])
                         ->execute();
@@ -100,7 +98,7 @@ final readonly class CronManager implements CronManagerInterface
                     $this->entityManager
                         ->createQuery(self::UPDATE_AFTER_EXEC)
                         ->setParameters([
-                            'now' => new DateTimeImmutable('now'),
+                            'now' => new \DateTimeImmutable('now'),
                             'status' => CronJobExecution::SUCCESS,
                             'key' => $job->getKey(),
                         ])
@@ -117,12 +115,12 @@ final readonly class CronManager implements CronManagerInterface
                     $this->logger->info(sprintf('%sSuccessfully run job', self::LOG_PREFIX), ['job' => $job->getKey()]);
 
                     return;
-                } catch (Exception) {
+                } catch (\Exception) {
                     $this->logger->error(sprintf('%sRunning job failed', self::LOG_PREFIX), ['job' => $job->getKey()]);
                     $this->entityManager
                         ->createQuery(self::UPDATE_AFTER_EXEC)
                         ->setParameters([
-                            'now' => new DateTimeImmutable('now'),
+                            'now' => new \DateTimeImmutable('now'),
                             'status' => CronJobExecution::FAILURE,
                             'key' => $job->getKey(),
                         ])
@@ -152,16 +150,16 @@ final readonly class CronManager implements CronManagerInterface
             $orderedJobs,
             static function (CronJobInterface $a, CronJobInterface $b) use ($lasts): int {
                 if (
-                    (!array_key_exists($a->getKey(), $lasts) && !array_key_exists($b->getKey(), $lasts))
+                    !\array_key_exists($a->getKey(), $lasts) && !\array_key_exists($b->getKey(), $lasts)
                 ) {
                     return 0;
                 }
 
-                if (!array_key_exists($a->getKey(), $lasts) && array_key_exists($b->getKey(), $lasts)) {
+                if (!\array_key_exists($a->getKey(), $lasts) && \array_key_exists($b->getKey(), $lasts)) {
                     return -1;
                 }
 
-                if (!array_key_exists($b->getKey(), $lasts) && array_key_exists($a->getKey(), $lasts)) {
+                if (!\array_key_exists($b->getKey(), $lasts) && \array_key_exists($a->getKey(), $lasts)) {
                     return 1;
                 }
 
diff --git a/src/Bundle/ChillMainBundle/Cron/CronManagerInterface.php b/src/Bundle/ChillMainBundle/Cron/CronManagerInterface.php
index d2292d455..19b151657 100644
--- a/src/Bundle/ChillMainBundle/Cron/CronManagerInterface.php
+++ b/src/Bundle/ChillMainBundle/Cron/CronManagerInterface.php
@@ -16,5 +16,5 @@ interface CronManagerInterface
     /**
      * Execute one job, with a given priority, or the given job (identified by his key).
      */
-    public function run(?string $forceJob = null): void;
+    public function run(string $forceJob = null): void;
 }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
index bf27adc52..fdecd4092 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\Notification;
-use DateTimeImmutable;
 use Doctrine\Persistence\ObjectManager;
 
 /**
@@ -27,14 +26,14 @@ trait LoadAbstractNotificationsTrait
         foreach ($this->notifs as $notif) {
             $entityId = $this->getReference($notif['entityRef'])->getId();
 
-            echo 'Adding notification for ' . $notif['entityClass'] . '(entity id:' . $entityId . ")\n";
+            echo 'Adding notification for '.$notif['entityClass'].'(entity id:'.$entityId.")\n";
 
             $newNotif = (new Notification())
                 ->setMessage($notif['message'])
                 ->setSender($this->getReference($notif['sender']))
                 ->setRelatedEntityClass($notif['entityClass'])
                 ->setRelatedEntityId($entityId)
-                ->setDate(new DateTimeImmutable('now'))
+                ->setDate(new \DateTimeImmutable('now'))
                 ->setRead([]);
 
             foreach ($notif['addressees'] as $addressee) {
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
index 58971b9e9..f95a3cf66 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
@@ -50,7 +50,7 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
         $manager->flush();
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
     }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
index 05add5d76..4f0d24501 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
@@ -43,7 +43,7 @@ class LoadCountries extends AbstractFixture implements ContainerAwareInterface,
         $manager->flush();
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
     }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
index 6ef2dee97..8254dec1d 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
@@ -35,7 +35,7 @@ class LoadGroupCenters extends AbstractFixture implements OrderedFixtureInterfac
 
                 $manager->persist($GroupCenter);
 
-                $reference = $centerRef . '_' . $permissionGroupRef;
+                $reference = $centerRef.'_'.$permissionGroupRef;
                 $this->addReference($reference, $GroupCenter);
                 static::$refs[] = $reference;
                 echo "Creating {$reference}...  \n";
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
index 75472d3a7..54025cc2f 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
@@ -17,9 +17,6 @@ use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Intl\Intl;
-
-use function in_array;
 
 /**
  * Load languages into database.
@@ -47,8 +44,8 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface,
 
         foreach (\Symfony\Component\Intl\Languages::getNames() as $code => $language) {
             if (
-                !in_array($code, $this->regionalVersionToInclude, true)
-                && !in_array($code, $this->ancientToExclude, true)
+                !\in_array($code, $this->regionalVersionToInclude, true)
+                && !\in_array($code, $this->ancientToExclude, true)
             ) {
                 $lang = (new Language())
                     ->setId($code)
@@ -60,7 +57,7 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface,
         $manager->flush();
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
     }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
index d97a484d7..946632513 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
@@ -65,7 +65,7 @@ class LoadLocationType extends AbstractFixture implements ContainerAwareInterfac
         $manager->flush();
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
     }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
index 590aa121a..885fc9af6 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
@@ -63,7 +63,7 @@ class LoadPermissionsGroup extends AbstractFixture implements OrderedFixtureInte
             }
 
             $manager->persist($permissionGroup);
-            $reference = 'permission_group_' . $new['name'];
+            $reference = 'permission_group_'.$new['name'];
             echo "Creating {$reference} \n";
             $this->setReference($reference, $permissionGroup);
             static::$refs[] = $reference;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
index 38c717858..c8010f604 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
@@ -18,9 +18,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function strtolower;
-use function ucwords;
-
 /**
  * Description of LoadPostalCodes.
  */
@@ -351,7 +348,7 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface
             $c = new PostalCode();
             $c->setCountry($country)
                 ->setCode($code[0])
-                ->setName(ucwords(strtolower($code[1])));
+                ->setName(\ucwords(\strtolower($code[1])));
 
             if (null !== ($code[3] ?? null)) {
                 $c->setRefPostalCodeId($code[3]);
@@ -366,7 +363,7 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface
             }
 
             $manager->persist($c);
-            $ref = 'postal_code_' . $code[0];
+            $ref = 'postal_code_'.$code[0];
 
             if (!$this->hasReference($ref)) {
                 $this->addReference($ref, $c);
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
index e858d16e5..85e3f4ec2 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
@@ -56,7 +56,7 @@ class LoadRoleScopes extends AbstractFixture implements OrderedFixtureInterface
                 $roleScope = new RoleScope();
                 $roleScope->setRole($key)
                     ->setScope($this->getReference($scopeReference));
-                $reference = 'role_scope_' . $key . '_' . $this->getReference($scopeReference)->getName()['en'];
+                $reference = 'role_scope_'.$key.'_'.$this->getReference($scopeReference)->getName()['en'];
                 echo "Creating {$reference} \n";
                 $this->addReference($reference, $roleScope);
                 $manager->persist($roleScope);
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php
index 99f6fa473..10c10de8c 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php
@@ -58,7 +58,7 @@ class LoadScopes extends AbstractFixture implements OrderedFixtureInterface
             $scope->setName($new['names']);
 
             $manager->persist($scope);
-            $reference = 'scope_' . $new['names']['en'];
+            $reference = 'scope_'.$new['names']['en'];
             $this->addReference($reference, $scope);
             static::$references[] = $reference;
         }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
index ad865ca14..d22da6b78 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
@@ -15,14 +15,11 @@ use Chill\MainBundle\Entity\User;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use LogicException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Security\Core\Encoder\EncoderFactory;
 use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
 
-use function str_replace;
-
 /**
  * Load fixtures users into database.
  *
@@ -81,13 +78,13 @@ class LoadUsers extends AbstractFixture implements ContainerAwareInterface, Orde
                         ->getEncoder($user)
                         ->encodePassword('password', $user->getSalt())
                 )
-                ->setEmail(sprintf('%s@chill.social', str_replace(' ', '', (string) $username)));
+                ->setEmail(sprintf('%s@chill.social', \str_replace(' ', '', (string) $username)));
 
             foreach ($params['groupCenterRefs'] as $groupCenterRef) {
                 $user->addGroupCenter($this->getReference($groupCenterRef));
             }
 
-            echo 'Creating user ' . $username . "... \n";
+            echo 'Creating user '.$username."... \n";
             $manager->persist($user);
             $this->addReference($username, $user);
         }
@@ -95,10 +92,10 @@ class LoadUsers extends AbstractFixture implements ContainerAwareInterface, Orde
         $manager->flush();
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         if (null === $container) {
-            throw new LogicException('$container should not be null');
+            throw new \LogicException('$container should not be null');
         }
 
         $this->container = $container;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 72848303f..2590b549b 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -23,8 +23,6 @@ use Chill\MainBundle\Controller\RegroupmentController;
 use Chill\MainBundle\Controller\UserController;
 use Chill\MainBundle\Controller\UserJobApiController;
 use Chill\MainBundle\Controller\UserJobController;
-use Chill\MainBundle\Controller\UserJobHistoryController;
-use Chill\MainBundle\Controller\UserScopeHistoryController;
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
 use Chill\MainBundle\Doctrine\DQL\Age;
 use Chill\MainBundle\Doctrine\DQL\Extract;
@@ -59,8 +57,6 @@ use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Form\CenterType;
-use Chill\MainBundle\Entity\User\UserJobHistory;
-use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Form\CivilityType;
 use Chill\MainBundle\Form\CountryType;
 use Chill\MainBundle\Form\LanguageType;
@@ -69,7 +65,6 @@ use Chill\MainBundle\Form\LocationTypeType;
 use Chill\MainBundle\Form\RegroupmentType;
 use Chill\MainBundle\Form\UserJobType;
 use Chill\MainBundle\Form\UserType;
-use Exception;
 use Misd\PhoneNumberBundle\Doctrine\DBAL\Types\PhoneNumberType;
 use Ramsey\Uuid\Doctrine\UuidType;
 use Symfony\Component\Config\FileLocator;
@@ -79,8 +74,6 @@ use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-use function count;
-
 /**
  * Class ChillMainExtension
  * This class load config for chillMainExtension.
@@ -101,7 +94,7 @@ class ChillMainExtension extends Extension implements
         $this->widgetFactories[] = $factory;
     }
 
-    public function getConfiguration(array $config, ContainerBuilder $container): \Chill\MainBundle\DependencyInjection\Configuration
+    public function getConfiguration(array $config, ContainerBuilder $container): Configuration
     {
         return new Configuration($this->widgetFactories, $container);
     }
@@ -115,7 +108,7 @@ class ChillMainExtension extends Extension implements
     }
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     public function load(array $configs, ContainerBuilder $container)
     {
@@ -195,7 +188,7 @@ class ChillMainExtension extends Extension implements
                 []
         );
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/doctrine.yaml');
         $loader->load('services/logger.yaml');
@@ -223,12 +216,12 @@ class ChillMainExtension extends Extension implements
 
         $this->configureCruds($container, $config['cruds'], $config['apis'], $loader);
         $container->setParameter('chill_main.short_messages', $config['short_messages']);
-        //$this->configureSms($config['short_messages'], $container, $loader);
+        // $this->configureSms($config['short_messages'], $container, $loader);
     }
 
     public function prepend(ContainerBuilder $container)
     {
-        //add installation_name and date_format to globals
+        // add installation_name and date_format to globals
         $chillMainConfig = $container->getExtensionConfig($this->getAlias());
         $config = $this->processConfiguration($this
             ->getConfiguration($chillMainConfig, $container), $chillMainConfig);
@@ -243,7 +236,7 @@ class ChillMainExtension extends Extension implements
         ];
         $container->prependExtensionConfig('twig', $twigConfig);
 
-        //add DQL function to ORM (default entity_manager)
+        // add DQL function to ORM (default entity_manager)
         $container
             ->prependExtensionConfig(
                 'doctrine',
@@ -283,7 +276,7 @@ class ChillMainExtension extends Extension implements
                 ],
             );
 
-        //add dbal types (default entity_manager)
+        // add dbal types (default entity_manager)
         $container
             ->prependExtensionConfig(
                 'doctrine',
@@ -305,7 +298,7 @@ class ChillMainExtension extends Extension implements
                 ]
             );
 
-        //add current route to chill main
+        // add current route to chill main
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
@@ -314,7 +307,7 @@ class ChillMainExtension extends Extension implements
             ],
         ]);
 
-        //add a channel to log app events
+        // add a channel to log app events
         $container->prependExtensionConfig('monolog', [
             'channels' => ['chill'],
         ]);
@@ -326,7 +319,7 @@ class ChillMainExtension extends Extension implements
             ],
         ]);
 
-        //add crud api
+        // add crud api
         $this->prependCruds($container);
     }
 
@@ -339,7 +332,7 @@ class ChillMainExtension extends Extension implements
         array $apiConfig,
         Loader\YamlFileLoader $loader
     ): void {
-        if (count($crudConfig) === 0) {
+        if (0 === \count($crudConfig)) {
             return;
         }
 
@@ -773,7 +766,7 @@ class ChillMainExtension extends Extension implements
                             ],
                         ],
                     ],
-                ]
+                ],
             ],
         ]);
     }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php
index 70efbf409..6518d6115 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
 use Chill\MainBundle\Form\PermissionsGroupType;
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -29,13 +28,7 @@ class ACLFlagsCompilerPass implements CompilerPassInterface
             foreach ($tags as $tag) {
                 match ($tag['scope']) {
                     PermissionsGroupType::FLAG_SCOPE => $permissionGroupType->addMethodCall('addFlagProvider', [$reference]),
-                    default => throw new LogicException(
-                        sprintf(
-                            "This tag 'scope' is not implemented: %s, on service with id %s",
-                            $tag['scope'],
-                            $id
-                        )
-                    ),
+                    default => throw new \LogicException(sprintf("This tag 'scope' is not implemented: %s, on service with id %s", $tag['scope'], $id)),
                 };
             }
         }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
index 5c351728a..dbd79c0f4 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
 use Chill\MainBundle\Export\ExportManager;
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -32,8 +31,7 @@ class ExportsCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (!$container->has(ExportManager::class)) {
-            throw new LogicException('service ' . ExportManager::class . ' '
-                    . 'is not defined. It is required by ExportsCompilerPass');
+            throw new \LogicException('service '.ExportManager::class.' is not defined. It is required by ExportsCompilerPass');
         }
 
         $chillManagerDefinition = $container->findDefinition(
@@ -57,13 +55,11 @@ class ExportsCompilerPass implements CompilerPassInterface
         foreach ($taggedServices as $id => $tagAttributes) {
             foreach ($tagAttributes as $attributes) {
                 if (!isset($attributes['prefix'])) {
-                    throw new LogicException("the 'prefix' attribute is missing in your " .
-                        "service '{$id}' definition");
+                    throw new \LogicException("the 'prefix' attribute is missing in your service '{$id}' definition");
                 }
 
                 if (array_search($attributes['prefix'], $knownAliases, true)) {
-                    throw new LogicException('There is already a chill.export_elements_provider service with prefix '
-                        . $attributes['prefix'] . '. Choose another prefix.');
+                    throw new \LogicException('There is already a chill.export_elements_provider service with prefix '.$attributes['prefix'].'. Choose another prefix.');
                 }
                 $knownAliases[] = $attributes['prefix'];
 
@@ -88,13 +84,11 @@ class ExportsCompilerPass implements CompilerPassInterface
         foreach ($taggedServices as $id => $tagAttributes) {
             foreach ($tagAttributes as $attributes) {
                 if (!isset($attributes['alias'])) {
-                    throw new LogicException("the 'alias' attribute is missing in your " .
-                        "service '{$id}' definition");
+                    throw new \LogicException("the 'alias' attribute is missing in your service '{$id}' definition");
                 }
 
                 if (array_search($attributes['alias'], $knownAliases, true)) {
-                    throw new LogicException('There is already a chill.export_formatter service with alias '
-                        . $attributes['alias'] . '. Choose another alias.');
+                    throw new \LogicException('There is already a chill.export_formatter service with alias '.$attributes['alias'].'. Choose another alias.');
                 }
                 $knownAliases[] = $attributes['alias'];
 
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
index d6a27c943..a91436d3b 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
 use Chill\MainBundle\Routing\MenuComposer;
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -22,8 +21,7 @@ class MenuCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('chill.main.menu_composer')) {
-            throw new LogicException(sprintf('The service %s does not exists in '
-                . 'container.', MenuComposer::class));
+            throw new \LogicException(sprintf('The service %s does not exists in container.', MenuComposer::class));
         }
 
         $menuComposerDefinition = $container->getDefinition('chill.main.menu_composer');
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php
index ed8c2cf03..a0ea00e8a 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
 use Chill\MainBundle\Templating\UI\CountNotificationUser;
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -22,8 +21,7 @@ class NotificationCounterCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition(CountNotificationUser::class)) {
-            throw new LogicException('The service ' . CountNotificationUser::class . ' '
-                . 'should be defined');
+            throw new \LogicException('The service '.CountNotificationUser::class.' should be defined');
         }
 
         $notificationCounterDefinition = $container->getDefinition(CountNotificationUser::class);
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
index d4d122d97..ee305f964 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -26,8 +25,7 @@ class SearchableServicesCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('chill_main.search_provider')) {
-            throw new LogicException('service chill_main.search_provider '
-                    . 'is not defined.');
+            throw new \LogicException('service chill_main.search_provider is not defined.');
         }
 
         $definition = $container->getDefinition(
@@ -43,13 +41,11 @@ class SearchableServicesCompilerPass implements CompilerPassInterface
         foreach ($taggedServices as $id => $tagAttributes) {
             foreach ($tagAttributes as $attributes) {
                 if (!isset($attributes['alias'])) {
-                    throw new LogicException("the 'name' attribute is missing in your " .
-                        "service '{$id}' definition");
+                    throw new \LogicException("the 'name' attribute is missing in your service '{$id}' definition");
                 }
 
                 if (array_search($attributes['alias'], $knownAliases, true)) {
-                    throw new LogicException('There is already a chill.search service with alias '
-                        . $attributes['alias'] . '. Choose another alias.');
+                    throw new \LogicException('There is already a chill.search service with alias '.$attributes['alias'].'. Choose another alias.');
                 }
                 $knownAliases[] = $attributes['alias'];
 
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
index 88d72bddf..ebbfcee1b 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
@@ -28,7 +28,6 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Reference;
-use function array_key_exists;
 
 class ShortMessageCompilerPass implements CompilerPassInterface
 {
@@ -43,30 +42,28 @@ class ShortMessageCompilerPass implements CompilerPassInterface
         if ('null' === $dsn['scheme'] || false === $config['enabled']) {
             $defaultTransporter = new Reference(NullShortMessageSender::class);
         } elseif ('ovh' === $dsn['scheme']) {
-            if (!class_exists('\\' . \Ovh\Api::class)) {
+            if (!class_exists('\\'.\Ovh\Api::class)) {
                 throw new RuntimeException('Class \\Ovh\\Api not found');
             }
 
             foreach (['user', 'host', 'pass'] as $component) {
-                if (!array_key_exists($component, $dsn)) {
-                    throw new RuntimeException(sprintf('The component %s does not exist in dsn. Please provide a dsn ' .
-                        'like ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz', $component));
+                if (!\array_key_exists($component, $dsn)) {
+                    throw new RuntimeException(sprintf('The component %s does not exist in dsn. Please provide a dsn like ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz', $component));
                 }
 
-                $container->setParameter('chill_main.short_messages.ovh_config_' . $component, $dsn[$component]);
+                $container->setParameter('chill_main.short_messages.ovh_config_'.$component, $dsn[$component]);
             }
 
             foreach (['consumer_key', 'sender', 'service_name'] as $param) {
-                if (!array_key_exists($param, $dsn['queries'])) {
-                    throw new RuntimeException(sprintf('The parameter %s does not exist in dsn. Please provide a dsn ' .
-                        'like ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz', $param));
+                if (!\array_key_exists($param, $dsn['queries'])) {
+                    throw new RuntimeException(sprintf('The parameter %s does not exist in dsn. Please provide a dsn like ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz', $param));
                 }
-                $container->setParameter('chill_main.short_messages.ovh_config_' . $param, $dsn['queries'][$param]);
+                $container->setParameter('chill_main.short_messages.ovh_config_'.$param, $dsn['queries'][$param]);
             }
 
             $ovh = new Definition();
             $ovh
-                ->setClass('\\' . \Ovh\Api::class)
+                ->setClass('\\'.\Ovh\Api::class)
                 ->setArgument(0, $dsn['user'])
                 ->setArgument(1, $dsn['pass'])
                 ->setArgument(2, $dsn['host'])
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php
index 56b4f0ef3..28ef7a991 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -25,8 +24,7 @@ class TimelineCompilerClass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('chill_main.timeline_builder')) {
-            throw new LogicException('service chill_main.timeline_builder '
-                    . 'is not defined.');
+            throw new \LogicException('service chill_main.timeline_builder is not defined.');
         }
 
         $definition = $container->getDefinition(
@@ -40,8 +38,7 @@ class TimelineCompilerClass implements CompilerPassInterface
         foreach ($taggedServices as $id => $tagAttributes) {
             foreach ($tagAttributes as $attributes) {
                 if (!isset($attributes['context'])) {
-                    throw new LogicException("the 'context' attribute is missing in your " .
-                        "service '{$id}' definition");
+                    throw new \LogicException("the 'context' attribute is missing in your service '{$id}' definition");
                 }
 
                 $definition->addMethodCall(
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php
index 9b39165d8..202d6f468 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php
@@ -11,13 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\DependencyInjection;
 
-use LogicException;
-use RuntimeException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-use function count;
-
 /**
  * Description of ConfigConsistencyCompilerPass.
  */
@@ -42,17 +38,14 @@ class ConfigConsistencyCompilerPass implements CompilerPassInterface
             }
         }
 
-        if (count($fallbackLocales) === 0) {
-            throw new LogicException('the fallback locale are not defined. '
-                  . 'The framework config should not allow this.');
+        if (0 === \count($fallbackLocales)) {
+            throw new \LogicException('the fallback locale are not defined. The framework config should not allow this.');
         }
 
         $diff = array_diff($fallbackLocales, $availableLanguages);
 
-        if (count($diff) > 0) {
-            throw new RuntimeException(sprintf('The chill_main.available_languages'
-                  . ' parameter does not contains fallback locales. The languages %s'
-                  . ' are missing.', implode(', ', $diff)));
+        if (\count($diff) > 0) {
+            throw new \RuntimeException(sprintf('The chill_main.available_languages parameter does not contains fallback locales. The languages %s are missing.', implode(', ', $diff)));
         }
     }
 }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
index 7cfe8cfb6..76e160b52 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
@@ -176,8 +176,8 @@ class Configuration implements ConfigurationInterface
             ->scalarNode('path')
             ->defaultNull()
             ->info('the path that will be **appended** after the base path. Do not forget to add '
-                                                . 'arguments for the method. Will be set to the action name, including an `{id}` '
-                                                . 'parameter if left empty.')
+                                                .'arguments for the method. Will be set to the action name, including an `{id}` '
+                                                .'parameter if left empty.')
             ->example('/{id}/my-action')
             ->end()
             ->arrayNode('requirements')
@@ -216,15 +216,15 @@ class Configuration implements ConfigurationInterface
             ->children()
             ->scalarNode('controller_action')
             ->defaultNull()
-            ->info('the method name to call in the controller. Will be set to the concatenation ' .
+            ->info('the method name to call in the controller. Will be set to the concatenation '.
                                                 'of action name + \'Api\' if left empty.')
             ->example('showApi')
             ->end()
             ->scalarNode('path')
             ->defaultNull()
-            ->info('the path that will be **appended** after the base path. Do not forget to add ' .
-                                                'arguments for the method. By default, will set to the action name, including an `{id}` ' .
-                                                'parameter. A suffix of action name will be appended, except if the action name ' .
+            ->info('the path that will be **appended** after the base path. Do not forget to add '.
+                                                'arguments for the method. By default, will set to the action name, including an `{id}` '.
+                                                'parameter. A suffix of action name will be appended, except if the action name '.
                                                 'is "_entity".')
             ->example('/{id}/my-action')
             ->end()
@@ -235,8 +235,8 @@ class Configuration implements ConfigurationInterface
             ->enumNode('single_collection')
             ->values(['single', 'collection'])
             ->defaultValue('single')
-            ->info('indicates if the returned object is a single element or a collection. ' .
-                                                    'If the action name is `_index`, this value will always be considered as ' .
+            ->info('indicates if the returned object is a single element or a collection. '.
+                                                    'If the action name is `_index`, this value will always be considered as '.
                                                     '`collection`')
             ->end()
             ->arrayNode('methods')
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php b/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php
index f50a97636..a8f1a398c 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php
@@ -11,12 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\DependencyInjection;
 
-use Exception;
-
 /**
  * Description of MissingBundleException.
  */
-class MissingBundleException extends Exception
+class MissingBundleException extends \Exception
 {
     public function __construct($missingBundleName)
     {
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php
index 5b20bde62..c4bbc846d 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\DependencyInjection;
 
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -21,8 +20,7 @@ class RoleProvidersCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('chill.main.role_provider')) {
-            throw new LogicException('service chill.main.role_provider '
-                    . 'is not defined. It is required by RoleProviderCompilerPass');
+            throw new \LogicException('service chill.main.role_provider is not defined. It is required by RoleProviderCompilerPass');
         }
 
         $definition = $container->getDefinition(
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
index 4a502c3e7..85b7c892f 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
@@ -13,20 +13,11 @@ namespace Chill\MainBundle\DependencyInjection\Widget;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
 use Doctrine\Common\Proxy\Exception\InvalidArgumentException;
-use LengthException;
-use LogicException;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
-use UnexpectedValueException;
-
-use function array_key_exists;
-use function count;
-use function get_class;
-use function in_array;
-use function is_array;
 
 /**
  * Compile the configurations and inject required service into container.
@@ -122,11 +113,11 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
     /**
      * process the configuration and the container to add the widget available.
      *
-     * @param string $extension the extension of your bundle
+     * @param string $extension                          the extension of your bundle
      * @param string $containerWidgetConfigParameterName the key under which we can use the widget configuration
      *
-     * @throws LogicException
-     * @throws UnexpectedValueException if the given extension does not implement HasWidgetExtensionInterface
+     * @throws \LogicException
+     * @throws \UnexpectedValueException if the given extension does not implement HasWidgetExtensionInterface
      */
     public function doProcess(
         ContainerBuilder $container,
@@ -134,8 +125,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
         $containerWidgetConfigParameterName
     ) {
         if (!$container->hasDefinition(self::WIDGET_MANAGER)) {
-            throw new LogicException('the service ' . self::WIDGET_MANAGER . ' should' .
-                ' be present. It is required by ' . self::class);
+            throw new \LogicException('the service '.self::WIDGET_MANAGER.' should be present. It is required by '.self::class);
         }
 
         $managerDefinition = $container->getDefinition(self::WIDGET_MANAGER);
@@ -145,14 +135,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
         $extensionClass = $container->getExtension($extension);
         // throw an error if extension does not implement HasWidgetFactoriesExtensionInterface
         if (!$extensionClass instanceof HasWidgetFactoriesExtensionInterface) {
-            throw new UnexpectedValueException(sprintf(
-                'The extension for %s '
-                    . 'do not implements %s. You should implement %s on %s',
-                $extension,
-                HasWidgetFactoriesExtensionInterface::class,
-                HasWidgetFactoriesExtensionInterface::class,
-                $extensionClass::class
-            ));
+            throw new \UnexpectedValueException(sprintf('The extension for %s do not implements %s. You should implement %s on %s', $extension, HasWidgetFactoriesExtensionInterface::class, HasWidgetFactoriesExtensionInterface::class, $extensionClass::class));
         }
 
         $this->widgetFactories = $extensionClass->getWidgetFactories();
@@ -168,18 +151,13 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
             foreach ($widgets as $param) {
                 $alias = $param[self::WIDGET_CONFIG_ALIAS];
                 // check that the service exists
-                if (!array_key_exists($alias, $this->widgetServices)) {
-                    throw new InvalidConfigurationException(sprintf('The alias %s' .
-                        ' is not defined.', $alias));
+                if (!\array_key_exists($alias, $this->widgetServices)) {
+                    throw new InvalidConfigurationException(sprintf('The alias %s is not defined.', $alias));
                 }
 
                 // check that the widget is allowed at this place
                 if (!$this->isPlaceAllowedForWidget($place, $alias, $container)) {
-                    throw new InvalidConfigurationException(sprintf(
-                        'The widget with alias %s is not allowed at place %s',
-                        $alias,
-                        $place
-                    ));
+                    throw new InvalidConfigurationException(sprintf('The widget with alias %s is not allowed at place %s', $alias, $place));
                 }
 
                 // get the order, eventually corrected
@@ -242,23 +220,17 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
             foreach ($attrs as $attr) {
                 // check the alias is set
                 if (!isset($attr[self::WIDGET_SERVICE_TAG_ALIAS])) {
-                    throw new InvalidConfigurationException('you should add an ' . self::WIDGET_SERVICE_TAG_ALIAS .
-                        ' key on the service ' . $id);
+                    throw new InvalidConfigurationException('you should add an '.self::WIDGET_SERVICE_TAG_ALIAS.' key on the service '.$id);
                 }
 
                 // check the place is set
                 if (!isset($attr[self::WIDGET_SERVICE_TAG_PLACES])) {
-                    throw new InvalidConfigurationException(sprintf(
-                        'You should add a %s key on the service %s',
-                        self::WIDGET_SERVICE_TAG_PLACES,
-                        $id
-                    ));
+                    throw new InvalidConfigurationException(sprintf('You should add a %s key on the service %s', self::WIDGET_SERVICE_TAG_PLACES, $id));
                 }
 
                 // check the alias does not exists yet
-                if (array_key_exists($attr[self::WIDGET_SERVICE_TAG_ALIAS], $this->widgetServices)) {
-                    throw new InvalidArgumentException('a service has already be defined with the ' .
-                        self::WIDGET_SERVICE_TAG_ALIAS . ' ' . $attr[self::WIDGET_SERVICE_TAG_ALIAS]);
+                if (\array_key_exists($attr[self::WIDGET_SERVICE_TAG_ALIAS], $this->widgetServices)) {
+                    throw new InvalidArgumentException('a service has already be defined with the '.self::WIDGET_SERVICE_TAG_ALIAS.' '.$attr[self::WIDGET_SERVICE_TAG_ALIAS]);
                 }
 
                 // register the service as available
@@ -273,29 +245,21 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
 
             // check the alias is not empty
             if (empty($alias)) {
-                throw new LogicException(sprintf(
-                    'the widget factory %s returns an empty alias',
-                    $factory::class
-                ));
+                throw new \LogicException(sprintf('the widget factory %s returns an empty alias', $factory::class));
             }
 
             // check the places are not empty
-            if (!is_array($factory->getAllowedPlaces())) {
-                throw new UnexpectedValueException("the method 'getAllowedPlaces' "
-                        . 'should return a non-empty array. Unexpected value on ' .
-                        $factory::class);
+            if (!\is_array($factory->getAllowedPlaces())) {
+                throw new \UnexpectedValueException("the method 'getAllowedPlaces' ".'should return a non-empty array. Unexpected value on '.$factory::class);
             }
 
-            if (count($factory->getAllowedPlaces()) === 0) {
-                throw new LengthException("The method 'getAllowedPlaces' should "
-                        . 'return a non-empty array, but returned 0 elements on ' .
-                        $factory::class . '::getAllowedPlaces()');
+            if (0 === \count($factory->getAllowedPlaces())) {
+                throw new \LengthException("The method 'getAllowedPlaces' should ".'return a non-empty array, but returned 0 elements on '.$factory::class.'::getAllowedPlaces()');
             }
 
             // check the alias does not exists yet
-            if (array_key_exists($alias, $this->widgetServices)) {
-                throw new InvalidArgumentException('a service has already be defined with the ' .
-                    self::WIDGET_SERVICE_TAG_ALIAS . ' ' . $alias);
+            if (\array_key_exists($alias, $this->widgetServices)) {
+                throw new InvalidArgumentException('a service has already be defined with the '.self::WIDGET_SERVICE_TAG_ALIAS.' '.$alias);
             }
 
             // register the factory as available
@@ -307,7 +271,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
      * register the service into container.
      *
      * @param string $place
-     * @param float $order
+     * @param float  $order
      *
      * @return string the id of the new service
      */
@@ -338,14 +302,14 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
      * recursive method.
      *
      * @param string $place
-     * @param float $ordering
+     * @param float  $ordering
      *
      * @return float
      */
     private function cacheAndGetOrdering($place, $ordering)
     {
         // create a key in the cache array if not exists
-        if (!array_key_exists($place, $this->cacheOrdering)) {
+        if (!\array_key_exists($place, $this->cacheOrdering)) {
             $this->cacheOrdering[$place] = [];
         }
 
@@ -363,14 +327,13 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
     /**
      * get the places where the service is allowed.
      *
-     *
      * @return unknown
      */
     private function isPlaceAllowedForWidget(mixed $place, mixed $widgetAlias, ContainerBuilder $container)
     {
         if ($this->widgetServices[$widgetAlias] instanceof WidgetFactoryInterface) {
             if (
-                in_array($place, $this->widgetServices[$widgetAlias]
+                \in_array($place, $this->widgetServices[$widgetAlias]
                     ->getAllowedPlaces(), true)
             ) {
                 return true;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
index 41ec16818..47040f0e1 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
@@ -16,10 +16,6 @@ use Generator;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use function array_key_exists;
-use function count;
-use function implode;
-use function in_array;
 
 /**
  * This trait allow to add automatic configuration for widget inside your config.
@@ -141,10 +137,10 @@ trait AddWidgetConfigurationTrait
         $treeBuilder = new TreeBuilder($place);
         $root = $treeBuilder->getRootNode()
             ->canBeUnset()
-            ->info('register widgets on place "' . $place . '"');
+            ->info('register widgets on place "'.$place.'"');
 
         // if no childen, return the root
-        if (count(iterator_to_array($this->filterWidgetByPlace($place))) === 0) {
+        if (0 === \count(iterator_to_array($this->filterWidgetByPlace($place)))) {
             return $root;
         }
 
@@ -162,8 +158,8 @@ trait AddWidgetConfigurationTrait
                 // is build, the services are avaialble => we add the possible aliases
                 // in the info.
             ->info('the widget alias (see your installed bundles config). '
-                        . 'Possible values are (maybe incomplete) : ' .
-                        implode(', ', $this->getWidgetAliasesbyPlace($place, $containerBuilder)))
+                        .'Possible values are (maybe incomplete) : '.
+                        \implode(', ', $this->getWidgetAliasesbyPlace($place, $containerBuilder)))
             ->isRequired()
             ->end();
 
@@ -188,12 +184,12 @@ trait AddWidgetConfigurationTrait
      *
      * @param string $place
      *
-     * @return Generator a generator containing a widget factory
+     * @return \Generator a generator containing a widget factory
      */
     protected function filterWidgetByPlace($place)
     {
         foreach ($this->widgetFactories as $factory) {
-            if (in_array($place, $factory->getAllowedPlaces(), true)) {
+            if (\in_array($place, $factory->getAllowedPlaces(), true)) {
                 yield $factory;
             }
         }
@@ -209,9 +205,9 @@ trait AddWidgetConfigurationTrait
      *
      * @param type $place
      *
-     * @throws InvalidConfigurationException if a service's tag does not have the "alias" key
-     *
      * @return array
+     *
+     * @throws InvalidConfigurationException if a service's tag does not have the "alias" key
      */
     protected function getWidgetAliasesbyPlace($place, ContainerBuilder $containerBuilder)
     {
@@ -223,16 +219,11 @@ trait AddWidgetConfigurationTrait
 
         // append the aliases added without factory
         foreach ($containerBuilder
-            ->findTaggedServiceIds(WidgetsCompilerPass::WIDGET_SERVICE_TAG_NAME)
-            as $serviceId => $tags) {
+            ->findTaggedServiceIds(WidgetsCompilerPass::WIDGET_SERVICE_TAG_NAME) as $serviceId => $tags) {
             foreach ($tags as $tag) {
                 // throw an error if no alias in definition
-                if (!array_key_exists(WidgetsCompilerPass::WIDGET_SERVICE_TAG_ALIAS, $tag)) {
-                    throw new InvalidConfigurationException(sprintf(
-                        'The service with id %s does not have any %d key',
-                        $serviceId,
-                        WidgetsCompilerPass::WIDGET_SERVICE_TAG_ALIAS
-                    ));
+                if (!\array_key_exists(WidgetsCompilerPass::WIDGET_SERVICE_TAG_ALIAS, $tag)) {
+                    throw new InvalidConfigurationException(sprintf('The service with id %s does not have any %d key', $serviceId, WidgetsCompilerPass::WIDGET_SERVICE_TAG_ALIAS));
                 }
                 // add the key to the possible results
                 $result[] = $tag[WidgetsCompilerPass::WIDGET_SERVICE_TAG_ALIAS];
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
index d63d30a00..aaaf3fc47 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
@@ -72,7 +72,7 @@ interface WidgetFactoryInterface
      * return the service id to build the widget.
      *
      * @param string $place
-     * @param float $order
+     * @param float  $order
      *
      * @return string the service definition
      */
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Age.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Age.php
index c69ef721c..dd28a8efe 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Age.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Age.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
-use Doctrine\ORM\Query\AST\PathExpression;
 use Doctrine\ORM\Query\Lexer;
 use Doctrine\ORM\Query\Parser;
 use Doctrine\ORM\Query\SqlWalker;
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php
index 6fc763c6d..1fb51c15b 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php
@@ -30,9 +30,9 @@ class Extract extends FunctionNode
     private string $field;
 
     private null|\Doctrine\ORM\Query\AST\Node|string $value = null;
-    //private PathExpression $value;
-    //private FunctionNode $value;
-    //private DateDiffFunction $value;
+    // private PathExpression $value;
+    // private FunctionNode $value;
+    // private DateDiffFunction $value;
 
     public function getSql(SqlWalker $sqlWalker)
     {
@@ -53,7 +53,7 @@ class Extract extends FunctionNode
 
         $parser->match(Lexer::T_FROM);
 
-        //$this->value = $parser->ScalarExpression();
+        // $this->value = $parser->ScalarExpression();
         $this->value = $parser->ArithmeticPrimary();
 
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Greatest.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Greatest.php
index c76bd22cf..924831eb1 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Greatest.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Greatest.php
@@ -33,7 +33,7 @@ class Greatest extends FunctionNode
 
     public function getSql(SqlWalker $sqlWalker)
     {
-        return 'GREATEST(' . implode(', ', array_map(static fn (Node $expr) => $expr->dispatch($sqlWalker), $this->exprs)) . ')';
+        return 'GREATEST('.implode(', ', array_map(static fn (Node $expr) => $expr->dispatch($sqlWalker), $this->exprs)).')';
     }
 
     public function parse(Parser $parser)
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonBuildObject.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonBuildObject.php
index 4a8c3485a..675935867 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonBuildObject.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonBuildObject.php
@@ -32,7 +32,7 @@ class JsonBuildObject extends FunctionNode
 
     public function getSql(SqlWalker $sqlWalker)
     {
-        return 'JSONB_BUILD_OBJECT(' . implode(', ', array_map(static fn (Node $expr) => $expr->dispatch($sqlWalker), $this->exprs)) . ')';
+        return 'JSONB_BUILD_OBJECT('.implode(', ', array_map(static fn (Node $expr) => $expr->dispatch($sqlWalker), $this->exprs)).')';
     }
 
     public function parse(Parser $parser)
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Least.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Least.php
index 9befa5f40..7497e042e 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Least.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Least.php
@@ -33,7 +33,7 @@ class Least extends FunctionNode
 
     public function getSql(SqlWalker $sqlWalker)
     {
-        return 'LEAST(' . implode(', ', array_map(static fn (Node $expr) => $expr->dispatch($sqlWalker), $this->exprs)) . ')';
+        return 'LEAST('.implode(', ', array_map(static fn (Node $expr) => $expr->dispatch($sqlWalker), $this->exprs)).')';
     }
 
     public function parse(Parser $parser)
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
index 3b868d522..2495199b1 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
@@ -15,7 +15,6 @@ use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\AST\PathExpression;
 use Doctrine\ORM\Query\Lexer;
 use Doctrine\ORM\Query\Parser;
-use Exception;
 
 /**
  * DQL function for OVERLAPS function in postgresql.
@@ -76,7 +75,7 @@ class OverlapsI extends FunctionNode
         $p = match ($position) {
             'start' => '-infinity',
             'end' => 'infinity',
-            default => throw new Exception('Unexpected position value.'),
+            default => throw new \Exception('Unexpected position value.'),
         };
 
         if ($part instanceof PathExpression) {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php
index c66875e87..7caf2c62c 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php
@@ -24,12 +24,12 @@ class Replace extends FunctionNode
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
-        return 'REPLACE(' .
-            $this->string->dispatch($sqlWalker) .
-            ', ' .
-            $this->from->dispatch($sqlWalker) .
-            ', ' .
-            $this->to->dispatch($sqlWalker) .
+        return 'REPLACE('.
+            $this->string->dispatch($sqlWalker).
+            ', '.
+            $this->from->dispatch($sqlWalker).
+            ', '.
+            $this->to->dispatch($sqlWalker).
             ')';
     }
 
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
index e1e81a799..aa9bd29a4 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
@@ -25,8 +25,8 @@ class STContains extends FunctionNode
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'ST_CONTAINS(' . $this->firstPart->dispatch($sqlWalker) .
-            ', ' . $this->secondPart->dispatch($sqlWalker) . ')';
+        return 'ST_CONTAINS('.$this->firstPart->dispatch($sqlWalker).
+            ', '.$this->secondPart->dispatch($sqlWalker).')';
     }
 
     public function parse(\Doctrine\ORM\Query\Parser $parser)
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
index e539749ec..2aa97fb9c 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
@@ -22,8 +22,8 @@ class Similarity extends FunctionNode
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'SIMILARITY(' . $this->firstPart->dispatch($sqlWalker) .
-            ', ' . $this->secondPart->dispatch($sqlWalker) . ')';
+        return 'SIMILARITY('.$this->firstPart->dispatch($sqlWalker).
+            ', '.$this->secondPart->dispatch($sqlWalker).')';
     }
 
     public function parse(\Doctrine\ORM\Query\Parser $parser)
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
index b5b01e307..7d0ef2acf 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
@@ -23,8 +23,8 @@ class StrictWordSimilarityOPS extends \Doctrine\ORM\Query\AST\Functions\Function
 
     public function getSql(SqlWalker $sqlWalker)
     {
-        return $this->firstPart->dispatch($sqlWalker) .
-            ' <<% ' . $this->secondPart->dispatch($sqlWalker);
+        return $this->firstPart->dispatch($sqlWalker).
+            ' <<% '.$this->secondPart->dispatch($sqlWalker);
     }
 
     public function parse(Parser $parser)
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
index 03d7145e0..5813c546f 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
@@ -26,7 +26,7 @@ class Unaccent extends FunctionNode
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'UNACCENT(' . $this->string->dispatch($sqlWalker) . ')';
+        return 'UNACCENT('.$this->string->dispatch($sqlWalker).')';
     }
 
     public function parse(\Doctrine\ORM\Query\Parser $parser)
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php b/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
index 844ea89e3..e6ac2308a 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
@@ -14,7 +14,6 @@ namespace Chill\MainBundle\Doctrine\Event;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Events;
 use Doctrine\Persistence\Event\LifecycleEventArgs;
@@ -37,7 +36,7 @@ class TrackCreateUpdateSubscriber implements EventSubscriber
         $object = $args->getObject();
 
         if ($object instanceof TrackCreationInterface) {
-            $object->setCreatedAt(new DateTimeImmutable('now'));
+            $object->setCreatedAt(new \DateTimeImmutable('now'));
 
             if ($this->security->getUser() instanceof User) {
                 $object->setCreatedBy($this->security->getUser());
@@ -57,7 +56,7 @@ class TrackCreateUpdateSubscriber implements EventSubscriber
     protected function onUpdate(object $object): void
     {
         if ($object instanceof TrackUpdateInterface) {
-            $object->setUpdatedAt(new DateTimeImmutable('now'));
+            $object->setUpdatedAt(new \DateTimeImmutable('now'));
 
             if ($this->security->getUser() instanceof User) {
                 $object->setUpdatedBy($this->security->getUser());
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php b/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php
index 96fc12558..4c76ba03a 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php
@@ -14,9 +14,6 @@ namespace Chill\MainBundle\Doctrine\Migrations;
 use Doctrine\Migrations\Version\Comparator;
 use Doctrine\Migrations\Version\Version;
 
-use function explode;
-use function strcmp;
-
 /**
  * Compare Version classes names from different namespaces and order them.
  *
@@ -26,12 +23,12 @@ final class VersionComparator implements Comparator
 {
     public function compare(Version $a, Version $b): int
     {
-        return strcmp($this->getNumber($a), $this->getNumber($b));
+        return \strcmp($this->getNumber($a), $this->getNumber($b));
     }
 
     private function getNumber(Version $version): string
     {
-        $names = explode('\\', (string) $version);
+        $names = \explode('\\', (string) $version);
 
         return end($names);
     }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php b/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
index 39efcc2af..de6af9625 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
@@ -11,12 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Doctrine\Model;
 
-use Exception;
-use JsonSerializable;
-
-use function json_encode;
-
-class Point implements JsonSerializable
+class Point implements \JsonSerializable
 {
     public static string $SRID = '4326';
 
@@ -28,7 +23,7 @@ class Point implements JsonSerializable
             return self::fromLonLat($array['coordinates'][0], $array['coordinates'][1]);
         }
 
-        throw new Exception('Unable to build a point from input data.');
+        throw new \Exception('Unable to build a point from input data.');
     }
 
     public static function fromGeoJson(string $geojson): self
@@ -88,7 +83,7 @@ class Point implements JsonSerializable
     {
         $array = $this->toArrayGeoJson();
 
-        return json_encode($array, JSON_THROW_ON_ERROR);
+        return \json_encode($array, JSON_THROW_ON_ERROR);
     }
 
     public function toWKT(): string
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php b/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
index e99e84908..9729eb1b5 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
@@ -11,12 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Doctrine\Model;
 
-use Exception;
-
 /**
  * Description of PointException.
  */
-class PointException extends Exception
+class PointException extends \Exception
 {
     public static function badCoordinates($lon, $lat): self
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php
index aef0d749f..c6f5ef4ef 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php
@@ -12,11 +12,10 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
-use DateTimeInterface;
 
 interface TrackCreationInterface
 {
-    public function setCreatedAt(DateTimeInterface $datetime): self;
+    public function setCreatedAt(\DateTimeInterface $datetime): self;
 
     public function setCreatedBy(User $user): self;
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php
index 718e02714..29f1c2f43 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php
@@ -13,8 +13,6 @@ namespace Chill\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
 use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
@@ -22,18 +20,21 @@ trait TrackCreationTrait
 {
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": NULL})
+     *
      * @Serializer\Groups({"read"})
      */
-    private ?DateTimeImmutable $createdAt = null;
+    private ?\DateTimeImmutable $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
     private ?User $createdBy = null;
 
-    public function getCreatedAt(): ?DateTimeInterface
+    public function getCreatedAt(): ?\DateTimeInterface
     {
         return $this->createdAt;
     }
@@ -43,9 +44,9 @@ trait TrackCreationTrait
         return $this->createdBy;
     }
 
-    public function setCreatedAt(DateTimeInterface $datetime): self
+    public function setCreatedAt(\DateTimeInterface $datetime): self
     {
-        $this->createdAt = $datetime instanceof DateTime ? DateTimeImmutable::createFromMutable($datetime) : $datetime;
+        $this->createdAt = $datetime instanceof \DateTime ? \DateTimeImmutable::createFromMutable($datetime) : $datetime;
 
         return $this;
     }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php
index 9edca11d3..5aa4fdb48 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php
@@ -12,11 +12,10 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
-use DateTimeInterface;
 
 interface TrackUpdateInterface
 {
-    public function setUpdatedAt(DateTimeInterface $datetime): self;
+    public function setUpdatedAt(\DateTimeInterface $datetime): self;
 
     public function setUpdatedBy(User $user): self;
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php
index eaa5dcfd0..8a3f98972 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php
@@ -13,8 +13,6 @@ namespace Chill\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
 use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
@@ -22,18 +20,21 @@ trait TrackUpdateTrait
 {
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": NULL})
+     *
      * @Serializer\Groups({"read"})
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
     private ?User $updatedBy = null;
 
-    public function getUpdatedAt(): ?DateTimeInterface
+    public function getUpdatedAt(): ?\DateTimeInterface
     {
         return $this->updatedAt;
     }
@@ -43,9 +44,9 @@ trait TrackUpdateTrait
         return $this->updatedBy;
     }
 
-    public function setUpdatedAt(DateTimeInterface $datetime): self
+    public function setUpdatedAt(\DateTimeInterface $datetime): self
     {
-        $this->updatedAt = $datetime instanceof DateTime ? DateTimeImmutable::createFromMutable($datetime) : $datetime;
+        $this->updatedAt = $datetime instanceof \DateTime ? \DateTimeImmutable::createFromMutable($datetime) : $datetime;
 
         return $this;
     }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php b/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php
index d68f0ca7b..704b95861 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Doctrine\ORM\Hydration;
 
 use Doctrine\ORM\Internal\Hydration\ObjectHydrator;
-use Generator;
 
 final class FlatHierarchyEntityHydrator extends ObjectHydrator
 {
@@ -40,7 +39,7 @@ final class FlatHierarchyEntityHydrator extends ObjectHydrator
         );
     }
 
-    private function flatListGenerator(array $hashMap, ?object $parent = null): Generator
+    private function flatListGenerator(array $hashMap, object $parent = null): \Generator
     {
         $parent = null === $parent ? null : spl_object_id($parent);
         $hashMap += [$parent => []];
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php b/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php
index c060dec60..01de206c8 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php
@@ -11,17 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Doctrine\Type;
 
-use DateInterval;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
 use Doctrine\DBAL\Types\DateIntervalType;
-use Exception;
-
-use LogicException;
-use function count;
-use function current;
-use function preg_match;
-use function reset;
 
 /**
  * Re-declare the date interval to use the implementation of date interval in
@@ -37,7 +29,7 @@ class NativeDateIntervalType extends DateIntervalType
             return null;
         }
 
-        if ($value instanceof DateInterval) {
+        if ($value instanceof \DateInterval) {
             return $value->format(self::FORMAT);
         }
 
@@ -46,25 +38,25 @@ class NativeDateIntervalType extends DateIntervalType
 
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        if (null === $value || $value instanceof DateInterval) {
+        if (null === $value || $value instanceof \DateInterval) {
             return $value;
         }
 
         try {
             $strings = explode(' ', (string) $value);
 
-            if (count($strings) === 0) {
+            if (1 === count($strings) && ('' === $strings[0])) {
                 return null;
             }
             $intervalSpec = 'P';
-            reset($strings);
+            \reset($strings);
 
             do {
                 $intervalSpec .= $this->convertEntry($strings);
-            } while (next($strings) !== false);
+            } while (false !== next($strings));
 
-            return new DateInterval($intervalSpec);
-        } catch (Exception $exception) {
+            return new \DateInterval($intervalSpec);
+        } catch (\Exception $exception) {
             throw $this->createConversionException($value, $exception);
         }
     }
@@ -86,7 +78,7 @@ class NativeDateIntervalType extends DateIntervalType
 
     private function convertEntry(&$strings)
     {
-        $current = current($strings);
+        $current = \current($strings);
 
         if (is_numeric($current)) {
             $next = next($strings);
@@ -98,19 +90,19 @@ class NativeDateIntervalType extends DateIntervalType
                 default => throw $this->createConversionException(implode('', $strings)),
             };
 
-            return $current . $unit;
+            return $current.$unit;
         }
 
-        if (preg_match('/([0-9]{2}\:[0-9]{2}:[0-9]{2})/', (string) $current) === 1) {
+        if (1 === \preg_match('/([0-9]{2}\:[0-9]{2}:[0-9]{2})/', (string) $current)) {
             $tExploded = explode(':', (string) $current);
             $intervalSpec = 'T';
-            $intervalSpec .= $tExploded[0] . 'H';
-            $intervalSpec .= $tExploded[1] . 'M';
-            $intervalSpec .= $tExploded[2] . 'S';
+            $intervalSpec .= $tExploded[0].'H';
+            $intervalSpec .= $tExploded[1].'M';
+            $intervalSpec .= $tExploded[2].'S';
 
             return $intervalSpec;
         }
 
-        throw new LogicException();
+        throw new \LogicException();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
index ce9074592..b74ddf875 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
@@ -42,10 +42,7 @@ class PointType extends Type
         return $sqlExpr;
     }
 
-    /**
-     * @param mixed $value
-     */
-    public function convertToPHPValue($value, AbstractPlatform $platform): ?\Chill\MainBundle\Doctrine\Model\Point
+    public function convertToPHPValue($value, AbstractPlatform $platform): ?Point
     {
         if (null === $value) {
             return null;
@@ -56,7 +53,7 @@ class PointType extends Type
 
     public function convertToPHPValueSQL($sqlExpr, $platform)
     {
-        return 'ST_AsGeoJSON(' . $sqlExpr . ') ';
+        return 'ST_AsGeoJSON('.$sqlExpr.') ';
     }
 
     public function getName()
@@ -69,6 +66,6 @@ class PointType extends Type
      */
     public function getSQLDeclaration(array $column, AbstractPlatform $platform)
     {
-        return 'geometry(POINT,' . Point::$SRID . ')';
+        return 'geometry(POINT,'.Point::$SRID.')';
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index 228ccc98d..94f66b6d2 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use DateTime;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -29,7 +28,9 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
  * Address.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_main_address")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Address implements TrackCreationInterface, TrackUpdateInterface
@@ -38,68 +39,76 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     use TrackUpdateTrait;
 
     /**
-     * When an Address does match with the AddressReference
+     * When an Address does match with the AddressReference.
      */
     final public const ADDR_REFERENCE_STATUS_MATCH = 'match';
 
     /**
      * When an Address does not match with the AddressReference, and
-     * is pending for a review
+     * is pending for a review.
      */
     final public const ADDR_REFERENCE_STATUS_TO_REVIEW = 'to_review';
 
     /**
      * When an Address does not match with the AddressReference, but
-     * is reviewed
+     * is reviewed.
      */
     final public const ADDR_REFERENCE_STATUS_REVIEWED = 'reviewed';
 
     /**
      * @ORM\ManyToOne(targetEntity=AddressReference::class)
+     *
      * @Groups({"write"})
      */
     private ?AddressReference $addressReference = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $buildingName = '';
 
     /**
      * @ORM\Column(type="boolean", options={"default": false})
+     *
      * @Groups({"write"})
      */
     private bool $confidential = false;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $corridor = '';
 
     /**
-     * used for the CEDEX information
+     * used for the CEDEX information.
      *
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $distribution = '';
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $extra = '';
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $flat = '';
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $floor = '';
@@ -111,8 +120,11 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
      * on the materialized view.
      *
      * @var Collection<GeographicalUnit>
+     *
      * @readonly
+     *
      * @ORM\ManyToMany(targetEntity=GeographicalUnit::class)
+     *
      * @ORM\JoinTable(
      *     name="view_chill_main_address_geographical_unit",
      *     joinColumns={@ORM\JoinColumn(name="address_id")},
@@ -122,12 +134,14 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     private Collection $geographicalUnits;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Groups({"write"})
+     *
      * @readonly
      */
     private ?int $id = null;
@@ -136,6 +150,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
      * True if the address is a "no address", aka homeless person, ...
      *
      * @Groups({"write"})
+     *
      * @ORM\Column(type="boolean", options={"default": false})
      */
     private bool $isNoAddress = false;
@@ -143,10 +158,10 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     /**
      * A ThirdParty reference for person's addresses that are linked to a third party.
      *
-     * @var ThirdParty|null
-     *
      * @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
+     *
      * @Groups({"write"})
+     *
      * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
      */
     private ?ThirdParty $linkedToThirdParty = null;
@@ -154,22 +169,24 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     /**
      * A geospatial field storing the coordinates of the Address.
      *
-     * @var Point|null
-     *
      * @ORM\Column(type="point", nullable=true)
+     *
      * @Groups({"write"})
      */
     private ?Point $point = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Groups({"write"})
      */
     private ?PostalCode $postcode = null;
 
     /**
      * @var self::ADDR_REFERENCE_STATUS_*
+     *
      * @ORM\Column(type="text", nullable=false, options={"default": self::ADDR_REFERENCE_STATUS_MATCH})
      */
     private string $refStatus = self::ADDR_REFERENCE_STATUS_MATCH;
@@ -180,22 +197,22 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     private \DateTimeImmutable $refStatusLastUpdate;
 
     /**
-     *
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $steps = '';
 
     /**
-     *
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $street = '';
 
     /**
-     *
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $streetNumber = '';
@@ -205,22 +222,24 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
      * of address. By default, the current date.
      *
      * @ORM\Column(type="date")
+     *
      * @Groups({"write"})
      */
-    private DateTime $validFrom;
+    private \DateTime $validFrom;
 
     /**
      * Indicates when the address ends. Used to build an history
      * of address.
      *
      * @ORM\Column(type="date", nullable=true)
+     *
      * @Groups({"write"})
      */
-    private ?DateTime $validTo = null;
+    private ?\DateTime $validTo = null;
 
     public function __construct()
     {
-        $this->validFrom = new DateTime();
+        $this->validFrom = new \DateTime();
         $this->refStatusLastUpdate = new \DateTimeImmutable('now');
         $this->geographicalUnits = new ArrayCollection();
     }
@@ -376,6 +395,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
      * Get streetAddress1 (legacy function).
      *
      * @return string
+     *
      * @deprecated
      */
     public function getStreetAddress1()
@@ -387,6 +407,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
      * Get streetAddress2 (legacy function).
      *
      * @return string
+     *
      * @deprecated
      */
     public function getStreetAddress2()
@@ -399,12 +420,12 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
         return $this->streetNumber;
     }
 
-    public function getValidFrom(): DateTime
+    public function getValidFrom(): \DateTime
     {
         return $this->validFrom;
     }
 
-    public function getValidTo(): ?DateTimeInterface
+    public function getValidTo(): ?\DateTimeInterface
     {
         return $this->validTo;
     }
@@ -419,7 +440,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
         return $this->getIsNoAddress();
     }
 
-    public function setAddressReference(?AddressReference $addressReference = null): Address
+    public function setAddressReference(AddressReference $addressReference = null): Address
     {
         $this->addressReference = $addressReference;
 
@@ -506,11 +527,9 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     /**
      * Set postcode.
      *
-     * @param PostalCode $postcode
-     *
      * @return Address
      */
-    public function setPostcode(?PostalCode $postcode = null)
+    public function setPostcode(PostalCode $postcode = null)
     {
         $this->postcode = $postcode;
 
@@ -518,14 +537,15 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     }
 
     /**
-     * Update the ref status
+     * Update the ref status.
      *
      * <<<<<<< HEAD
+     *
      * @param Address::ADDR_REFERENCE_STATUS_* $refStatus
-     * @param bool|null $updateLastUpdate Also update the "refStatusLastUpdate"
-     * =======
-     * The refstatuslast update is also updated
-     * >>>>>>> 31152616d (Feature: Provide api endpoint for reviewing addresses)
+     * @param bool|null                        $updateLastUpdate Also update the "refStatusLastUpdate"
+     *                                                           =======
+     *                                                           The refstatuslast update is also updated
+     *                                                           >>>>>>> 31152616d (Feature: Provide api endpoint for reviewing addresses)
      */
     public function setRefStatus(string $refStatus, ?bool $updateLastUpdate = true): self
     {
@@ -562,8 +582,6 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     /**
      * Set streetAddress1 (legacy function).
      *
-     * @param string $streetAddress1
-     *
      * @deprecated
      */
     public function setStreetAddress1(?string $streetAddress1): self
@@ -576,7 +594,6 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     /**
      * Set streetAddress2 (legacy function).
      *
-     * @param string $streetAddress2
      * @deprecated
      */
     public function setStreetAddress2(?string $streetAddress2): self
@@ -596,14 +613,14 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @return Address
      */
-    public function setValidFrom(DateTime $validFrom)
+    public function setValidFrom(\DateTime $validFrom)
     {
         $this->validFrom = $validFrom;
 
         return $this;
     }
 
-    public function setValidTo(?DateTimeInterface $validTo = null): self
+    public function setValidTo(\DateTimeInterface $validTo = null): self
     {
         $this->validTo = $validTo;
 
@@ -624,7 +641,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
      */
     public function validate(ExecutionContextInterface $context, $payload)
     {
-        if (!$this->getValidFrom() instanceof DateTime) {
+        if (!$this->getValidFrom() instanceof \DateTime) {
             $context
                 ->buildViolation('address.date-should-be-set')
                 ->atPath('validFrom')
diff --git a/src/Bundle/ChillMainBundle/Entity/AddressReference.php b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
index e75402c5f..140028da5 100644
--- a/src/Bundle/ChillMainBundle/Entity/AddressReference.php
+++ b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
@@ -12,18 +12,21 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\Point;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_main_address_reference", indexes={
+ *
  *     @ORM\Index(name="address_refid", columns={"refId"})
  * },
  * uniqueConstraints={
+ *
  *     @ORM\UniqueConstraint(name="chill_main_address_reference_unicity", columns={"refId", "source"})
  * })
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class AddressReference
@@ -39,26 +42,32 @@ class AddressReference
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
+     *
      * @groups({"read"})
      */
-    private ?DateTimeImmutable $createdAt = null;
+    private ?\DateTimeImmutable $createdAt = null;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
+     *
      * @groups({"read"})
      */
-    private ?DateTimeImmutable $deletedAt = null;
+    private ?\DateTimeImmutable $deletedAt = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @groups({"read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @groups({"read"})
      */
     private string $municipalityCode = '';
@@ -66,57 +75,60 @@ class AddressReference
     /**
      * A geospatial field storing the coordinates of the Address.
      *
-     * @var Point
-     *
      * @ORM\Column(type="point")
+     *
      * @groups({"read"})
      */
     private ?Point $point = null;
 
     /**
-     * @var PostalCode
-     *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
+     *
      * @groups({"read"})
      */
     private ?PostalCode $postcode = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @groups({"read"})
      */
     private string $refId = '';
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @groups({"read"})
      */
     private string $source = '';
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @groups({"read"})
      */
     private string $street = '';
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @groups({"read"})
      */
     private string $streetNumber = '';
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
+     *
      * @groups({"read"})
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    private ?\DateTimeImmutable $updatedAt = null;
 
-    public function getCreatedAt(): ?DateTimeImmutable
+    public function getCreatedAt(): ?\DateTimeImmutable
     {
         return $this->createdAt;
     }
 
-    public function getDeletedAt(): ?DateTimeImmutable
+    public function getDeletedAt(): ?\DateTimeImmutable
     {
         return $this->deletedAt;
     }
@@ -138,8 +150,6 @@ class AddressReference
 
     /**
      * Get postcode.
-     *
-     * @return PostalCode
      */
     public function getPostcode(): ?PostalCode
     {
@@ -166,7 +176,7 @@ class AddressReference
         return $this->streetNumber;
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -176,14 +186,14 @@ class AddressReference
         return null !== $this->getPoint();
     }
 
-    public function setCreatedAt(?DateTimeImmutable $createdAt): self
+    public function setCreatedAt(?\DateTimeImmutable $createdAt): self
     {
         $this->createdAt = $createdAt;
 
         return $this;
     }
 
-    public function setDeletedAt(?DateTimeImmutable $deletedAt): self
+    public function setDeletedAt(?\DateTimeImmutable $deletedAt): self
     {
         $this->deletedAt = $deletedAt;
 
@@ -207,11 +217,9 @@ class AddressReference
     /**
      * Set postcode.
      *
-     * @param PostalCode $postcode
-     *
      * @return Address
      */
-    public function setPostcode(?PostalCode $postcode = null)
+    public function setPostcode(PostalCode $postcode = null)
     {
         $this->postcode = $postcode;
 
@@ -246,7 +254,7 @@ class AddressReference
         return $this;
     }
 
-    public function setUpdatedAt(?DateTimeImmutable $updatedAt): self
+    public function setUpdatedAt(?\DateTimeImmutable $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/Center.php b/src/Bundle/ChillMainBundle/Entity/Center.php
index b716d09fb..b81200bdb 100644
--- a/src/Bundle/ChillMainBundle/Entity/Center.php
+++ b/src/Bundle/ChillMainBundle/Entity/Center.php
@@ -18,6 +18,7 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="centers")
  */
 class Center implements HasCenterInterface, \Stringable
@@ -33,17 +34,19 @@ class Center implements HasCenterInterface, \Stringable
     private Collection $groupCenters;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="string", length=255)
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private string $name = '';
@@ -55,6 +58,7 @@ class Center implements HasCenterInterface, \Stringable
 
     /**
      * @var Collection<Regroupment>
+     *
      * @ORM\ManyToMany(targetEntity=Regroupment::class, mappedBy="centers")
      */
     private Collection $regroupments;
@@ -68,9 +72,6 @@ class Center implements HasCenterInterface, \Stringable
         $this->regroupments = new ArrayCollection();
     }
 
-    /**
-     * @return string
-     */
     public function __toString(): string
     {
         return $this->getName();
@@ -94,10 +95,7 @@ class Center implements HasCenterInterface, \Stringable
         return $this;
     }
 
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getGroupCenters(): \Doctrine\Common\Collections\ArrayCollection|\Doctrine\Common\Collections\Collection
+    public function getGroupCenters(): ArrayCollection|Collection
     {
         return $this->groupCenters;
     }
@@ -132,8 +130,6 @@ class Center implements HasCenterInterface, \Stringable
     }
 
     /**
-     * @param $name
-     *
      * @return $this
      */
     public function setName($name)
diff --git a/src/Bundle/ChillMainBundle/Entity/Civility.php b/src/Bundle/ChillMainBundle/Entity/Civility.php
index 0263e3b64..322155fe5 100644
--- a/src/Bundle/ChillMainBundle/Entity/Civility.php
+++ b/src/Bundle/ChillMainBundle/Entity/Civility.php
@@ -16,35 +16,45 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Table(name="chill_main_civility")
+ *
  * @ORM\Entity
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={"chill_main_civility": Civility::class})
  */
 class Civility
 {
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $abbreviation = [];
 
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Serializer\Groups({"read"})
      */
     private bool $active = true;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
diff --git a/src/Bundle/ChillMainBundle/Entity/Country.php b/src/Bundle/ChillMainBundle/Entity/Country.php
index 0c8509233..91484ba46 100644
--- a/src/Bundle/ChillMainBundle/Entity/Country.php
+++ b/src/Bundle/ChillMainBundle/Entity/Country.php
@@ -19,25 +19,31 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * Country.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="country")
+ *
  * @ORM\Cache(usage="READ_ONLY", region="country_cache_region")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Country
 {
     /**
      * @ORM\Column(type="string", length=3)
+     *
      * @groups({"read", "docgen:read"})
+     *
      * @Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private string $countryCode = '';
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @groups({"read", "docgen:read"})
      */
     private ?int $id = null;
@@ -46,7 +52,9 @@ class Country
      * @var array<string, string>
      *
      * @ORM\Column(type="json")
+     *
      * @groups({"read", "docgen:read"})
+     *
      * @Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
@@ -63,7 +71,6 @@ class Country
 
     /**
      * Get name.
-     *
      */
     public function getName(): array
     {
diff --git a/src/Bundle/ChillMainBundle/Entity/CronJobExecution.php b/src/Bundle/ChillMainBundle/Entity/CronJobExecution.php
index 6fd237273..ee6ec9012 100644
--- a/src/Bundle/ChillMainBundle/Entity/CronJobExecution.php
+++ b/src/Bundle/ChillMainBundle/Entity/CronJobExecution.php
@@ -11,11 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Entity;
 
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_main_cronjob_execution")
  */
 class CronJobExecution
@@ -27,12 +27,12 @@ class CronJobExecution
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $lastEnd = null;
+    private ?\DateTimeImmutable $lastEnd = null;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=false)
      */
-    private DateTimeImmutable $lastStart;
+    private \DateTimeImmutable $lastStart;
 
     /**
      * @ORM\Column(type="integer", nullable=true, options={"default": null})
@@ -46,11 +46,12 @@ class CronJobExecution
 
     public function __construct(/**
      * @ORM\Column(type="text", nullable=false)
+     *
      * @ORM\Id
      */
         private string $key
     ) {
-        $this->lastStart = new DateTimeImmutable('now');
+        $this->lastStart = new \DateTimeImmutable('now');
     }
 
     public function getKey(): string
@@ -58,12 +59,12 @@ class CronJobExecution
         return $this->key;
     }
 
-    public function getLastEnd(): DateTimeImmutable
+    public function getLastEnd(): \DateTimeImmutable
     {
         return $this->lastEnd;
     }
 
-    public function getLastStart(): DateTimeImmutable
+    public function getLastStart(): \DateTimeImmutable
     {
         return $this->lastStart;
     }
@@ -73,14 +74,14 @@ class CronJobExecution
         return $this->lastStatus;
     }
 
-    public function setLastEnd(?DateTimeImmutable $lastEnd): CronJobExecution
+    public function setLastEnd(?\DateTimeImmutable $lastEnd): CronJobExecution
     {
         $this->lastEnd = $lastEnd;
 
         return $this;
     }
 
-    public function setLastStart(DateTimeImmutable $lastStart): CronJobExecution
+    public function setLastStart(\DateTimeImmutable $lastStart): CronJobExecution
     {
         $this->lastStart = $lastStart;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
index b22928a94..cf858d60f 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
@@ -32,7 +32,6 @@ class CommentEmbeddable
     /**
      * Embeddable does not support associations.
      *
-     * @var int
      * @ORM\Column(type="integer", nullable=true)
      */
     private ?int $userId = null;
@@ -43,7 +42,7 @@ class CommentEmbeddable
     }
 
     /**
-     * @return DateTime
+     * @return \DateTime
      */
     public function getDate()
     {
@@ -65,10 +64,7 @@ class CommentEmbeddable
         $this->comment = $comment;
     }
 
-    /**
-     * @param DateTime $date
-     */
-    public function setDate(?DateTime $date)
+    public function setDate(?\DateTime $date)
     {
         $this->date = $date;
     }
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
index 44e53671d..3cfed7844 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Entity\Embeddable;
 
 use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
-use function array_key_exists;
 
 /**
  * @ORM\Embeddable
@@ -39,7 +38,7 @@ class PrivateCommentEmbeddable
 
     public function hasCommentForUser(User $user): bool
     {
-        return array_key_exists($user->getId(), $this->comments)
+        return \array_key_exists($user->getId(), $this->comments)
             && '' !== $this->comments[$user->getId()];
     }
 
diff --git a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
index ea017f053..5c70b7bfe 100644
--- a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
+++ b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
@@ -15,8 +15,10 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table(name="chill_main_geographical_unit", uniqueConstraints={
+ *
  *     @ORM\UniqueConstraint(name="geographical_unit_refid", columns={"layer_id", "unitRefId"})
  * })
+ *
  * @ORM\Entity(readOnly=true)
  */
 class GeographicalUnit
@@ -28,7 +30,9 @@ class GeographicalUnit
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
diff --git a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit/SimpleGeographicalUnitDTO.php b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit/SimpleGeographicalUnitDTO.php
index c9fe9d1f7..79e28e6f3 100644
--- a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit/SimpleGeographicalUnitDTO.php
+++ b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit/SimpleGeographicalUnitDTO.php
@@ -23,25 +23,33 @@ class SimpleGeographicalUnitDTO
     public function __construct(
         /**
          * @readonly
+         *
          * @psalm-readonly
+         *
          * @Serializer\Groups({"read"})
          */
         public int $id,
         /**
          * @readonly
+         *
          * @psalm-readonly
+         *
          * @Serializer\Groups({"read"})
          */
         public string $unitName,
         /**
          * @readonly
+         *
          * @psalm-readonly
+         *
          * @Serializer\Groups({"read"})
          */
         public string $unitRefId,
         /**
          * @readonly
+         *
          * @psalm-readonly
+         *
          * @Serializer\Groups({"read"})
          */
         public int $layerId
diff --git a/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php b/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php
index cf6d185df..c875fecd4 100644
--- a/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php
+++ b/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php
@@ -18,34 +18,42 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Table(name="chill_main_geographical_unit_layer", uniqueConstraints={
+ *
  *     @ORM\UniqueConstraint(name="geographical_unit_layer_refid", columns={"refId"})
  * })
+ *
  * @ORM\Entity
  */
 class GeographicalUnitLayer
 {
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json", nullable=false, options={"default": "[]"})
+     *
      * @Serializer\Groups({"read"})
      */
     private array $name = [];
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Serializer\Groups({"read"})
      */
     private string $refId = '';
 
     /**
      * @var Collection<GeographicalUnit>
+     *
      * @ORM\OneToMany(targetEntity=GeographicalUnit::class, mappedBy="layer")
      */
     private Collection $units;
diff --git a/src/Bundle/ChillMainBundle/Entity/GroupCenter.php b/src/Bundle/ChillMainBundle/Entity/GroupCenter.php
index 01b450394..bcd4bc8bd 100644
--- a/src/Bundle/ChillMainBundle/Entity/GroupCenter.php
+++ b/src/Bundle/ChillMainBundle/Entity/GroupCenter.php
@@ -17,27 +17,28 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="group_centers")
+ *
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
  */
 class GroupCenter
 {
     /**
-     * @var Center
-     *
      * @ORM\ManyToOne(
      *     targetEntity="Chill\MainBundle\Entity\Center",
      *     inversedBy="groupCenters"
      * )
+     *
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private ?Center $center = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -46,6 +47,7 @@ class GroupCenter
      * @ORM\ManyToOne(
      *     targetEntity="Chill\MainBundle\Entity\PermissionsGroup",
      * inversedBy="groupCenters")
+     *
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private ?PermissionsGroup $permissionsGroup = null;
@@ -55,6 +57,7 @@ class GroupCenter
      *     targetEntity="Chill\MainBundle\Entity\User",
      *     mappedBy="groupCenters"
      * )
+     *
      * @var Collection<User::class>
      */
     private Collection $users;
diff --git a/src/Bundle/ChillMainBundle/Entity/Language.php b/src/Bundle/ChillMainBundle/Entity/Language.php
index ff803d979..1a91de7b8 100644
--- a/src/Bundle/ChillMainBundle/Entity/Language.php
+++ b/src/Bundle/ChillMainBundle/Entity/Language.php
@@ -18,17 +18,20 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * Language.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="language")
+ *
  * @ORM\Cache(usage="READ_ONLY", region="language_cache_region")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Language
 {
     /**
-     * @var string
-     *
      * @ORM\Id
+     *
      * @ORM\Column(type="string")
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?string $id = null;
@@ -37,7 +40,9 @@ class Language
      * @var string array
      *
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
diff --git a/src/Bundle/ChillMainBundle/Entity/Location.php b/src/Bundle/ChillMainBundle/Entity/Location.php
index 566cc7bb3..29a049d35 100644
--- a/src/Bundle/ChillMainBundle/Entity/Location.php
+++ b/src/Bundle/ChillMainBundle/Entity/Location.php
@@ -15,8 +15,6 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Repository\LocationRepository;
 use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use libphonenumber\PhoneNumber;
 use Symfony\Component\Serializer\Annotation as Serializer;
@@ -24,7 +22,9 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
 /**
  * @ORM\Table(name="chill_main_location")
+ *
  * @ORM\Entity(repositoryClass=LocationRepository::class)
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "location": Location::class
  * })
@@ -33,84 +33,103 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
 {
     /**
      * @ORM\Column(type="boolean", nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
     private bool $active = true;
 
     /**
      * @ORM\ManyToOne(targetEntity=Address::class, cascade={"persist"})
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Serializer\Groups({"read", "write", "docgen:read"})
      */
     private ?Address $address = null;
 
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Serializer\Groups({"read"})
      */
     private bool $availableForUsers = false;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
-    private ?DateTimeImmutable $createdAt = null;
+    private ?\DateTimeImmutable $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @Serializer\Groups({"read"})
      */
     private ?User $createdBy = null;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
+     *
      * @Serializer\Groups({"read", "write", "docgen:read"})
      */
     private ?string $email = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=LocationType::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Serializer\Groups({"read", "write", "docgen:read"})
      */
     private ?LocationType $locationType = null;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
+     *
      * @Serializer\Groups({"read", "write", "docgen:read"})
      */
     private ?string $name = null;
 
     /**
      * @ORM\Column(type="phone_number", nullable=true)
+     *
      * @Serializer\Groups({"read", "write", "docgen:read"})
+     *
      * @PhonenumberConstraint(type="any")
      */
     private ?PhoneNumber $phonenumber1 = null;
 
     /**
      * @ORM\Column(type="phone_number", nullable=true)
+     *
      * @Serializer\Groups({"read", "write", "docgen:read"})
+     *
      * @PhonenumberConstraint(type="any")
      */
     private ?PhoneNumber $phonenumber2 = null;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @Serializer\Groups({"read"})
      */
     private ?User $updatedBy = null;
@@ -130,7 +149,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
         return $this->availableForUsers;
     }
 
-    public function getCreatedAt(): ?DateTimeImmutable
+    public function getCreatedAt(): ?\DateTimeImmutable
     {
         return $this->createdAt;
     }
@@ -170,7 +189,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
         return $this->phonenumber2;
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -206,7 +225,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setCreatedAt(?DateTimeInterface $createdAt): self
+    public function setCreatedAt(?\DateTimeInterface $createdAt): self
     {
         $this->createdAt = $createdAt;
 
@@ -255,7 +274,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setUpdatedAt(?DateTimeInterface $updatedAt): self
+    public function setUpdatedAt(?\DateTimeInterface $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/LocationType.php b/src/Bundle/ChillMainBundle/Entity/LocationType.php
index 902ffce4d..c6a176ab6 100644
--- a/src/Bundle/ChillMainBundle/Entity/LocationType.php
+++ b/src/Bundle/ChillMainBundle/Entity/LocationType.php
@@ -19,10 +19,13 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
 /**
  * @ORM\Table(name="chill_main_location_type")
+ *
  * @ORM\Entity(repositoryClass=LocationTypeRepository::class)
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "location-type": LocationType::class
  * })
+ *
  * @UniqueEntity({"defaultFor"})
  */
 class LocationType
@@ -39,51 +42,62 @@ class LocationType
 
     /**
      * @ORM\Column(type="boolean", nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
     private bool $active = true;
 
     /**
      * @ORM\Column(type="string", length=32, options={"default": "optional"})
+     *
      * @Serializer\Groups({"read"})
      */
     private string $addressRequired = self::STATUS_OPTIONAL;
 
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Serializer\Groups({"read"})
      */
     private bool $availableForUsers = true;
 
     /**
      * @ORM\Column(type="string", length=32, options={"default": "optional"})
+     *
      * @Serializer\Groups({"read"})
      */
     private string $contactData = self::STATUS_OPTIONAL;
 
     /**
      * @ORM\Column(type="string", nullable=true, length=32, unique=true)
+     *
      * @Serializer\Groups({"read"})
      */
     private ?string $defaultFor = null;
 
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Serializer\Groups({"read"})
      */
     private bool $editableByUsers = true;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $title = [];
diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php
index 3e5e7f9b5..8604b5ee1 100644
--- a/src/Bundle/ChillMainBundle/Entity/Notification.php
+++ b/src/Bundle/ChillMainBundle/Entity/Notification.php
@@ -12,24 +12,23 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function count;
-use function in_array;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_main_notification",
  *     indexes={
+ *
  *         @ORM\Index(name="chill_main_notification_related_entity_idx", columns={"relatedentityclass", "relatedentityid"})
  *     }
  * )
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Notification implements TrackUpdateInterface
@@ -43,7 +42,9 @@ class Notification implements TrackUpdateInterface
 
     /**
      * @var Collection<User>
+     *
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_notification_addresses_user")
      */
     private Collection $addressees;
@@ -52,6 +53,7 @@ class Notification implements TrackUpdateInterface
      * a list of destinee which will receive notifications.
      *
      * @var array|string[]
+     *
      * @ORM\Column(type="json")
      */
     private array $addressesEmails = [];
@@ -67,7 +69,9 @@ class Notification implements TrackUpdateInterface
 
     /**
      * @var Collection<NotificationComment>
+     *
      * @ORM\OneToMany(targetEntity=NotificationComment::class, mappedBy="notification", orphanRemoval=true)
+     *
      * @ORM\OrderBy({"createdAt": "ASC"})
      */
     private Collection $comments;
@@ -75,11 +79,13 @@ class Notification implements TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime_immutable")
      */
-    private DateTimeImmutable $date;
+    private \DateTimeImmutable $date;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -103,19 +109,23 @@ class Notification implements TrackUpdateInterface
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?User $sender = null;
 
     /**
      * @ORM\Column(type="text", options={"default": ""})
+     *
      * @Assert\NotBlank(message="notification.Title must be defined")
      */
     private string $title = '';
 
     /**
      * @var Collection<User>
+     *
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_notification_addresses_unread")
      */
     private Collection $unreadBy;
@@ -123,7 +133,7 @@ class Notification implements TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime_immutable")
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
@@ -135,7 +145,7 @@ class Notification implements TrackUpdateInterface
         $this->addressees = new ArrayCollection();
         $this->unreadBy = new ArrayCollection();
         $this->comments = new ArrayCollection();
-        $this->setDate(new DateTimeImmutable());
+        $this->setDate(new \DateTimeImmutable());
         $this->accessKey = bin2hex(openssl_random_pseudo_bytes(24));
     }
 
@@ -151,7 +161,7 @@ class Notification implements TrackUpdateInterface
 
     public function addAddressesEmail(string $email)
     {
-        if (!in_array($email, $this->addressesEmails, true)) {
+        if (!\in_array($email, $this->addressesEmails, true)) {
             $this->addressesEmails[] = $email;
             $this->addressesEmailsAdded[] = $email;
         }
@@ -183,7 +193,7 @@ class Notification implements TrackUpdateInterface
      */
     public function assertCountAddresses(ExecutionContextInterface $context, $payload): void
     {
-        if (0 === (count($this->getAddressesEmails()) + count($this->getAddressees()))) {
+        if (0 === (\count($this->getAddressesEmails()) + \count($this->getAddressees()))) {
             $context->buildViolation('notification.At least one addressee')
                 ->atPath('addressees')
                 ->addViolation();
@@ -234,7 +244,7 @@ class Notification implements TrackUpdateInterface
         return $this->comments;
     }
 
-    public function getDate(): ?DateTimeImmutable
+    public function getDate(): ?\DateTimeImmutable
     {
         return $this->date;
     }
@@ -274,7 +284,7 @@ class Notification implements TrackUpdateInterface
         return $this->unreadBy;
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -347,7 +357,7 @@ class Notification implements TrackUpdateInterface
 
     public function removeAddressesEmail(string $email)
     {
-        if (in_array($email, $this->addressesEmails, true)) {
+        if (\in_array($email, $this->addressesEmails, true)) {
             $this->addressesEmails = array_filter($this->addressesEmails, static fn ($e) => $e !== $email);
             $this->addressesEmailsAdded = array_filter($this->addressesEmailsAdded, static fn ($e) => $e !== $email);
         }
@@ -367,7 +377,7 @@ class Notification implements TrackUpdateInterface
         return $this;
     }
 
-    public function setDate(DateTimeImmutable $date): self
+    public function setDate(\DateTimeImmutable $date): self
     {
         $this->date = $date;
 
@@ -409,7 +419,7 @@ class Notification implements TrackUpdateInterface
         return $this;
     }
 
-    public function setUpdatedAt(DateTimeInterface $datetime): self
+    public function setUpdatedAt(\DateTimeInterface $datetime): self
     {
         $this->updatedAt = $datetime;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
index daf2b541f..49d1e859d 100644
--- a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
+++ b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
@@ -13,9 +13,6 @@ namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use DateTimeImmutable;
-use DateTimeInterface;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PreFlushEventArgs;
 use Doctrine\ORM\Event\PrePersistEventArgs;
 use Doctrine\ORM\Mapping as ORM;
@@ -23,13 +20,16 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_main_notification_comment")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class NotificationComment implements TrackCreationInterface, TrackUpdateInterface
 {
     /**
      * @ORM\Column(type="text")
+     *
      * @Assert\NotBlank(message="notification.Comment content might not be blank")
      */
     private string $content = '';
@@ -37,23 +37,27 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
      */
-    private ?DateTimeImmutable $createdAt = null;
+    private ?\DateTimeImmutable $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?User $createdBy = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Notification::class, inversedBy="comments")
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private ?Notification $notification = null;
@@ -70,10 +74,11 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
      *
      * @ORM\Column(type="datetime_immutable", nullable=true)
      */
-    private ?DateTimeImmutable $updateAt = null;
+    private ?\DateTimeImmutable $updateAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?User $updatedBy = null;
@@ -83,7 +88,7 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
         return $this->content;
     }
 
-    public function getCreatedAt(): ?DateTimeImmutable
+    public function getCreatedAt(): ?\DateTimeImmutable
     {
         return $this->createdAt;
     }
@@ -103,7 +108,7 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
         return $this->notification;
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updateAt;
     }
@@ -146,7 +151,7 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
         return $this;
     }
 
-    public function setCreatedAt(DateTimeInterface $datetime): self
+    public function setCreatedAt(\DateTimeInterface $datetime): self
     {
         $this->createdAt = $datetime;
 
@@ -173,12 +178,12 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
     /**
      * @deprecated use @see{self::setUpdatedAt} instead
      */
-    public function setUpdateAt(?DateTimeImmutable $updateAt): self
+    public function setUpdateAt(?\DateTimeImmutable $updateAt): self
     {
         return $this->setUpdatedAt($updateAt);
     }
 
-    public function setUpdatedAt(DateTimeInterface $datetime): self
+    public function setUpdatedAt(\DateTimeInterface $datetime): self
     {
         $this->updateAt = $datetime;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
index 7d909b167..501e28a9a 100644
--- a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
+++ b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
@@ -14,12 +14,13 @@ namespace Chill\MainBundle\Entity;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use RuntimeException;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="permission_groups")
+ *
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
  */
 class PermissionsGroup
@@ -33,6 +34,7 @@ class PermissionsGroup
 
     /**
      * @var Collection<GroupCenter>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\MainBundle\Entity\GroupCenter",
      *     mappedBy="permissionsGroup"
@@ -41,27 +43,27 @@ class PermissionsGroup
     private Collection $groupCenters;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255, nullable=false, options={"default": ""})
      */
     private string $name = '';
 
     /**
      * @var Collection<RoleScope>
+     *
      * @ORM\ManyToMany(
      *     targetEntity="Chill\MainBundle\Entity\RoleScope",
      *     inversedBy="permissionsGroups",
      * cascade={ "persist" })
+     *
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private Collection $roleScopes;
@@ -104,10 +106,7 @@ class PermissionsGroup
         return $this->name;
     }
 
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getRoleScopes(): \Doctrine\Common\Collections\ArrayCollection|\Doctrine\Common\Collections\Collection
+    public function getRoleScopes(): ArrayCollection|Collection
     {
         return $this->roleScopes;
     }
@@ -127,22 +126,21 @@ class PermissionsGroup
         foreach ($countedIds as $id => $nb) {
             if (1 < $nb) {
                 $context->buildViolation('A permission is already present '
-                        . 'for the same role and scope')
+                        .'for the same role and scope')
                     ->addViolation();
             }
         }
     }
 
     /**
-     * @throws RuntimeException if the roleScope could not be removed.
+     * @throws \RuntimeException if the roleScope could not be removed
      */
     public function removeRoleScope(RoleScope $roleScope)
     {
         $result = $this->roleScopes->removeElement($roleScope);
 
         if (false === $result) {
-            throw new RuntimeException(sprintf("The roleScope '%s' could not be removed, "
-                    . 'aborting.', spl_object_hash($roleScope)));
+            throw new \RuntimeException(sprintf("The roleScope '%s' could not be removed, ".'aborting.', spl_object_hash($roleScope)));
         }
     }
 
@@ -157,8 +155,6 @@ class PermissionsGroup
     }
 
     /**
-     * @param $name
-     *
      * @return $this
      */
     public function setName($name)
diff --git a/src/Bundle/ChillMainBundle/Entity/PostalCode.php b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
index 3754f9c77..5aba8030c 100644
--- a/src/Bundle/ChillMainBundle/Entity/PostalCode.php
+++ b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
@@ -24,13 +23,16 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * PostalCode.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_main_postal_code",
  *     uniqueConstraints={
+ *
  *         @ORM\UniqueConstraint(name="postal_code_import_unicity", columns={"code", "refpostalcodeid", "postalcodesource"},
  *         options={"where": "refpostalcodeid is not null"})
  *     },
  *     indexes={
+ *
  *         @ORM\Index(name="search_name_code", columns={"code", "label"}),
  *         @ORM\Index(name="search_by_reference_code", columns={"code", "refpostalcodeid"})
  *     })
@@ -53,23 +55,22 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface
     private string $canonical = '';
 
     /**
-     *
      * @ORM\Column(type="point", nullable=true)
+     *
      * @groups({"read"})
      */
     private ?\Chill\MainBundle\Doctrine\Model\Point $center = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=100)
+     *
      * @groups({"write", "read"})
      */
     private ?string $code = null;
 
     /**
-     *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Country")
+     *
      * @groups({"write", "read"})
      */
     private ?\Chill\MainBundle\Entity\Country $country = null;
@@ -77,43 +78,43 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $deletedAt = null;
+    private ?\DateTimeImmutable $deletedAt = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @groups({"write", "read"})
      */
     private ?int $id = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255, name="label")
+     *
      * @groups({"write", "read"})
      */
     private ?string $name = null;
 
     /**
-     *
      * @ORM\Column(name="origin", type="integer", nullable=true)
+     *
      * @groups({"write", "read"})
      */
     private int $origin = 0;
 
     /**
-     *
      * @ORM\Column(type="string", length=255, nullable=true)
+     *
      * @groups({"read"})
      */
     private ?string $postalCodeSource = null;
 
     /**
-     *
      * @ORM\Column(type="string", length=255, nullable=true)
+     *
      * @groups({"read"})
      */
     private ?string $refPostalCodeId = null;
@@ -207,11 +208,9 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface
     /**
      * Set country.
      *
-     * @param Country $country
-     *
      * @return PostalCode
      */
-    public function setCountry(?Country $country = null)
+    public function setCountry(Country $country = null)
     {
         $this->country = $country;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/Regroupment.php b/src/Bundle/ChillMainBundle/Entity/Regroupment.php
index c5d9525cf..4945a62c7 100644
--- a/src/Bundle/ChillMainBundle/Entity/Regroupment.php
+++ b/src/Bundle/ChillMainBundle/Entity/Regroupment.php
@@ -17,6 +17,7 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="regroupment")
  */
 class Regroupment
@@ -26,14 +27,18 @@ class Regroupment
      *     targetEntity=Center::class,
      *     inversedBy="regroupments"
      * )
+     *
      * @ORM\Id
+     *
      * @var Collection<Center>
      */
     private Collection $centers;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
diff --git a/src/Bundle/ChillMainBundle/Entity/RoleScope.php b/src/Bundle/ChillMainBundle/Entity/RoleScope.php
index 00356ebec..f7dc5fa2f 100644
--- a/src/Bundle/ChillMainBundle/Entity/RoleScope.php
+++ b/src/Bundle/ChillMainBundle/Entity/RoleScope.php
@@ -17,14 +17,18 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="role_scopes")
+ *
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
  */
 class RoleScope
 {
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -47,7 +51,9 @@ class RoleScope
      * @ORM\ManyToOne(
      *     targetEntity="Chill\MainBundle\Entity\Scope",
      * inversedBy="roleScopes")
+     *
      * @ORM\JoinColumn(nullable=true, name="scope_id")
+     *
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private ?Scope $scope = null;
@@ -72,14 +78,14 @@ class RoleScope
         return $this->scope;
     }
 
-    public function setRole(?string $role = null): self
+    public function setRole(string $role = null): self
     {
         $this->role = $role;
 
         return $this;
     }
 
-    public function setScope(?Scope $scope = null): self
+    public function setScope(Scope $scope = null): self
     {
         $this->scope = $scope;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/SavedExport.php b/src/Bundle/ChillMainBundle/Entity/SavedExport.php
index 81ca33e72..224423783 100644
--- a/src/Bundle/ChillMainBundle/Entity/SavedExport.php
+++ b/src/Bundle/ChillMainBundle/Entity/SavedExport.php
@@ -22,6 +22,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_main_saved_export")
  */
 class SavedExport implements TrackCreationInterface, TrackUpdateInterface
@@ -32,6 +33,7 @@ class SavedExport implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Assert\NotBlank
      */
     private string $description = '';
@@ -43,7 +45,9 @@ class SavedExport implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="uuid", unique="true")
+     *
      * @ORM\GeneratedValue(strategy="NONE")
      */
     private UuidInterface $id;
@@ -55,6 +59,7 @@ class SavedExport implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Assert\NotBlank
      */
     private string $title = '';
diff --git a/src/Bundle/ChillMainBundle/Entity/Scope.php b/src/Bundle/ChillMainBundle/Entity/Scope.php
index 928b5915f..464d60488 100644
--- a/src/Bundle/ChillMainBundle/Entity/Scope.php
+++ b/src/Bundle/ChillMainBundle/Entity/Scope.php
@@ -20,8 +20,11 @@ use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="scopes")
+ *
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "scope": Scope::class
  * })
@@ -35,8 +38,11 @@ class Scope
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
@@ -45,7 +51,9 @@ class Scope
      * translatable names.
      *
      * @ORM\Column(type="json")
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
@@ -56,6 +64,7 @@ class Scope
      * @ORM\OneToMany(
      *     targetEntity="Chill\MainBundle\Entity\RoleScope",
      * mappedBy="scope")
+     *
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private Collection $roleScopes;
@@ -75,9 +84,6 @@ class Scope
         return $this;
     }
 
-    /**
-     * @return int
-     */
     public function getId(): ?int
     {
         return $this->id;
@@ -106,8 +112,6 @@ class Scope
     }
 
     /**
-     * @param $name
-     *
      * @return $this
      */
     public function setName(array $name): self
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 5df70134b..01655fa3d 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -13,26 +13,24 @@ namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\User\UserScopeHistory;
-use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\Selectable;
 use Doctrine\ORM\Mapping as ORM;
-use Iterator;
-use RuntimeException;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Annotation as Serializer;
-
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function in_array;
 
 /**
  * User.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="users")
+ *
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "user": User::class
  * })
@@ -41,7 +39,9 @@ class User implements UserInterface, \Stringable
 {
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     protected ?int $id = null;
@@ -49,7 +49,7 @@ class User implements UserInterface, \Stringable
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
      */
-    private ?DateTimeImmutable $absenceStart = null;
+    private ?\DateTimeImmutable $absenceStart = null;
 
     /**
      * Array where SAML attributes's data are stored.
@@ -89,9 +89,11 @@ class User implements UserInterface, \Stringable
 
     /**
      * @var Collection<GroupCenter>
+     *
      * @ORM\ManyToMany(
      *     targetEntity="Chill\MainBundle\Entity\GroupCenter",
      * inversedBy="users")
+     *
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private Collection $groupCenters;
@@ -119,6 +121,7 @@ class User implements UserInterface, \Stringable
 
     /**
      * @var Collection&Selectable<int, UserScopeHistory>
+     *
      * @ORM\OneToMany(targetEntity=UserScopeHistory::class,
      * mappedBy="user", cascade={"persist", "remove"}, orphanRemoval=true)
      */
@@ -138,6 +141,7 @@ class User implements UserInterface, \Stringable
 
     /**
      * @var Collection&Selectable<int, UserJobHistory>
+     *
      * @ORM\OneToMany(targetEntity=UserJobHistory::class,
      * mappedBy="user", cascade={"persist", "remove"}, orphanRemoval=true)
      */
@@ -167,9 +171,6 @@ class User implements UserInterface, \Stringable
         $this->jobHistories = new ArrayCollection();
     }
 
-    /**
-     * @return string
-     */
     public function __toString(): string
     {
         return $this->getLabel();
@@ -187,7 +188,7 @@ class User implements UserInterface, \Stringable
 
     public function eraseCredentials() {}
 
-    public function getAbsenceStart(): ?DateTimeImmutable
+    public function getAbsenceStart(): ?\DateTimeImmutable
     {
         return $this->absenceStart;
     }
@@ -216,9 +217,6 @@ class User implements UserInterface, \Stringable
         return $this->currentLocation;
     }
 
-    /**
-     * @return string
-     */
     public function getEmail(): ?string
     {
         return $this->email;
@@ -263,9 +261,9 @@ class User implements UserInterface, \Stringable
         return $this->mainLocation;
     }
 
-    public function getMainScope(?DateTimeImmutable $at = null): ?Scope
+    public function getMainScope(\DateTimeImmutable $at = null): ?Scope
     {
-        $at ??= new DateTimeImmutable('now');
+        $at ??= new \DateTimeImmutable('now');
 
         foreach ($this->scopeHistories as $scopeHistory) {
             if ($at >= $scopeHistory->getStartDate() && (
@@ -315,9 +313,9 @@ class User implements UserInterface, \Stringable
         return $this->salt;
     }
 
-    public function getUserJob(?DateTimeImmutable $at = null): ?UserJob
+    public function getUserJob(\DateTimeImmutable $at = null): ?UserJob
     {
-        $at ??= new DateTimeImmutable('now');
+        $at ??= new \DateTimeImmutable('now');
 
         foreach ($this->jobHistories as $jobHistory) {
             if ($at >= $jobHistory->getStartDate() && (
@@ -367,7 +365,7 @@ class User implements UserInterface, \Stringable
 
     public function isAbsent(): bool
     {
-        return null !== $this->getAbsenceStart() && $this->getAbsenceStart() <= new DateTimeImmutable('now');
+        return null !== $this->getAbsenceStart() && $this->getAbsenceStart() <= new \DateTimeImmutable('now');
     }
 
     /**
@@ -412,7 +410,7 @@ class User implements UserInterface, \Stringable
         $groupCentersIds = [];
 
         foreach ($this->getGroupCenters() as $groupCenter) {
-            if (in_array($groupCenter->getId(), $groupCentersIds, true)) {
+            if (\in_array($groupCenter->getId(), $groupCentersIds, true)) {
                 $context->buildViolation('The user has already those permissions')
                     ->addViolation();
             } else {
@@ -422,17 +420,16 @@ class User implements UserInterface, \Stringable
     }
 
     /**
-     * @throws RuntimeException if the groupCenter is not in the collection
+     * @throws \RuntimeException if the groupCenter is not in the collection
      */
     public function removeGroupCenter(GroupCenter $groupCenter)
     {
-        if ($this->groupCenters->removeElement($groupCenter) === false) {
-            throw new RuntimeException('The groupCenter could not be removed, '
-                    . 'it seems not to be associated with the user. Aborting.');
+        if (false === $this->groupCenters->removeElement($groupCenter)) {
+            throw new \RuntimeException('The groupCenter could not be removed, it seems not to be associated with the user. Aborting.');
         }
     }
 
-    public function setAbsenceStart(?DateTimeImmutable $absenceStart): void
+    public function setAbsenceStart(?\DateTimeImmutable $absenceStart): void
     {
         $this->absenceStart = $absenceStart;
     }
@@ -471,8 +468,6 @@ class User implements UserInterface, \Stringable
     }
 
     /**
-     * @param $email
-     *
      * @return $this
      */
     public function setEmail($email)
@@ -483,8 +478,6 @@ class User implements UserInterface, \Stringable
     }
 
     /**
-     * @param $emailCanonical
-     *
      * @return $this
      */
     public function setEmailCanonical($emailCanonical)
@@ -531,7 +524,7 @@ class User implements UserInterface, \Stringable
         $newScope = new UserScopeHistory();
 
         $newScope
-            ->setStartDate(new DateTimeImmutable('now'))
+            ->setStartDate(new \DateTimeImmutable('now'))
             ->setScope($mainScope)
             ->setUser($this);
 
@@ -540,7 +533,7 @@ class User implements UserInterface, \Stringable
         $criteria = new Criteria();
         $criteria->orderBy(['startDate' => Criteria::ASC, 'id' => Criteria::ASC]);
 
-        /** @var Iterator $scopes */
+        /** @var \Iterator $scopes */
         $scopes = $this->scopeHistories->matching($criteria)->getIterator();
         $scopes->rewind();
 
@@ -559,8 +552,6 @@ class User implements UserInterface, \Stringable
     }
 
     /**
-     * @param $password
-     *
      * @return $this
      */
     public function setPassword($password)
@@ -571,8 +562,6 @@ class User implements UserInterface, \Stringable
     }
 
     /**
-     * @param $salt
-     *
      * @return $this
      */
     public function setSalt($salt)
@@ -591,7 +580,7 @@ class User implements UserInterface, \Stringable
         $newJob = new UserJobHistory();
 
         $newJob
-            ->setStartDate(new DateTimeImmutable('now'))
+            ->setStartDate(new \DateTimeImmutable('now'))
             ->setJob($userJob)
             ->setUser($this);
 
@@ -600,7 +589,7 @@ class User implements UserInterface, \Stringable
         $criteria = new Criteria();
         $criteria->orderBy(['startDate' => Criteria::ASC, 'id' => Criteria::ASC]);
 
-        /** @var Iterator $jobs */
+        /** @var \Iterator $jobs */
         $jobs = $this->jobHistories->matching($criteria)->getIterator();
         $jobs->rewind();
 
@@ -621,15 +610,13 @@ class User implements UserInterface, \Stringable
     /**
      * Set username.
      *
-     * @param string $name
-     *
      * @return User
      */
     public function setUsername(?string $name)
     {
         $this->username = (string) $name;
 
-        if ("" === trim($this->getLabel())) {
+        if ('' === trim($this->getLabel())) {
             $this->setLabel($name);
         }
 
@@ -637,8 +624,6 @@ class User implements UserInterface, \Stringable
     }
 
     /**
-     * @param $usernameCanonical
-     *
      * @return $this
      */
     public function setUsernameCanonical($usernameCanonical)
diff --git a/src/Bundle/ChillMainBundle/Entity/User/UserJobHistory.php b/src/Bundle/ChillMainBundle/Entity/User/UserJobHistory.php
index 233a48e2a..7916d9891 100644
--- a/src/Bundle/ChillMainBundle/Entity/User/UserJobHistory.php
+++ b/src/Bundle/ChillMainBundle/Entity/User/UserJobHistory.php
@@ -14,11 +14,11 @@ namespace Chill\MainBundle\Entity\User;
 use App\Repository\UserJobHistoryRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserJob;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table(name="chill_main_user_job_history")
+ *
  * @ORM\Entity(repositoryClass=UserJobHistoryRepository::class)
  */
 class UserJobHistory
@@ -26,11 +26,13 @@ class UserJobHistory
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -43,15 +45,14 @@ class UserJobHistory
     /**
      * @ORM\Column(type="datetime_immutable")
      */
-    private DateTimeImmutable $startDate;
+    private \DateTimeImmutable $startDate;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      */
     private User $user;
 
-
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -66,7 +67,7 @@ class UserJobHistory
         return $this->job;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -76,7 +77,7 @@ class UserJobHistory
         return $this->user;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): self
+    public function setEndDate(?\DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
 
@@ -90,7 +91,7 @@ class UserJobHistory
         return $this;
     }
 
-    public function setStartDate(DateTimeImmutable $startDate): self
+    public function setStartDate(\DateTimeImmutable $startDate): self
     {
         $this->startDate = $startDate;
 
@@ -103,5 +104,4 @@ class UserJobHistory
 
         return $this;
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/User/UserScopeHistory.php b/src/Bundle/ChillMainBundle/Entity/User/UserScopeHistory.php
index 3c4d28d4f..6ac768de2 100644
--- a/src/Bundle/ChillMainBundle/Entity/User/UserScopeHistory.php
+++ b/src/Bundle/ChillMainBundle/Entity/User/UserScopeHistory.php
@@ -14,11 +14,11 @@ namespace Chill\MainBundle\Entity\User;
 use App\Repository\UserScopeHistoryRepository;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table(name="chill_main_user_scope_history")
+ *
  * @ORM\Entity(repositoryClass=UserScopeHistoryRepository::class)
  */
 class UserScopeHistory
@@ -26,11 +26,13 @@ class UserScopeHistory
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -43,15 +45,14 @@ class UserScopeHistory
     /**
      * @ORM\Column(type="datetime_immutable")
      */
-    private DateTimeImmutable $startDate;
+    private \DateTimeImmutable $startDate;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      */
     private User $user;
 
-
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -66,7 +67,7 @@ class UserScopeHistory
         return $this->scope;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -76,7 +77,7 @@ class UserScopeHistory
         return $this->user;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): self
+    public function setEndDate(?\DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
 
@@ -90,7 +91,7 @@ class UserScopeHistory
         return $this;
     }
 
-    public function setStartDate(DateTimeImmutable $startDate): self
+    public function setStartDate(\DateTimeImmutable $startDate): self
     {
         $this->startDate = $startDate;
 
@@ -103,5 +104,4 @@ class UserScopeHistory
 
         return $this;
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/UserJob.php b/src/Bundle/ChillMainBundle/Entity/UserJob.php
index c6bfe1aa3..6be1a5efe 100644
--- a/src/Bundle/ChillMainBundle/Entity/UserJob.php
+++ b/src/Bundle/ChillMainBundle/Entity/UserJob.php
@@ -16,7 +16,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_main_user_job")
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "user_job": UserJob::class
  * })
@@ -30,16 +32,22 @@ class UserJob
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     protected ?int $id = null;
 
     /**
      * @var array<string, string>
+     *
      * @ORM\Column(name="label", type="json")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     protected array $label = [];
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
index a5cbfa24b..e26547428 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
@@ -16,23 +16,20 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Validator\Constraints\Entity\WorkflowStepUsersOnTransition;
 use Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Iterator;
-use RuntimeException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
-use function count;
-use function is_array;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_main_workflow_entity")
+ *
  * @EntityWorkflowCreation(groups={"creation"})
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "entity_workflow": EntityWorkflow::class
  * })
@@ -81,7 +78,9 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -98,19 +97,23 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\OneToMany(targetEntity=EntityWorkflowStep::class, mappedBy="entityWorkflow", orphanRemoval=true, cascade={"persist"})
+     *
      * @ORM\OrderBy({"transitionAt": "ASC", "id": "ASC"})
+     *
      * @Assert\Valid(traverse=true)
+     *
      * @var Collection<EntityWorkflowStep>
      */
     private Collection $steps;
 
     /**
-     * @var null|array|EntityWorkflowStep[]
+     * @var array|EntityWorkflowStep[]|null
      */
     private ?array $stepsChainedCache = null;
 
     /**
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_workflow_entity_subscriber_to_final")
      *
      * @var Collection<User>
@@ -119,6 +122,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_workflow_entity_subscriber_to_step")
      *
      * @var Collection<User>
@@ -220,7 +224,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
         return null;
     }
 
-    public function getCurrentStepCreatedAt(): ?DateTimeInterface
+    public function getCurrentStepCreatedAt(): ?\DateTimeInterface
     {
         if (null !== $previous = $this->getPreviousStepIfAny()) {
             return $previous->getTransitionAt();
@@ -267,7 +271,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
     {
         $iterator = $this->steps->getIterator();
 
-        if ($iterator instanceof Iterator) {
+        if ($iterator instanceof \Iterator) {
             $iterator->rewind();
 
             while ($iterator->valid()) {
@@ -288,20 +292,17 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
             return null;
         }
 
-        throw new RuntimeException();
+        throw new \RuntimeException();
     }
 
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getSteps(): \Doctrine\Common\Collections\ArrayCollection|\Doctrine\Common\Collections\Collection
+    public function getSteps(): ArrayCollection|Collection
     {
         return $this->steps;
     }
 
     public function getStepsChained(): array
     {
-        if (is_array($this->stepsChainedCache)) {
+        if (\is_array($this->stepsChainedCache)) {
             return $this->stepsChainedCache;
         }
 
@@ -332,18 +333,12 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
         return $steps;
     }
 
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getSubscriberToFinal(): \Doctrine\Common\Collections\ArrayCollection|\Doctrine\Common\Collections\Collection
+    public function getSubscriberToFinal(): ArrayCollection|Collection
     {
         return $this->subscriberToFinal;
     }
 
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getSubscriberToStep(): \Doctrine\Common\Collections\ArrayCollection|\Doctrine\Common\Collections\Collection
+    public function getSubscriberToStep(): ArrayCollection|Collection
     {
         return $this->subscriberToStep;
     }
@@ -495,7 +490,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 
     private function getPreviousStepIfAny(): ?EntityWorkflowStep
     {
-        if (1 === count($this->steps)) {
+        if (1 === \count($this->steps)) {
             return null;
         }
 
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php
index 67093d5ce..9b02bbb9e 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_main_workflow_entity_comment")
  */
 class EntityWorkflowComment implements TrackCreationInterface, TrackUpdateInterface
@@ -39,7 +40,9 @@ class EntityWorkflowComment implements TrackCreationInterface, TrackUpdateInterf
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
index bc3c9c028..53e4ad945 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
@@ -12,17 +12,15 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Entity\Workflow;
 
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function count;
-use function in_array;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_main_workflow_entity_step")
  */
 class EntityWorkflowStep
@@ -34,7 +32,9 @@ class EntityWorkflowStep
 
     /**
      * @var Collection<User>
+     *
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_workflow_entity_step_cc_user")
      */
     private Collection $ccUser;
@@ -56,14 +56,18 @@ class EntityWorkflowStep
 
     /**
      * @var Collection<User>
+     *
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_workflow_entity_step_user")
      */
     private Collection $destUser;
 
     /**
      * @var Collection<User>
+     *
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_workflow_entity_step_user_by_accesskey")
      */
     private Collection $destUserByAccessKey;
@@ -80,7 +84,9 @@ class EntityWorkflowStep
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -108,10 +114,11 @@ class EntityWorkflowStep
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $transitionAt = null;
+    private ?\DateTimeImmutable $transitionAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?User $transitionBy = null;
@@ -140,7 +147,7 @@ class EntityWorkflowStep
 
     public function addDestEmail(string $email): self
     {
-        if (!in_array($email, $this->destEmail, true)) {
+        if (!\in_array($email, $this->destEmail, true)) {
             $this->destEmail[] = $email;
         }
 
@@ -247,7 +254,7 @@ class EntityWorkflowStep
         return $this->transitionAfter;
     }
 
-    public function getTransitionAt(): ?DateTimeImmutable
+    public function getTransitionAt(): ?\DateTimeImmutable
     {
         return $this->transitionAt;
     }
@@ -385,7 +392,7 @@ class EntityWorkflowStep
         return $this;
     }
 
-    public function setTransitionAt(?DateTimeImmutable $transitionAt): EntityWorkflowStep
+    public function setTransitionAt(?\DateTimeImmutable $transitionAt): EntityWorkflowStep
     {
         $this->transitionAt = $transitionAt;
 
@@ -414,13 +421,13 @@ class EntityWorkflowStep
         return;
 
         if ($this->isFinalizeAfter()) {
-            if (0 !== count($this->getDestUser())) {
+            if (0 !== \count($this->getDestUser())) {
                 $context->buildViolation('workflow.No dest users when the workflow is finalized')
                     ->atPath('finalizeAfter')
                     ->addViolation();
             }
         } else {
-            if (0 === count($this->getDestUser())) {
+            if (0 === \count($this->getDestUser())) {
                 $context->buildViolation('workflow.The next step must count at least one dest')
                     ->atPath('finalizeAfter')
                     ->addViolation();
diff --git a/src/Bundle/ChillMainBundle/Export/AccompanyingCourseExportHelper.php b/src/Bundle/ChillMainBundle/Export/AccompanyingCourseExportHelper.php
index 174548822..e5f2e2564 100644
--- a/src/Bundle/ChillMainBundle/Export/AccompanyingCourseExportHelper.php
+++ b/src/Bundle/ChillMainBundle/Export/AccompanyingCourseExportHelper.php
@@ -27,5 +27,4 @@ final readonly class AccompanyingCourseExportHelper
 
         return $qb;
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php b/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php
index 77776cb86..28c168893 100644
--- a/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Export;
 
-use Closure;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
@@ -28,7 +27,7 @@ interface AggregatorInterface extends ModifierInterface
     public function buildForm(FormBuilderInterface $builder);
 
     /**
-     * Get the default data, that can be use as "data" for the form
+     * Get the default data, that can be use as "data" for the form.
      */
     public function getFormDefaultData(): array;
 
@@ -72,11 +71,11 @@ interface AggregatorInterface extends ModifierInterface
      * which do not need to be translated, or value already translated in
      * database. But the header must be, in every case, translated.
      *
-     * @param string $key The column key, as added in the query
+     * @param string  $key    The column key, as added in the query
      * @param mixed[] $values The values from the result. if there are duplicates, those might be given twice. Example: array('FR', 'BE', 'CZ', 'FR', 'BE', 'FR')
-     * @param mixed $data The data from the export's form (as defined in `buildForm`
+     * @param mixed   $data   The data from the export's form (as defined in `buildForm`
      *
-     * @return Closure where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
+     * @return \Closure where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
      */
     public function getLabels($key, array $values, mixed $data);
 
diff --git a/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php b/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
index 5bad5bb42..0949b0be0 100644
--- a/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
@@ -22,7 +22,7 @@ interface DirectExportInterface extends ExportElementInterface
     public function buildForm(FormBuilderInterface $builder);
 
     /**
-     * Get the default data, that can be use as "data" for the form
+     * Get the default data, that can be use as "data" for the form.
      */
     public function getFormDefaultData(): array;
 
diff --git a/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php b/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php
index b8cca4ed0..49b2500f0 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Export;
 
-use Symfony\Component\Form\FormBuilderInterface;
-
 /**
  * The common methods between different object used to build export (i.e. : ExportInterface,
  * FilterInterface, AggregatorInterface).
diff --git a/src/Bundle/ChillMainBundle/Export/ExportFormHelper.php b/src/Bundle/ChillMainBundle/Export/ExportFormHelper.php
index 8d9320424..4746b6129 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportFormHelper.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportFormHelper.php
@@ -34,7 +34,7 @@ final readonly class ExportFormHelper
             'centers', 'generate_centers' => ['centers' => $this->authorizationHelper->getReachableCenters($export->requiredRole())],
             'export', 'generate_export' => ['export' => $this->getDefaultDataStepExport($export, $options)],
             'formatter', 'generate_formatter' => ['formatter' => $this->getDefaultDataStepFormatter($options)],
-            default => throw new \LogicException("step not allowed : " . $step),
+            default => throw new \LogicException('step not allowed : '.$step),
         };
     }
 
@@ -58,7 +58,7 @@ final readonly class ExportFormHelper
         foreach ($filters as $alias => $filter) {
             $data[ExportType::FILTER_KEY][$alias] = [
                 FilterType::ENABLED_FIELD => false,
-                'form' => $filter->getFormDefaultData()
+                'form' => $filter->getFormDefaultData(),
             ];
         }
 
@@ -99,7 +99,7 @@ final readonly class ExportFormHelper
             'centers', 'generate_centers' => $this->savedExportDataToFormDataStepCenter($savedExport),
             'export', 'generate_export' => $this->savedExportDataToFormDataStepExport($savedExport, $formOptions),
             'formatter', 'generate_formatter' => $this->savedExportDataToFormDataStepFormatter($savedExport, $formOptions),
-            default => throw new \LogicException("this step is not allowed: " . $step),
+            default => throw new \LogicException('this step is not allowed: '.$step),
         };
     }
 
@@ -138,7 +138,7 @@ final readonly class ExportFormHelper
             );
 
         $builder->add('export', ExportType::class, [
-            'export_alias' => $savedExport->getExportAlias(), ...$formOptions
+            'export_alias' => $savedExport->getExportAlias(), ...$formOptions,
         ]);
         $form = $builder->getForm();
         $form->submit($savedExport->getOptions()['export']);
@@ -160,7 +160,7 @@ final readonly class ExportFormHelper
             );
 
         $builder->add('formatter', FormatterType::class, [
-            'export_alias' => $savedExport->getExportAlias(), ...$formOptions
+            'export_alias' => $savedExport->getExportAlias(), ...$formOptions,
         ]);
         $form = $builder->getForm();
         $form->submit($savedExport->getOptions()['formatter']);
diff --git a/src/Bundle/ChillMainBundle/Export/ExportInterface.php b/src/Bundle/ChillMainBundle/Export/ExportInterface.php
index 9e2d9ec7d..39e265153 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportInterface.php
@@ -25,6 +25,7 @@ use Symfony\Component\Form\FormBuilderInterface;
  * aggregation, use `ListInterface`.
  *
  * @example Chill\PersonBundle\Export\CountPerson an example of implementation
+ *
  * @template Q of QueryBuilder|NativeQuery
  */
 interface ExportInterface extends ExportElementInterface
@@ -35,7 +36,7 @@ interface ExportInterface extends ExportElementInterface
     public function buildForm(FormBuilderInterface $builder);
 
     /**
-     * Get the default data, that can be use as "data" for the form
+     * Get the default data, that can be use as "data" for the form.
      */
     public function getFormDefaultData(): array;
 
@@ -93,11 +94,11 @@ interface ExportInterface extends ExportElementInterface
      * which do not need to be translated, or value already translated in
      * database. But the header must be, in every case, translated.
      *
-     * @param string $key The column key, as added in the query
+     * @param string  $key    The column key, as added in the query
      * @param mixed[] $values The values from the result. if there are duplicates, those might be given twice. Example: array('FR', 'BE', 'CZ', 'FR', 'BE', 'FR')
-     * @param mixed $data The data from the export's form (as defined in `buildForm`)
+     * @param mixed   $data   The data from the export's form (as defined in `buildForm`)
      *
-     * @return (callable(null|string|int|float|'_header' $value): string|int|\DateTimeInterface) where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
+     * @return (callable(string|int|float|'_header'|null $value): string|int|\DateTimeInterface) where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
      */
     public function getLabels($key, array $values, mixed $data);
 
@@ -115,8 +116,8 @@ interface ExportInterface extends ExportElementInterface
     /**
      * Return the results of the query builder.
      *
-     * @param Q $query
-     * @param mixed[] $data the data from the export's fomr (added by self::buildForm)
+     * @param Q       $query
+     * @param mixed[] $data  the data from the export's fomr (added by self::buildForm)
      *
      * @return mixed[] an array of results
      */
@@ -142,10 +143,10 @@ interface ExportInterface extends ExportElementInterface
      *
      * The returned object should be an instance of QueryBuilder or NativeQuery.
      *
-     * @param array $acl an array where each row has a `center` key containing the Chill\MainBundle\Entity\Center, and `circles` keys containing the reachable circles. Example: `array( array('center' => $centerA, 'circles' => array($circleA, $circleB) ) )`
+     * @param array $acl  an array where each row has a `center` key containing the Chill\MainBundle\Entity\Center, and `circles` keys containing the reachable circles. Example: `array( array('center' => $centerA, 'circles' => array($circleA, $circleB) ) )`
      * @param array $data the data from the form, if any
      *
-     * @return Q the query to execute.
+     * @return Q the query to execute
      */
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = []);
 
diff --git a/src/Bundle/ChillMainBundle/Export/ExportManager.php b/src/Bundle/ChillMainBundle/Export/ExportManager.php
index dae3f7de3..8cb69bd63 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportManager.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportManager.php
@@ -14,21 +14,11 @@ namespace Chill\MainBundle\Export;
 use Chill\MainBundle\Form\Type\Export\ExportType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Doctrine\ORM\QueryBuilder;
-use Generator;
-use LogicException;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use UnexpectedValueException;
-
-use function array_key_exists;
-use function count;
-use function get_class;
-use function gettype;
-use function in_array;
 
 /**
  * Collects all agregators, filters and export from
@@ -74,19 +64,19 @@ class ExportManager
         iterable $exports,
         iterable $aggregators,
         iterable $filters
-        //iterable $formatters,
-        //iterable $exportElementProvider
+        // iterable $formatters,
+        // iterable $exportElementProvider
     ) {
         $this->user = $tokenStorage->getToken()->getUser();
         $this->exports = iterator_to_array($exports);
         $this->aggregators = iterator_to_array($aggregators);
         $this->filters = iterator_to_array($filters);
         // NOTE: PHP crashes on the next line (exit error code 11). This is desactivated until further investigation
-        //$this->formatters = iterator_to_array($formatters);
+        // $this->formatters = iterator_to_array($formatters);
 
-        //foreach ($exportElementProvider as $prefix => $provider) {
+        // foreach ($exportElementProvider as $prefix => $provider) {
         //    $this->addExportElementsProvider($provider, $prefix);
-        //}
+        // }
     }
 
     /**
@@ -101,7 +91,7 @@ class ExportManager
      *
      * @return FilterInterface[] a \Generator that contains filters. The key is the filter's alias
      */
-    public function &getFiltersApplyingOn(DirectExportInterface|ExportInterface $export, ?array $centers = null): iterable
+    public function &getFiltersApplyingOn(DirectExportInterface|ExportInterface $export, array $centers = null): iterable
     {
         if ($export instanceof DirectExportInterface) {
             return;
@@ -109,7 +99,7 @@ class ExportManager
 
         foreach ($this->filters as $alias => $filter) {
             if (
-                in_array($filter->applyOn(), $export->supportsModifiers(), true)
+                \in_array($filter->applyOn(), $export->supportsModifiers(), true)
                     && $this->isGrantedForElement($filter, $export, $centers)
             ) {
                 yield $alias => $filter;
@@ -122,9 +112,9 @@ class ExportManager
      *
      * @internal This class check the interface implemented by export, and, if ´ListInterface´ is used, return an empty array
      *
-     * @return null|iterable<string, AggregatorInterface> a \Generator that contains aggretagors. The key is the filter's alias
+     * @return iterable<string, AggregatorInterface>|null a \Generator that contains aggretagors. The key is the filter's alias
      */
-    public function &getAggregatorsApplyingOn(DirectExportInterface|ExportInterface $export, ?array $centers = null): ?iterable
+    public function &getAggregatorsApplyingOn(DirectExportInterface|ExportInterface $export, array $centers = null): ?iterable
     {
         if ($export instanceof ListInterface || $export instanceof DirectExportInterface) {
             return;
@@ -132,7 +122,7 @@ class ExportManager
 
         foreach ($this->aggregators as $alias => $aggregator) {
             if (
-                in_array($aggregator->applyOn(), $export->supportsModifiers(), true)
+                \in_array($aggregator->applyOn(), $export->supportsModifiers(), true)
                     && $this->isGrantedForElement($aggregator, $export, $centers)
             ) {
                 yield $alias => $aggregator;
@@ -143,7 +133,7 @@ class ExportManager
     public function addExportElementsProvider(ExportElementsProviderInterface $provider, string $prefix): void
     {
         foreach ($provider->getExportElements() as $suffix => $element) {
-            $alias = $prefix . '_' . $suffix;
+            $alias = $prefix.'_'.$suffix;
 
             if ($element instanceof ExportInterface) {
                 $this->exports[$alias] = $element;
@@ -154,8 +144,7 @@ class ExportManager
             } elseif ($element instanceof FormatterInterface) {
                 $this->addFormatter($element, $alias);
             } else {
-                throw new LogicException('This element ' . $element::class . ' '
-                    . 'is not an instance of export element');
+                throw new \LogicException('This element '.$element::class.' is not an instance of export element');
             }
         }
     }
@@ -194,37 +183,27 @@ class ExportManager
         if ($query instanceof \Doctrine\ORM\NativeQuery) {
             // throw an error if the export require other modifier, which is
             // not allowed when the export return a `NativeQuery`
-            if (count($export->supportsModifiers()) > 0) {
-                throw new LogicException("The export with alias `{$exportAlias}` return "
-                        . 'a `\\Doctrine\\ORM\\NativeQuery` and supports modifiers, which is not '
-                        . 'allowed. Either the method `supportsModifiers` should return an empty '
-                        . 'array, or return a `Doctrine\\ORM\\QueryBuilder`');
+            if (\count($export->supportsModifiers()) > 0) {
+                throw new \LogicException("The export with alias `{$exportAlias}` return ".'a `\\Doctrine\\ORM\\NativeQuery` and supports modifiers, which is not allowed. Either the method `supportsModifiers` should return an empty array, or return a `Doctrine\\ORM\\QueryBuilder`');
             }
         } elseif ($query instanceof QueryBuilder) {
-            //handle filters
+            // handle filters
             $this->handleFilters($export, $query, $data[ExportType::FILTER_KEY], $centers);
 
-            //handle aggregators
+            // handle aggregators
             $this->handleAggregators($export, $query, $data[ExportType::AGGREGATOR_KEY], $centers);
 
             $this->logger->notice('[export] will execute this qb in export', [
                 'dql' => $query->getDQL(),
             ]);
         } else {
-            throw new UnexpectedValueException('The method `intiateQuery` should return '
-                    . 'a `\\Doctrine\\ORM\\NativeQuery` or a `Doctrine\\ORM\\QueryBuilder` '
-                    . 'object.');
+            throw new \UnexpectedValueException('The method `intiateQuery` should return a `\\Doctrine\\ORM\\NativeQuery` or a `Doctrine\\ORM\\QueryBuilder` object.');
         }
 
         $result = $export->getResult($query, $data[ExportType::EXPORT_KEY]);
 
         if (!is_iterable($result)) {
-            throw new UnexpectedValueException(
-                sprintf(
-                    'The result of the export should be an iterable, %s given',
-                    gettype($result)
-                )
-            );
+            throw new \UnexpectedValueException(sprintf('The result of the export should be an iterable, %s given', \gettype($result)));
         }
 
         /** @var FormatterInterface $formatter */
@@ -259,14 +238,14 @@ class ExportManager
     /**
      * @param string $alias
      *
-     * @throws RuntimeException if the aggregator is not known
-     *
      * @return AggregatorInterface
+     *
+     * @throws \RuntimeException if the aggregator is not known
      */
     public function getAggregator($alias)
     {
-        if (!array_key_exists($alias, $this->aggregators)) {
-            throw new RuntimeException("The aggregator with alias {$alias} is not known.");
+        if (!\array_key_exists($alias, $this->aggregators)) {
+            throw new \RuntimeException("The aggregator with alias {$alias} is not known.");
         }
 
         return $this->aggregators[$alias];
@@ -283,7 +262,7 @@ class ExportManager
     }
 
     /**
-     * Get the types for known exports
+     * Get the types for known exports.
      *
      * @return list<string> the existing type for known exports
      */
@@ -292,7 +271,7 @@ class ExportManager
         $existingTypes = [];
 
         foreach ($this->exports as $export) {
-            if (!in_array($export->getType(), $existingTypes, true)) {
+            if (!\in_array($export->getType(), $existingTypes, true)) {
                 $existingTypes[] = $export->getType();
             }
         }
@@ -305,12 +284,12 @@ class ExportManager
      *
      * @param string $alias
      *
-     * @throws RuntimeException
+     * @throws \RuntimeException
      */
     public function getExport($alias): DirectExportInterface|ExportInterface
     {
-        if (!array_key_exists($alias, $this->exports)) {
-            throw new RuntimeException("The export with alias {$alias} is not known.");
+        if (!\array_key_exists($alias, $this->exports)) {
+            throw new \RuntimeException("The export with alias {$alias} is not known.");
         }
 
         return $this->exports[$alias];
@@ -339,7 +318,6 @@ class ExportManager
     /**
      * Get all exports grouped in an array.
      *
-     *
      * @return array<string, array<string, ExportInterface|DirectExportInterface>> where keys are the groups's name and value is an array of exports
      */
     public function getExportsGrouped(bool $whereUserIsGranted = true): array
@@ -358,12 +336,12 @@ class ExportManager
     }
 
     /**
-     * @throws RuntimeException if the filter is not known
+     * @throws \RuntimeException if the filter is not known
      */
     public function getFilter(string $alias): FilterInterface
     {
-        if (!array_key_exists($alias, $this->filters)) {
-            throw new RuntimeException("The filter with alias {$alias} is not known.");
+        if (!\array_key_exists($alias, $this->filters)) {
+            throw new \RuntimeException("The filter with alias {$alias} is not known.");
         }
 
         return $this->filters[$alias];
@@ -373,6 +351,7 @@ class ExportManager
      * get all filters.
      *
      * @param array<string> $aliases
+     *
      * @return iterable<string, FilterInterface> $aliases
      */
     public function getFilters(array $aliases): iterable
@@ -384,8 +363,8 @@ class ExportManager
 
     public function getFormatter(string $alias): FormatterInterface
     {
-        if (!array_key_exists($alias, $this->formatters)) {
-            throw new RuntimeException("The formatter with alias {$alias} is not known.");
+        if (!\array_key_exists($alias, $this->formatters)) {
+            throw new \RuntimeException("The formatter with alias {$alias} is not known.");
         }
 
         return $this->formatters[$alias];
@@ -395,11 +374,12 @@ class ExportManager
      * get the formatter alias from the form export data.
      *
      * @param array $data the data from the export form
+     *
      * @string the formatter alias|null
      */
     public function getFormatterAlias(array $data): ?string
     {
-        if (array_key_exists(ExportType::PICK_FORMATTER_KEY, $data)) {
+        if (\array_key_exists(ExportType::PICK_FORMATTER_KEY, $data)) {
             return $data[ExportType::PICK_FORMATTER_KEY]['alias'];
         }
 
@@ -414,7 +394,7 @@ class ExportManager
     public function getFormattersByTypes(array $types): iterable
     {
         foreach ($this->formatters as $alias => $formatter) {
-            if (in_array($formatter->getType(), $types, true)) {
+            if (\in_array($formatter->getType(), $types, true)) {
                 yield $alias => $formatter;
             }
         }
@@ -450,21 +430,18 @@ class ExportManager
     /**
      * Return true if the current user has access to the ExportElement for every
      * center, false if the user hasn't access to element for at least one center.
-     *
      */
     public function isGrantedForElement(
         DirectExportInterface|ExportInterface|ModifierInterface $element,
-        \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export = null,
-        ?array $centers = null
+        DirectExportInterface|ExportInterface $export = null,
+        array $centers = null
     ): bool {
         if ($element instanceof ExportInterface || $element instanceof DirectExportInterface) {
             $role = $element->requiredRole();
         } else {
             if (null === $element->addRole()) {
                 if (null === $export) {
-                    throw new LogicException('The export should not be null: as the '
-                            . 'ModifierInstance element is not an export, we should '
-                            . 'be aware of the export to determine which role is required');
+                    throw new \LogicException('The export should not be null: as the ModifierInstance element is not an export, we should be aware of the export to determine which role is required');
                 }
                 $role = $export->requiredRole();
             } else {
@@ -482,7 +459,7 @@ class ExportManager
 
         foreach ($centers as $center) {
             if (false === $this->authorizationChecker->isGranted($role, $center)) {
-                //debugging
+                // debugging
                 $this->logger->debug('user has no access to element', [
                     'method' => __METHOD__,
                     'type' => $element::class,
@@ -538,9 +515,8 @@ class ExportManager
         $aggregators = $this->retrieveUsedAggregators($data);
 
         foreach ($aggregators as $alias => $aggregator) {
-            if ($this->isGrantedForElement($aggregator, $export, $center) === false) {
-                throw new UnauthorizedHttpException('You are not authorized to '
-                    . 'use the aggregator' . $aggregator->getTitle());
+            if (false === $this->isGrantedForElement($aggregator, $export, $center)) {
+                throw new UnauthorizedHttpException('You are not authorized to use the aggregator'.$aggregator->getTitle());
             }
 
             $formData = $data[$alias];
@@ -553,8 +529,9 @@ class ExportManager
      *
      * This function check the acl.
      *
-     * @param mixed $data the data under the initial 'filters' data
+     * @param mixed                             $data    the data under the initial 'filters' data
      * @param \Chill\MainBundle\Entity\Center[] $centers the picked centers
+     *
      * @throw UnauthorizedHttpException if the user is not authorized
      */
     private function handleFilters(
@@ -566,14 +543,13 @@ class ExportManager
         $filters = $this->retrieveUsedFilters($data);
 
         foreach ($filters as $alias => $filter) {
-            if ($this->isGrantedForElement($filter, $export, $centers) === false) {
-                throw new UnauthorizedHttpException('You are not authorized to '
-                        . 'use the filter ' . $filter->getTitle());
+            if (false === $this->isGrantedForElement($filter, $export, $centers)) {
+                throw new UnauthorizedHttpException('You are not authorized to use the filter '.$filter->getTitle());
             }
 
             $formData = $data[$alias];
 
-            $this->logger->debug('alter query by filter ' . $alias, [
+            $this->logger->debug('alter query by filter '.$alias, [
                 'class' => self::class, 'function' => __FUNCTION__,
             ]);
             $filter->alterQuery($qb, $formData['form']);
@@ -608,7 +584,7 @@ class ExportManager
         $usedTypes = [];
 
         foreach ($this->retrieveUsedAggregators($data) as $alias => $aggregator) {
-            if (!in_array($aggregator->applyOn(), $usedTypes, true)) {
+            if (!\in_array($aggregator->applyOn(), $usedTypes, true)) {
                 $usedTypes[] = $aggregator->applyOn();
             }
         }
@@ -651,7 +627,7 @@ class ExportManager
             if (true === $filterData['enabled']) {
                 $filter = $this->getFilter($alias);
 
-                if (!in_array($filter->applyOn(), $usedTypes, true)) {
+                if (!\in_array($filter->applyOn(), $usedTypes, true)) {
                     $usedTypes[] = $filter->applyOn();
                 }
             }
@@ -663,7 +639,6 @@ class ExportManager
     /**
      * parse the data to retrieve the used filters and aggregators.
      *
-     *
      * @return string[]
      */
     private function retrieveUsedModifiers(mixed $data)
@@ -678,7 +653,7 @@ class ExportManager
         );
 
         $this->logger->debug(
-            'Required types are ' . implode(', ', $usedTypes),
+            'Required types are '.implode(', ', $usedTypes),
             ['class' => self::class, 'function' => __FUNCTION__]
         );
 
diff --git a/src/Bundle/ChillMainBundle/Export/FilterInterface.php b/src/Bundle/ChillMainBundle/Export/FilterInterface.php
index 7db850108..d02b9843e 100644
--- a/src/Bundle/ChillMainBundle/Export/FilterInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/FilterInterface.php
@@ -31,7 +31,7 @@ interface FilterInterface extends ModifierInterface
     public function buildForm(FormBuilderInterface $builder);
 
     /**
-     * Get the default data, that can be use as "data" for the form
+     * Get the default data, that can be use as "data" for the form.
      */
     public function getFormDefaultData(): array;
 
@@ -60,7 +60,7 @@ interface FilterInterface extends ModifierInterface
      *
      * Example: `array('my string with %parameter%', ['%parameter%' => 'good news'], 'mydomain', 'mylocale')`
      *
-     * @param array $data
+     * @param array  $data
      * @param string $format the format
      *
      * @return array|string a string with the data or, if translatable, an array where first element is string, second elements is an array of arguments
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
index 868287fd1..ee7b5d5c3 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
@@ -13,25 +13,18 @@ namespace Chill\MainBundle\Export\Formatter;
 
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Export\FormatterInterface;
-use LogicException;
-use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
-
-use function array_key_exists;
-use function array_slice;
-use function call_user_func;
 use function count;
-use function is_array;
 
 /**
  * Command to get the report with curl:
  *   curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff.
  *
- * @deprecated this formatter is not used any more.
+ * @deprecated this formatter is not used any more
  */
 class CSVFormatter implements FormatterInterface
 {
@@ -65,13 +58,11 @@ class CSVFormatter implements FormatterInterface
 
     /**
      * @uses appendAggregatorForm
-     *
-     * @param mixed $exportAlias
      */
     public function buildForm(FormBuilderInterface $builder, $exportAlias, array $aggregatorAliases)
     {
         $aggregators = $this->exportManager->getAggregators($aggregatorAliases);
-        $nb = count($aggregatorAliases);
+        $nb = \count($aggregatorAliases);
 
         foreach ($aggregators as $alias => $aggregator) {
             $builderAggregator = $builder->create($alias, FormType::class, [
@@ -101,7 +92,7 @@ class CSVFormatter implements FormatterInterface
                 continue;
             }
 
-            if (is_array($statement)) {
+            if (\is_array($statement)) {
                 $descriptions[] = $this->translator->trans(
                     $statement[0],
                     $statement[1],
@@ -142,7 +133,7 @@ class CSVFormatter implements FormatterInterface
         $response = new Response();
         $response->setStatusCode(200);
         $response->headers->set('Content-Type', 'text/csv; charset=utf-8');
-        //$response->headers->set('Content-Disposition','attachment; filename="export.csv"');
+        // $response->headers->set('Content-Disposition','attachment; filename="export.csv"');
 
         $response->setContent($this->generateContent());
 
@@ -172,10 +163,8 @@ class CSVFormatter implements FormatterInterface
             // gather data in an array
             foreach ($keys as $key) {
                 $values = array_map(static function ($row) use ($key, $alias) {
-                    if (!array_key_exists($key, $row)) {
-                        throw new LogicException("the key '" . $key . "' is declared by "
-                                . "the aggregator with alias '" . $alias . "' but is not "
-                                . 'present in results');
+                    if (!\array_key_exists($key, $row)) {
+                        throw new \LogicException("the key '".$key."' is declared by the aggregator with alias '".$alias."' but is not ".'present in results');
                     }
 
                     return $row[$key];
@@ -199,10 +188,8 @@ class CSVFormatter implements FormatterInterface
 
         foreach ($keys as $key) {
             $values = array_map(static function ($row) use ($key, $export) {
-                if (!array_key_exists($key, $row)) {
-                    throw new LogicException("the key '" . $key . "' is declared by "
-                                . "the export with title '" . $export->getTitle() . "' but is not "
-                                . 'present in results');
+                if (!\array_key_exists($key, $row)) {
+                    throw new \LogicException("the key '".$key."' is declared by the export with title '".$export->getTitle()."' but is not ".'present in results');
                 }
 
                 return $row[$key];
@@ -220,9 +207,9 @@ class CSVFormatter implements FormatterInterface
     protected function generateContent()
     {
         $line = null;
-        $rowKeysNb = count($this->getRowHeaders());
-        $columnKeysNb = count($this->getColumnHeaders());
-        $resultsKeysNb = count($this->export->getQueryKeys($this->exportData));
+        $rowKeysNb = \count($this->getRowHeaders());
+        $columnKeysNb = \count($this->getColumnHeaders());
+        $resultsKeysNb = \count($this->export->getQueryKeys($this->exportData));
         $results = $this->getOrderedResults();
         /** @var string[] $columnHeaders the column headers associations */
         $columnHeaders = [];
@@ -233,9 +220,9 @@ class CSVFormatter implements FormatterInterface
         // create a file pointer connected to the output stream
         $output = fopen('php://output', 'wb');
 
-        //title
+        // title
         fputcsv($output, [$this->translator->trans($this->export->getTitle())]);
-        //blank line
+        // blank line
         fputcsv($output, ['']);
 
         // add filtering description
@@ -247,32 +234,32 @@ class CSVFormatter implements FormatterInterface
 
         // iterate on result to : 1. populate row headers, 2. populate column headers, 3. add result
         foreach ($results as $row) {
-            $rowHeaders = array_slice($row, 0, $rowKeysNb);
+            $rowHeaders = \array_slice($row, 0, $rowKeysNb);
 
-            //first line : we create line and adding them row headers
+            // first line : we create line and adding them row headers
             if (!isset($line)) {
-                $line = array_slice($row, 0, $rowKeysNb);
+                $line = \array_slice($row, 0, $rowKeysNb);
             }
 
             // do we have to create a new line ? if the rows are equals, continue on the line, else create a next line
-            if (array_slice($line, 0, $rowKeysNb) !== $rowHeaders) {
+            if (\array_slice($line, 0, $rowKeysNb) !== $rowHeaders) {
                 $contentData[] = $line;
-                $line = array_slice($row, 0, $rowKeysNb);
+                $line = \array_slice($row, 0, $rowKeysNb);
             }
 
             // add the column headers
             /** @var string[] $columns the column for this row */
-            $columns = array_slice($row, $rowKeysNb, $columnKeysNb);
+            $columns = \array_slice($row, $rowKeysNb, $columnKeysNb);
             $columnPosition = $this->findColumnPosition($columnHeaders, $columns);
 
-            //fill with blank at the position given by the columnPosition + nbRowHeaders
+            // fill with blank at the position given by the columnPosition + nbRowHeaders
             for ($i = 0; $i < $columnPosition; ++$i) {
                 if (!isset($line[$rowKeysNb + $i])) {
                     $line[$rowKeysNb + $i] = '';
                 }
             }
 
-            $resultData = array_slice($row, $resultsKeysNb * -1);
+            $resultData = \array_slice($row, $resultsKeysNb * -1);
 
             foreach ($resultData as $data) {
                 $line[] = $data;
@@ -282,7 +269,7 @@ class CSVFormatter implements FormatterInterface
         // we add  the last line
         $contentData[] = $line;
 
-        //column title headers
+        // column title headers
         for ($i = 0; $i < $columnKeysNb; ++$i) {
             $line = array_fill(0, $rowKeysNb, '');
 
@@ -293,22 +280,22 @@ class CSVFormatter implements FormatterInterface
             $content[] = $line;
         }
 
-        //row title headers
+        // row title headers
         $headerLine = [];
 
         foreach ($this->getRowHeaders() as $headerKey) {
-            $headerLine[] = array_key_exists('_header', $this->labels[$headerKey]) ?
+            $headerLine[] = \array_key_exists('_header', $this->labels[$headerKey]) ?
                     $this->labels[$headerKey]['_header'] : '';
         }
 
         foreach ($this->export->getQueryKeys($this->exportData) as $key) {
-            $headerLine[] = array_key_exists('_header', $this->labels[$key]) ?
+            $headerLine[] = \array_key_exists('_header', $this->labels[$key]) ?
                     $this->labels[$key]['_header'] : '';
         }
         fputcsv($output, $headerLine);
-        unset($headerLine); //free memory
+        unset($headerLine); // free memory
 
-        //generate CSV
+        // generate CSV
         foreach ($content as $line) {
             fputcsv($output, $line);
         }
@@ -390,7 +377,7 @@ class CSVFormatter implements FormatterInterface
             ++$i;
         }
 
-        //we didn't find it, adding the column
+        // we didn't find it, adding the column
         $columnHeaders[] = $columnToFind;
 
         return $i++;
@@ -410,12 +397,12 @@ class CSVFormatter implements FormatterInterface
             $line = [];
 
             foreach ($headers as $key) {
-                $line[] = call_user_func($labels[$key], $row[$key]);
+                $line[] = \call_user_func($labels[$key], $row[$key]);
             }
 
-            //append result
+            // append result
             foreach ($resultsKeys as $key) {
-                $line[] = call_user_func($labels[$key], $row[$key]);
+                $line[] = \call_user_func($labels[$key], $row[$key]);
             }
 
             $r[] = $line;
@@ -429,19 +416,17 @@ class CSVFormatter implements FormatterInterface
     /**
      * @param string $position may be 'c' (column) or 'r' (row)
      *
-     * @throws RuntimeException
-     *
      * @return string[]
+     *
+     * @throws \RuntimeException
      */
     private function getPositionnalHeaders($position)
     {
         $headers = [];
 
         foreach ($this->formatterData as $alias => $data) {
-            if (!array_key_exists($alias, $this->aggregatorsData)) {
-                throw new RuntimeException('the formatter wants to use the '
-                        . "aggregator with alias {$alias}, but the export do not "
-                        . 'contains data about it');
+            if (!\array_key_exists($alias, $this->aggregatorsData)) {
+                throw new \RuntimeException('the formatter wants to use the '."aggregator with alias {$alias}, but the export do not ".'contains data about it');
             }
 
             $aggregator = $this->aggregators[$alias];
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
index d11aea068..97a37d455 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
@@ -13,18 +13,11 @@ namespace Chill\MainBundle\Export\Formatter;
 
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Export\FormatterInterface;
-use LogicException;
-use OutOfBoundsException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
-
-use function array_key_exists;
-use function array_keys;
-use function array_map;
 use function count;
-use function implode;
 
 // command to get the report with curl : curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff
 
@@ -101,11 +94,11 @@ class CSVListFormatter implements FormatterInterface
     /**
      * Generate a response from the data collected on differents ExportElementInterface.
      *
-     * @param mixed[] $result The result, as given by the ExportInterface
-     * @param mixed[] $formatterData collected from the current form
-     * @param string $exportAlias the id of the current export
-     * @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
-     * @param array $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
+     * @param mixed[] $result          The result, as given by the ExportInterface
+     * @param mixed[] $formatterData   collected from the current form
+     * @param string  $exportAlias     the id of the current export
+     * @param array   $filtersData     an array containing the filters data. The key are the filters id, and the value are the data
+     * @param array   $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
      *
      * @return \Symfony\Component\HttpFoundation\Response The response to be shown
      */
@@ -150,7 +143,7 @@ class CSVListFormatter implements FormatterInterface
         $response = new Response();
         $response->setStatusCode(200);
         $response->headers->set('Content-Type', 'text/csv; charset=utf-8');
-        //$response->headers->set('Content-Disposition','attachment; filename="export.csv"');
+        // $response->headers->set('Content-Disposition','attachment; filename="export.csv"');
 
         $response->setContent($csvContent);
 
@@ -168,9 +161,9 @@ class CSVListFormatter implements FormatterInterface
      * @param string $key
      * @param string $value
      *
-     * @throws LogicException if the label is not found
-     *
      * @return string
+     *
+     * @throws \LogicException if the label is not found
      */
     protected function getLabel($key, $value)
     {
@@ -178,15 +171,8 @@ class CSVListFormatter implements FormatterInterface
             $this->prepareCacheLabels();
         }
 
-        if (!array_key_exists($key, $this->labelsCache)) {
-            throw new OutOfBoundsException(sprintf(
-                'The key "%s" '
-                . 'is not present in the list of keys handled by '
-                . 'this query. Check your `getKeys` and `getLabels` '
-                . 'methods. Available keys are %s.',
-                $key,
-                implode(', ', array_keys($this->labelsCache))
-            ));
+        if (!\array_key_exists($key, $this->labelsCache)) {
+            throw new \OutOfBoundsException(sprintf('The key "%s" is not present in the list of keys handled by this query. Check your `getKeys` and `getLabels` methods. Available keys are %s.', $key, \implode(', ', \array_keys($this->labelsCache))));
         }
 
         return $this->labelsCache[$key]($value);
@@ -203,7 +189,7 @@ class CSVListFormatter implements FormatterInterface
 
         foreach ($keys as $key) {
             // get an array with all values for this key if possible
-            $values = array_map(static fn ($v) => $v[$key], $this->result);
+            $values = \array_map(static fn ($v) => $v[$key], $this->result);
             // store the label in the labelsCache property
             $this->labelsCache[$key] = $export->getLabels($key, $values, $this->exportData);
         }
@@ -218,7 +204,7 @@ class CSVListFormatter implements FormatterInterface
     {
         $keys = $this->exportManager->getExport($this->exportAlias)->getQueryKeys($this->exportData);
         // we want to keep the order of the first row. So we will iterate on the first row of the results
-        $first_row = count($this->result) > 0 ? $this->result[0] : [];
+        $first_row = \count($this->result) > 0 ? $this->result[0] : [];
         $header_line = [];
 
         if (true === $this->formatterData['numerotation']) {
@@ -231,7 +217,7 @@ class CSVListFormatter implements FormatterInterface
             );
         }
 
-        if (count($header_line) > 0) {
+        if (\count($header_line) > 0) {
             fputcsv($output, $header_line);
         }
     }
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
index ae4d3629f..02b7409bc 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
@@ -13,15 +13,11 @@ namespace Chill\MainBundle\Export\Formatter;
 
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Export\FormatterInterface;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_map;
-use function count;
-
 /**
  * Create a CSV List for the export where the header are printed on the
  * first column, and the result goes from left to right.
@@ -97,11 +93,11 @@ class CSVPivotedListFormatter implements FormatterInterface
     /**
      * Generate a response from the data collected on differents ExportElementInterface.
      *
-     * @param mixed[] $result The result, as given by the ExportInterface
-     * @param mixed[] $formatterData collected from the current form
-     * @param string $exportAlias the id of the current export
-     * @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
-     * @param array $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
+     * @param mixed[] $result          The result, as given by the ExportInterface
+     * @param mixed[] $formatterData   collected from the current form
+     * @param string  $exportAlias     the id of the current export
+     * @param array   $filtersData     an array containing the filters data. The key are the filters id, and the value are the data
+     * @param array   $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
      *
      * @return \Symfony\Component\HttpFoundation\Response The response to be shown
      */
@@ -139,7 +135,7 @@ class CSVPivotedListFormatter implements FormatterInterface
             ++$i;
         }
 
-        //adding the lines to the csv output
+        // adding the lines to the csv output
         foreach ($lines as $line) {
             fputcsv($output, $line);
         }
@@ -168,9 +164,9 @@ class CSVPivotedListFormatter implements FormatterInterface
      * @param string $key
      * @param string $value
      *
-     * @throws LogicException if the label is not found
-     *
      * @return string
+     *
+     * @throws \LogicException if the label is not found
      */
     protected function getLabel($key, $value)
     {
@@ -192,7 +188,7 @@ class CSVPivotedListFormatter implements FormatterInterface
 
         foreach ($keys as $key) {
             // get an array with all values for this key if possible
-            $values = array_map(static fn ($v) => $v[$key], $this->result);
+            $values = \array_map(static fn ($v) => $v[$key], $this->result);
             // store the label in the labelsCache property
             $this->labelsCache[$key] = $export->getLabels($key, $values, $this->exportData);
         }
@@ -207,7 +203,7 @@ class CSVPivotedListFormatter implements FormatterInterface
     {
         $keys = $this->exportManager->getExport($this->exportAlias)->getQueryKeys($this->exportData);
         // we want to keep the order of the first row. So we will iterate on the first row of the results
-        $first_row = count($this->result) > 0 ? $this->result[0] : [];
+        $first_row = \count($this->result) > 0 ? $this->result[0] : [];
         $header_line = [];
 
         if (true === $this->formatterData['numerotation']) {
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
index bdb76b8a8..4147c0016 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Export\Formatter;
 
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Export\FormatterInterface;
-use LogicException;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -21,19 +20,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_map;
-use function array_merge;
-use function array_multisort;
-use function array_unique;
-use function call_user_func;
-use function count;
-use function fopen;
-use function is_array;
-use function stream_get_contents;
-use function sys_get_temp_dir;
-use function tempnam;
-use function unlink;
-
 class SpreadSheetFormatter implements FormatterInterface
 {
     /**
@@ -60,7 +46,7 @@ class SpreadSheetFormatter implements FormatterInterface
      *
      * @var type
      */
-    //protected $aggregators;
+    // protected $aggregators;
 
     /**
      * array containing value of export form.
@@ -104,7 +90,7 @@ class SpreadSheetFormatter implements FormatterInterface
      *
      * @var array
      */
-    //protected $labels;
+    // protected $labels;
 
     /**
      * temporary file to store spreadsheet.
@@ -157,7 +143,7 @@ class SpreadSheetFormatter implements FormatterInterface
 
         // ordering aggregators
         $aggregators = $this->exportManager->getAggregators($aggregatorAliases);
-        $nb = count($aggregatorAliases);
+        $nb = \count($aggregatorAliases);
 
         foreach ($aggregators as $alias => $aggregator) {
             $builderAggregator = $builder->create($alias, FormType::class, [
@@ -212,15 +198,15 @@ class SpreadSheetFormatter implements FormatterInterface
             $this->getContentType($this->formatterData['format'])
         );
 
-        $this->tempfile = tempnam(sys_get_temp_dir(), '');
+        $this->tempfile = \tempnam(\sys_get_temp_dir(), '');
         $this->generateContent();
 
-        $f = fopen($this->tempfile, 'rb');
-        $response->setContent(stream_get_contents($f));
+        $f = \fopen($this->tempfile, 'rb');
+        $response->setContent(\stream_get_contents($f));
         fclose($f);
 
         // remove the temp file from disk
-        unlink($this->tempfile);
+        \unlink($this->tempfile);
 
         return $response;
     }
@@ -238,11 +224,11 @@ class SpreadSheetFormatter implements FormatterInterface
         $worksheet->fromArray(
             $sortedResults,
             null,
-            'A' . $line,
+            'A'.$line,
             true
         );
 
-        return $line + count($sortedResults) + 1;
+        return $line + \count($sortedResults) + 1;
     }
 
     /**
@@ -260,7 +246,7 @@ class SpreadSheetFormatter implements FormatterInterface
             $filter = $this->exportManager->getFilter($alias);
             $description = $filter->describeAction($data, 'string');
 
-            if (is_array($description)) {
+            if (\is_array($description)) {
                 $description = $this->translator
                     ->trans(
                         $description[0],
@@ -268,7 +254,7 @@ class SpreadSheetFormatter implements FormatterInterface
                     );
             }
 
-            $worksheet->setCellValue('A' . $line, $description);
+            $worksheet->setCellValue('A'.$line, $description);
             ++$line;
         }
 
@@ -303,7 +289,7 @@ class SpreadSheetFormatter implements FormatterInterface
         $worksheet->fromArray(
             $displayables,
             null,
-            'A' . $line
+            'A'.$line
         );
 
         return $line + 1;
@@ -359,7 +345,7 @@ class SpreadSheetFormatter implements FormatterInterface
             'ods' => \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Ods'),
             'xlsx' => \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Xlsx'),
             'csv' => \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Csv'),
-            default => throw new LogicException(),
+            default => throw new \LogicException(),
         };
 
         $writer->save($this->tempfile);
@@ -383,7 +369,7 @@ class SpreadSheetFormatter implements FormatterInterface
             $aggregator = $this->exportManager->getAggregator($alias);
             $aggregatorsKeys = $aggregator->getQueryKeys($data);
             // append the keys from aggregator to the $keys existing array
-            $keys = array_merge($keys, $aggregatorsKeys);
+            $keys = \array_merge($keys, $aggregatorsKeys);
             // append the key with the alias, which will be use later for sorting
             foreach ($aggregatorsKeys as $key) {
                 $aggregatorKeyAssociation[$key] = $alias;
@@ -420,7 +406,7 @@ class SpreadSheetFormatter implements FormatterInterface
 
             case 'xlsx':
                 return 'application/vnd.openxmlformats-officedocument.'
-                . 'spreadsheetml.sheet';
+                .'spreadsheetml.sheet';
         }
     }
 
@@ -439,7 +425,7 @@ class SpreadSheetFormatter implements FormatterInterface
 
         $value ??= '';
 
-        return call_user_func($this->cacheDisplayableResult[$key], $value);
+        return \call_user_func($this->cacheDisplayableResult[$key], $value);
     }
 
     protected function getTitle()
@@ -447,7 +433,7 @@ class SpreadSheetFormatter implements FormatterInterface
         $title = $this->translator->trans($this->export->getTitle());
 
         if (30 < strlen($title)) {
-            return substr($title, 0, 30) . '…';
+            return substr($title, 0, 30).'…';
         }
 
         return $title;
@@ -499,7 +485,7 @@ class SpreadSheetFormatter implements FormatterInterface
                 $this->cacheDisplayableResult[$key] = $element->getLabels($key, ['_header'], $data);
             } else {
                 $this->cacheDisplayableResult[$key] =
-                    $element->getLabels($key, array_unique($allValues[$key]), $data);
+                    $element->getLabels($key, \array_unique($allValues[$key]), $data);
             }
         }
 
@@ -548,9 +534,9 @@ class SpreadSheetFormatter implements FormatterInterface
         $exportKeys = $this->export->getQueryKeys($this->exportData);
         $aggregatorKeys = $this->getAggregatorKeysSorted();
 
-        $globalKeys = array_merge($aggregatorKeys, $exportKeys);
+        $globalKeys = \array_merge($aggregatorKeys, $exportKeys);
 
-        $sortedResult = array_map(function ($row) use ($globalKeys) {
+        $sortedResult = \array_map(function ($row) use ($globalKeys) {
             $newRow = [];
 
             foreach ($globalKeys as $key) {
@@ -560,7 +546,7 @@ class SpreadSheetFormatter implements FormatterInterface
             return $newRow;
         }, $this->result);
 
-        array_multisort($sortedResult);
+        \array_multisort($sortedResult);
 
         return [$sortedResult, $exportKeys, $aggregatorKeys, $globalKeys];
     }
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
index b82ab8f61..e91095afd 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
@@ -13,29 +13,15 @@ namespace Chill\MainBundle\Export\Formatter;
 
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Export\FormatterInterface;
-use DateTimeInterface;
-use LogicException;
-use OutOfBoundsException;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
-use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
-
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_key_exists;
-use function array_keys;
-use function array_map;
 use function count;
-use function fopen;
-use function implode;
-use function stream_get_contents;
-use function sys_get_temp_dir;
-use function tempnam;
-use function unlink;
 
 // command to get the report with curl : curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff
 
@@ -120,11 +106,11 @@ class SpreadsheetListFormatter implements FormatterInterface
     /**
      * Generate a response from the data collected on differents ExportElementInterface.
      *
-     * @param mixed[] $result The result, as given by the ExportInterface
-     * @param mixed[] $formatterData collected from the current form
-     * @param string $exportAlias the id of the current export
-     * @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
-     * @param array $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
+     * @param mixed[] $result          The result, as given by the ExportInterface
+     * @param mixed[] $formatterData   collected from the current form
+     * @param string  $exportAlias     the id of the current export
+     * @param array   $filtersData     an array containing the filters data. The key are the filters id, and the value are the data
+     * @param array   $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
      *
      * @return \Symfony\Component\HttpFoundation\Response The response to be shown
      */
@@ -150,20 +136,20 @@ class SpreadsheetListFormatter implements FormatterInterface
 
         foreach ($result as $row) {
             if (true === $this->formatterData['numerotation']) {
-                $worksheet->setCellValue('A' . ($i + 1), (string) $i);
+                $worksheet->setCellValue('A'.($i + 1), (string) $i);
             }
 
             $a = $this->formatterData['numerotation'] ? 'B' : 'A';
 
             foreach ($row as $key => $value) {
-                $row = $a . ($i + 1);
+                $row = $a.($i + 1);
 
                 $formattedValue = $this->getLabel($key, $value);
 
-                if ($formattedValue instanceof DateTimeInterface) {
+                if ($formattedValue instanceof \DateTimeInterface) {
                     $worksheet->setCellValue($row, Date::PHPToExcel($formattedValue));
 
-                    if ($formattedValue->format('His') === '000000') {
+                    if ('000000' === $formattedValue->format('His')) {
                         $worksheet->getStyle($row)
                             ->getNumberFormat()
                             ->setFormatCode(NumberFormat::FORMAT_DATE_DDMMYYYY);
@@ -191,7 +177,7 @@ class SpreadsheetListFormatter implements FormatterInterface
             case 'xlsx':
                 $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Xlsx');
                 $contentType = 'application/vnd.openxmlformats-officedocument.'
-                    . 'spreadsheetml.sheet';
+                    .'spreadsheetml.sheet';
 
                 break;
 
@@ -204,22 +190,21 @@ class SpreadsheetListFormatter implements FormatterInterface
             default:
                 // this should not happen
                 // throw an exception to ensure that the error is catched
-                throw new OutOfBoundsException('The format ' . $this->formatterData['format'] .
-                    ' is not supported');
+                throw new \OutOfBoundsException('The format '.$this->formatterData['format'].' is not supported');
         }
 
         $response = new Response();
         $response->headers->set('content-type', $contentType);
 
-        $tempfile = tempnam(sys_get_temp_dir(), '');
+        $tempfile = \tempnam(\sys_get_temp_dir(), '');
         $writer->save($tempfile);
 
-        $f = fopen($tempfile, 'rb');
-        $response->setContent(stream_get_contents($f));
+        $f = \fopen($tempfile, 'rb');
+        $response->setContent(\stream_get_contents($f));
         fclose($f);
 
         // remove the temp file from disk
-        unlink($tempfile);
+        \unlink($tempfile);
 
         return $response;
     }
@@ -235,9 +220,9 @@ class SpreadsheetListFormatter implements FormatterInterface
      * @param string $key
      * @param string $value
      *
-     * @throws LogicException if the label is not found
-     *
      * @return string
+     *
+     * @throws \LogicException if the label is not found
      */
     protected function getLabel($key, $value)
     {
@@ -245,15 +230,8 @@ class SpreadsheetListFormatter implements FormatterInterface
             $this->prepareCacheLabels();
         }
 
-        if (!array_key_exists($key, $this->labelsCache)) {
-            throw new OutOfBoundsException(sprintf(
-                'The key "%s" '
-                . 'is not present in the list of keys handled by '
-                . 'this query. Check your `getKeys` and `getLabels` '
-                . 'methods. Available keys are %s.',
-                $key,
-                implode(', ', array_keys($this->labelsCache))
-            ));
+        if (!\array_key_exists($key, $this->labelsCache)) {
+            throw new \OutOfBoundsException(sprintf('The key "%s" is not present in the list of keys handled by this query. Check your `getKeys` and `getLabels` methods. Available keys are %s.', $key, \implode(', ', \array_keys($this->labelsCache))));
         }
 
         return $this->labelsCache[$key]($value);
@@ -270,9 +248,9 @@ class SpreadsheetListFormatter implements FormatterInterface
 
         foreach ($keys as $key) {
             // get an array with all values for this key if possible
-            $values = array_map(static function ($v) use ($key) {
-                if (!array_key_exists($key, $v)) {
-                    throw new RuntimeException(sprintf('This key does not exists: %s. Available keys are %s', $key, implode(', ', array_keys($v))));
+            $values = \array_map(static function ($v) use ($key) {
+                if (!\array_key_exists($key, $v)) {
+                    throw new \RuntimeException(sprintf('This key does not exists: %s. Available keys are %s', $key, \implode(', ', \array_keys($v))));
                 }
 
                 return $v[$key];
@@ -289,7 +267,7 @@ class SpreadsheetListFormatter implements FormatterInterface
     {
         $keys = $this->exportManager->getExport($this->exportAlias)->getQueryKeys($this->exportData);
         // we want to keep the order of the first row. So we will iterate on the first row of the results
-        $first_row = count($this->result) > 0 ? $this->result[0] : [];
+        $first_row = \count($this->result) > 0 ? $this->result[0] : [];
         $header_line = [];
 
         if (true === $this->formatterData['numerotation']) {
@@ -302,7 +280,7 @@ class SpreadsheetListFormatter implements FormatterInterface
             );
         }
 
-        if (count($header_line) > 0) {
+        if (\count($header_line) > 0) {
             $worksheet->fromArray($header_line, null, 'A1');
         }
     }
diff --git a/src/Bundle/ChillMainBundle/Export/FormatterInterface.php b/src/Bundle/ChillMainBundle/Export/FormatterInterface.php
index e939c47f2..11316ea4b 100644
--- a/src/Bundle/ChillMainBundle/Export/FormatterInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/FormatterInterface.php
@@ -25,8 +25,8 @@ interface FormatterInterface
      *
      * @uses appendAggregatorForm
      *
-     * @param string $exportAlias Alias of the export which is being executed. An export gets the data and implements the \Chill\MainBundle\Export\ExportInterface
-     * @param Array(String) $aggregatorAliases Array of the aliases of the aggregators. An aggregator do the "group by" on the data. $aggregatorAliases
+     * @param string        $exportAlias       Alias of the export which is being executed. An export gets the data and implements the \Chill\MainBundle\Export\ExportInterface
+     * @param array<string> $aggregatorAliases Array of the aliases of the aggregators. An aggregator do the "group by" on the data. $aggregatorAliases
      */
     public function buildForm(
         FormBuilderInterface $builder,
@@ -35,7 +35,7 @@ interface FormatterInterface
     );
 
     /**
-     * get the default data for the form build by buildForm
+     * get the default data for the form build by buildForm.
      */
     public function getFormDefaultData(array $aggregatorAliases): array;
 
@@ -44,11 +44,11 @@ interface FormatterInterface
     /**
      * Generate a response from the data collected on differents ExportElementInterface.
      *
-     * @param mixed[] $result The result, as given by the ExportInterface
-     * @param mixed[] $formatterData collected from the current form
-     * @param string $exportAlias the id of the current export
-     * @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
-     * @param array $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
+     * @param mixed[] $result          The result, as given by the ExportInterface
+     * @param mixed[] $formatterData   collected from the current form
+     * @param string  $exportAlias     the id of the current export
+     * @param array   $filtersData     an array containing the filters data. The key are the filters id, and the value are the data
+     * @param array   $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
      *
      * @return \Symfony\Component\HttpFoundation\Response The response to be shown
      */
diff --git a/src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php b/src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php
index b721bcd98..0fad30b4f 100644
--- a/src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php
+++ b/src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php
@@ -11,9 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Export\Helper;
 
-use DateTime;
-use DateTimeInterface;
-use Exception;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class DateTimeHelper
@@ -31,23 +28,22 @@ class DateTimeHelper
                 return '';
             }
 
-            if ($value instanceof DateTimeInterface) {
+            if ($value instanceof \DateTimeInterface) {
                 return $value;
             }
 
             // warning: won't work with DateTimeImmutable as we reset time a few lines later
-            $date = DateTime::createFromFormat('Y-m-d', $value);
+            $date = \DateTime::createFromFormat('Y-m-d', $value);
             $hasTime = false;
 
             if (false === $date) {
-                $date = DateTime::createFromFormat('Y-m-d H:i:s', $value);
+                $date = \DateTime::createFromFormat('Y-m-d H:i:s', $value);
                 $hasTime = true;
             }
 
             // check that the creation could occurs.
             if (false === $date) {
-                throw new Exception(sprintf('The value %s could '
-                    . 'not be converted to %s', $value, DateTime::class));
+                throw new \Exception(sprintf('The value %s could not be converted to %s', $value, \DateTime::class));
             }
 
             if (!$hasTime) {
diff --git a/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php b/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php
index a3e4bae86..9161316e7 100644
--- a/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php
+++ b/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php
@@ -18,11 +18,6 @@ use Chill\MainBundle\Repository\GeographicalUnitLayerRepositoryInterface;
 use Chill\MainBundle\Templating\Entity\AddressRender;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
-use function array_key_exists;
-use function count;
-use function in_array;
-use function strlen;
 
 /**
  * Helps to load addresses and format them in list.
@@ -116,8 +111,8 @@ class ExportAddressHelper
                         case 'postcode_code':
                             $postCodeAlias = sprintf('%spostcode_t', $prefix);
 
-                            if (!in_array($postCodeAlias, $queryBuilder->getAllAliases(), true)) {
-                                $queryBuilder->leftJoin($entityName . '.postcode', $postCodeAlias);
+                            if (!\in_array($postCodeAlias, $queryBuilder->getAllAliases(), true)) {
+                                $queryBuilder->leftJoin($entityName.'.postcode', $postCodeAlias);
                             }
 
                             if ('postcode_name' === $field) {
@@ -134,7 +129,7 @@ class ExportAddressHelper
 
                             $countryAlias = sprintf('%scountry_t', $prefix);
 
-                            if (!in_array($countryAlias, $queryBuilder->getAllAliases(), true)) {
+                            if (!\in_array($countryAlias, $queryBuilder->getAllAliases(), true)) {
                                 $queryBuilder->leftJoin(sprintf('%s.country', $postCodeAlias), $countryAlias);
                             }
 
@@ -211,7 +206,7 @@ class ExportAddressHelper
                             break;
 
                         default:
-                            throw new LogicException(sprintf('This key is not supported: %s, field %s', $key, $field));
+                            throw new \LogicException(sprintf('This key is not supported: %s, field %s', $key, $field));
                     }
                 }
             }
@@ -239,7 +234,7 @@ class ExportAddressHelper
                 $prefixes = array_merge(
                     $prefixes,
                     array_map(
-                        static fn ($item) => $prefix . $item,
+                        static fn ($item) => $prefix.$item,
                         self::COLUMN_MAPPING[$key]
                     )
                 );
@@ -251,7 +246,7 @@ class ExportAddressHelper
 
     public function getLabel($key, array $values, $data, string $prefix = '', string $translationPrefix = 'export.address_helper.'): callable
     {
-        $sanitizedKey = substr((string) $key, strlen($prefix));
+        $sanitizedKey = substr((string) $key, \strlen($prefix));
 
         switch ($sanitizedKey) {
             case 'id':
@@ -270,7 +265,7 @@ class ExportAddressHelper
             case 'postcode_name':
                 return static function ($value) use ($sanitizedKey, $translationPrefix) {
                     if ('_header' === $value) {
-                        return $translationPrefix . $sanitizedKey;
+                        return $translationPrefix.$sanitizedKey;
                     }
 
                     if (null === $value) {
@@ -283,7 +278,7 @@ class ExportAddressHelper
             case 'country':
                 return function ($value) use ($sanitizedKey, $translationPrefix) {
                     if ('_header' === $value) {
-                        return $translationPrefix . $sanitizedKey;
+                        return $translationPrefix.$sanitizedKey;
                     }
 
                     if (null === $value) {
@@ -297,7 +292,7 @@ class ExportAddressHelper
             case 'confidential':
                 return static function ($value) use ($sanitizedKey, $translationPrefix) {
                     if ('_header' === $value) {
-                        return $translationPrefix . $sanitizedKey;
+                        return $translationPrefix.$sanitizedKey;
                     }
 
                     switch ($value) {
@@ -311,14 +306,14 @@ class ExportAddressHelper
                             return 0;
 
                         default:
-                            throw new LogicException('this value is not supported for ' . $sanitizedKey . ': ' . $value);
+                            throw new \LogicException('this value is not supported for '.$sanitizedKey.': '.$value);
                     }
                 };
 
             case '_as_string':
                 return function ($value) use ($sanitizedKey, $translationPrefix) {
                     if ('_header' === $value) {
-                        return $translationPrefix . $sanitizedKey;
+                        return $translationPrefix.$sanitizedKey;
                     }
 
                     if (null === $value) {
@@ -333,7 +328,7 @@ class ExportAddressHelper
             default:
                 $layerNamesKeys = [...$this->generateKeysForUnitsNames($prefix), ...$this->generateKeysForUnitsRefs($prefix)];
 
-                if (array_key_exists($key, $layerNamesKeys)) {
+                if (\array_key_exists($key, $layerNamesKeys)) {
                     return function ($value) use ($key, $layerNamesKeys) {
                         if ('_header' === $value) {
                             $header = $this->translatableStringHelper->localize($layerNamesKeys[$key]->getName());
@@ -351,7 +346,7 @@ class ExportAddressHelper
 
                         $decodedValues = json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
 
-                        return match (count($decodedValues)) {
+                        return match (\count($decodedValues)) {
                             0 => '',
                             1 => $decodedValues[0],
                             default => implode('|', $decodedValues),
@@ -359,7 +354,7 @@ class ExportAddressHelper
                     };
                 }
 
-                throw new LogicException('this key is not supported: ' . $sanitizedKey);
+                throw new \LogicException('this key is not supported: '.$sanitizedKey);
         }
     }
 
@@ -368,14 +363,14 @@ class ExportAddressHelper
      */
     private function generateKeysForUnitsNames(string $prefix): array
     {
-        if (array_key_exists($prefix, $this->unitNamesKeysCache)) {
+        if (\array_key_exists($prefix, $this->unitNamesKeysCache)) {
             return $this->unitNamesKeysCache[$prefix];
         }
 
         $keys = [];
 
         foreach ($this->geographicalUnitLayerRepository->findAllHavingUnits() as $layer) {
-            $keys[$prefix . 'unit_names_' . $layer->getId()] = $layer;
+            $keys[$prefix.'unit_names_'.$layer->getId()] = $layer;
         }
 
         return $this->unitNamesKeysCache[$prefix] = $keys;
@@ -386,14 +381,14 @@ class ExportAddressHelper
      */
     private function generateKeysForUnitsRefs(string $prefix): array
     {
-        if (array_key_exists($prefix, $this->unitRefsKeysCache)) {
+        if (\array_key_exists($prefix, $this->unitRefsKeysCache)) {
             return $this->unitRefsKeysCache[$prefix];
         }
 
         $keys = [];
 
         foreach ($this->geographicalUnitLayerRepository->findAllHavingUnits() as $layer) {
-            $keys[$prefix . 'unit_refs_' . $layer->getId()] = $layer;
+            $keys[$prefix.'unit_refs_'.$layer->getId()] = $layer;
         }
 
         return $this->unitRefsKeysCache[$prefix] = $keys;
diff --git a/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php b/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php
index 44c2f260f..46e19c2d1 100644
--- a/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php
+++ b/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php
@@ -13,23 +13,21 @@ namespace Chill\MainBundle\Export\Helper;
 
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Templating\Entity\UserRender;
-use function count;
-use const SORT_NUMERIC;
 
 class UserHelper
 {
     public function __construct(private readonly UserRender $userRender, private readonly UserRepositoryInterface $userRepository) {}
 
     /**
-     * Return a callable that will transform a value into a string representing a user
+     * Return a callable that will transform a value into a string representing a user.
      *
      * The callable may receive as argument:
      *
      * - an int or a string, the id of the user;
      * - a string containing a json which will be decoded, and will have this structure: array{uid: int, d: string}. The job and scopes will be shown at this date
      *
-     * @param string $key the key of the content
-     * @param array $values the list of values
+     * @param string $key    the key of the content
+     * @param array  $values the list of values
      * @param string $header the header's content
      */
     public function getLabel($key, array $values, string $header): callable
@@ -66,17 +64,15 @@ class UserHelper
     }
 
     /**
-     * Return a callable that will transform a value into a string representing a user
+     * Return a callable that will transform a value into a string representing a user.
      *
      *  The callable may receive as argument:
      *
      *  - an int or a string, the id of the user;
-     *  - a string containing a json which will be decoded, and will have this structure: array{uid: int, d: string}. The job and scopes will be shown at this date     * @param $key
      *
-     * @param string $key the key of the element
-     * @param array $values a list of values
+     * @param string $key    the key of the element
+     * @param array  $values a list of values
      * @param string $header the header's content
-     * @return callable
      */
     public function getLabelMulti($key, array $values, string $header): callable
     {
@@ -91,7 +87,7 @@ class UserHelper
 
             $decoded = json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
 
-            if (0 === count($decoded)) {
+            if (0 === \count($decoded)) {
                 return '';
             }
             $asStrings = [];
diff --git a/src/Bundle/ChillMainBundle/Export/ModifierInterface.php b/src/Bundle/ChillMainBundle/Export/ModifierInterface.php
index 50cb17e09..d3ec9de83 100644
--- a/src/Bundle/ChillMainBundle/Export/ModifierInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ModifierInterface.php
@@ -34,8 +34,8 @@ interface ModifierInterface extends ExportElementInterface
      * Alter the query initiated by the export, to add the required statements
      * (`GROUP BY`, `SELECT`, `WHERE`).
      *
-     * @param QueryBuilder $qb the QueryBuilder initiated by the Export (and eventually modified by other Modifiers)
-     * @param mixed[] $data the data from the Form (builded by buildForm)
+     * @param QueryBuilder $qb   the QueryBuilder initiated by the Export (and eventually modified by other Modifiers)
+     * @param mixed[]      $data the data from the Form (builded by buildForm)
      */
     public function alterQuery(QueryBuilder $qb, $data);
 
diff --git a/src/Bundle/ChillMainBundle/Form/CenterType.php b/src/Bundle/ChillMainBundle/Form/CenterType.php
index 864d0a877..62b018f11 100644
--- a/src/Bundle/ChillMainBundle/Form/CenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/CenterType.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Center;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
diff --git a/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php b/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
index 174fb3304..2bc89f97d 100644
--- a/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
+++ b/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
@@ -16,8 +16,6 @@ use Chill\MainBundle\Repository\PostalCodeRepository;
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 
-use function call_user_func;
-
 /**
  * Class PostalCodeChoiceLoader.
  */
@@ -48,7 +46,7 @@ class PostalCodeChoiceLoader implements ChoiceLoaderInterface
     {
         return new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
             $this->lazyLoadedPostalCodes,
-            static fn (?PostalCode $pc = null) => call_user_func($value, $pc)
+            static fn (PostalCode $pc = null) => \call_user_func($value, $pc)
         );
     }
 
@@ -88,7 +86,7 @@ class PostalCodeChoiceLoader implements ChoiceLoaderInterface
                 continue;
             }
 
-            $id = call_user_func($value, $choice);
+            $id = \call_user_func($value, $choice);
             $values[] = $id;
             $this->lazyLoadedPostalCodes[$id] = $choice;
         }
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
index ca9c8452e..c88e2275b 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Form\DataMapper;
 
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\PostalCode;
-use Iterator;
 use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\Form\FormInterface;
@@ -26,8 +25,8 @@ use Symfony\Component\Form\FormInterface;
 class AddressDataMapper implements DataMapperInterface
 {
     /**
-     * @param Address $address
-     * @param Iterator $forms
+     * @param Address   $address
+     * @param \Iterator $forms
      */
     public function mapDataToForms($address, $forms)
     {
@@ -40,16 +39,16 @@ class AddressDataMapper implements DataMapperInterface
         }
 
         foreach ($forms as $key => $form) {
-            /** @var FormInterface $form */
+            /* @var FormInterface $form */
             switch ($key) {
                 case 'streetAddress1':
-                    /** @phpstan-ignore-next-line  */
+                    /* @phpstan-ignore-next-line */
                     $form->setData($address->getStreetAddress1());
 
                     break;
 
                 case 'streetAddress2':
-                    /** @phpstan-ignore-next-line  */
+                    /* @phpstan-ignore-next-line */
                     $form->setData($address->getStreetAddress2());
 
                     break;
@@ -76,8 +75,8 @@ class AddressDataMapper implements DataMapperInterface
     }
 
     /**
-     * @param Iterator $forms
-     * @param Address $address
+     * @param \Iterator $forms
+     * @param Address   $address
      */
     public function mapFormsToData($forms, &$address)
     {
@@ -94,7 +93,7 @@ class AddressDataMapper implements DataMapperInterface
         }
 
         foreach ($forms as $key => $form) {
-            /** @var FormInterface $form */
+            /* @var FormInterface $form */
             switch ($key) {
                 case 'postCode':
                     if (!$form->getData() instanceof PostalCode && !$isNoAddress) {
@@ -112,13 +111,13 @@ class AddressDataMapper implements DataMapperInterface
 
                         return;
                     }
-                    /** @phpstan-ignore-next-line  */
+                    /* @phpstan-ignore-next-line */
                     $address->setStreetAddress1($form->getData());
 
                     break;
 
                 case 'streetAddress2':
-                    /** @phpstan-ignore-next-line  */
+                    /* @phpstan-ignore-next-line */
                     $address->setStreetAddress2($form->getData());
 
                     break;
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
index d4dc4719d..73d048c1a 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
@@ -11,14 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form\DataMapper;
 
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Regroupment;
-use Chill\MainBundle\Repository\RegroupmentRepository;
-use Exception;
 use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\FormInterface;
-use function array_key_exists;
-use function count;
 
 final readonly class ExportPickCenterDataMapper implements DataMapperInterface
 {
@@ -47,7 +42,7 @@ final readonly class ExportPickCenterDataMapper implements DataMapperInterface
             $centers[spl_object_hash($center)] = $center;
         }
 
-        if (array_key_exists('regroupment', $forms)) {
+        if (\array_key_exists('regroupment', $forms)) {
             /** @var Regroupment $regroupment */
             foreach ($forms['regroupment']->getData() as $regroupment) {
                 foreach ($regroupment->getCenters() as $center) {
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/RollingDateDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/RollingDateDataMapper.php
index 909b671b8..7628d6aa3 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/RollingDateDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/RollingDateDataMapper.php
@@ -38,7 +38,7 @@ class RollingDateDataMapper implements DataMapperInterface
         $forms = iterator_to_array($forms);
 
         $viewData = new RollingDate(
-            ($forms['roll']->getData() ?? RollingDate::T_TODAY),
+            $forms['roll']->getData() ?? RollingDate::T_TODAY,
             $forms['fixedDate']->getData()
         );
     }
diff --git a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
index fa76a8dd9..3532c3d9e 100644
--- a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
@@ -18,26 +18,24 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form\DataTransformer;
 
-use Closure;
 use Doctrine\Persistence\ObjectRepository;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
-use function call_user_func;
 
 /**
  * @template T
  */
 class IdToEntityDataTransformer implements DataTransformerInterface
 {
-    private readonly Closure $getId;
+    private readonly \Closure $getId;
 
     /**
-     * @param Closure $getId
+     * @param \Closure $getId
      */
     public function __construct(
         private readonly ObjectRepository $repository,
         private readonly bool $multiple = false,
-        ?callable $getId = null
+        callable $getId = null
     ) {
         $this->getId = $getId ?? static fn (object $o) => $o->getId();
     }
@@ -82,7 +80,7 @@ class IdToEntityDataTransformer implements DataTransformerInterface
             $ids = [];
 
             foreach ($value as $v) {
-                $ids[] = $id = call_user_func($this->getId, $v);
+                $ids[] = $id = \call_user_func($this->getId, $v);
 
                 if (null === $id) {
                     throw new TransformationFailedException('id is null');
@@ -96,7 +94,7 @@ class IdToEntityDataTransformer implements DataTransformerInterface
             return '';
         }
 
-        $id = call_user_func($this->getId, $value);
+        $id = \call_user_func($this->getId, $value);
 
         if (null === $id) {
             throw new TransformationFailedException('id is null');
diff --git a/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php b/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
index 1ff8b2647..bd9f897e1 100644
--- a/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
+++ b/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
@@ -18,10 +18,6 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-use function array_combine;
-use function array_merge;
-use function count;
-
 class PermissionsGroupType extends AbstractType
 {
     final public const FLAG_SCOPE = 'permissions_group';
@@ -43,10 +39,10 @@ class PermissionsGroupType extends AbstractType
 
         $flags = $this->getFlags();
 
-        if (count($flags) > 0) {
+        if (\count($flags) > 0) {
             $builder
                 ->add('flags', ChoiceType::class, [
-                    'choices' => array_combine($flags, $flags),
+                    'choices' => \array_combine($flags, $flags),
                     'multiple' => true,
                     'expanded' => true,
                     'required' => false,
@@ -77,7 +73,7 @@ class PermissionsGroupType extends AbstractType
         $flags = [];
 
         foreach ($this->flagProviders as $flagProvider) {
-            $flags = array_merge($flags, $flagProvider->getPermissionsGroupFlags());
+            $flags = \array_merge($flags, $flagProvider->getPermissionsGroupFlags());
         }
 
         return $flags;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/CommentType.php b/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
index 542a429c6..2b1d2f3e0 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use DateTime;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
@@ -47,7 +46,7 @@ class CommentType extends AbstractType
             $comment = $event->getData() ?? ['comment' => ''];
 
             if (null !== $data && $data->getComment() !== $comment['comment']) {
-                $data->setDate(new DateTime());
+                $data->setDate(new \DateTime());
                 $data->setUserId($this->user->getId());
                 $event->getForm()->setData($data);
             }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
index ee18e7771..6b87ed6ef 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
@@ -20,8 +20,6 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-use function in_array;
-
 /**
  * Form to Edit/create a role scope. If the role scope does not
  * exists in the database, he is generated.
@@ -55,7 +53,7 @@ class ComposedRoleScopeType extends AbstractType
         $translatableStringHelper = $this->translatableStringHelper;
         $rolesWithoutScopes = $this->rolesWithoutScope;
 
-        //build roles
+        // build roles
         $values = [];
 
         foreach ($this->roles as $role) {
@@ -67,7 +65,7 @@ class ComposedRoleScopeType extends AbstractType
                 'choices' => array_combine(array_values($values), array_keys($values)),
                 'placeholder' => 'Choose amongst roles',
                 'choice_attr' => static function ($role) use ($rolesWithoutScopes) {
-                    if (in_array($role, $rolesWithoutScopes, true)) {
+                    if (\in_array($role, $rolesWithoutScopes, true)) {
                         return ['data-has-scope' => '0'];
                     }
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
index a34aadfb5..d328d38f0 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
@@ -17,9 +17,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
-use Traversable;
-
-use function count;
 
 class CenterTransformer implements DataTransformerInterface
 {
@@ -47,11 +44,8 @@ class CenterTransformer implements DataTransformerInterface
             ->centerRepository
             ->findBy(['id' => $ids]);
 
-        if ([] === $centers || count($ids) > count($centers)) {
-            throw new TransformationFailedException(sprintf(
-                'No center found for one of those ids: %s',
-                implode(',', $ids)
-            ));
+        if ([] === $centers || \count($ids) > \count($centers)) {
+            throw new TransformationFailedException(sprintf('No center found for one of those ids: %s', implode(',', $ids)));
         }
 
         if ($this->multiple) {
@@ -69,7 +63,7 @@ class CenterTransformer implements DataTransformerInterface
 
         if ($this->multiple) {
             if (!is_iterable($center)) {
-                throw new UnexpectedTypeException($center, Traversable::class);
+                throw new UnexpectedTypeException($center, \Traversable::class);
             }
             $ids = [];
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
index 8cfd1e38b..7bc447f29 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form\Type\DataTransformer;
 
-use DateInterval;
-use Exception;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
@@ -25,16 +23,12 @@ class DateIntervalTransformer implements DataTransformerInterface
             return null;
         }
 
-        $string = 'P' . $value['n'] . $value['unit'];
+        $string = 'P'.$value['n'].$value['unit'];
 
         try {
-            return new DateInterval($string);
-        } catch (Exception $e) {
-            throw new TransformationFailedException(
-                'Could not transform value into DateInterval',
-                1542,
-                $e
-            );
+            return new \DateInterval($string);
+        } catch (\Exception $e) {
+            throw new TransformationFailedException('Could not transform value into DateInterval', 1542, $e);
         }
     }
 
@@ -44,13 +38,13 @@ class DateIntervalTransformer implements DataTransformerInterface
             return null;
         }
 
-        if (!$value instanceof DateInterval) {
-            throw new UnexpectedTypeException($value, DateInterval::class);
+        if (!$value instanceof \DateInterval) {
+            throw new UnexpectedTypeException($value, \DateInterval::class);
         }
 
         if (0 < $value->d) {
             // we check for weeks (weeks are converted to 7 days)
-            if ($value->d % 7 === 0) {
+            if (0 === $value->d % 7) {
                 return [
                     'n' => $value->d / 7,
                     'unit' => 'W',
@@ -77,8 +71,6 @@ class DateIntervalTransformer implements DataTransformerInterface
             ];
         }
 
-        throw new TransformationFailedException(
-            'The date interval does not contains any days, months or years.'
-        );
+        throw new TransformationFailedException('The date interval does not contains any days, months or years.');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
index ba4995a6f..d193ea2ef 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
@@ -19,9 +19,6 @@ use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
-use UnexpectedValueException;
-
-use function array_key_exists;
 
 class EntityToJsonTransformer implements DataTransformerInterface
 {
@@ -29,7 +26,7 @@ class EntityToJsonTransformer implements DataTransformerInterface
 
     public function reverseTransform($value)
     {
-        if ("" === $value) {
+        if ('' === $value) {
             return null;
         }
 
@@ -65,11 +62,11 @@ class EntityToJsonTransformer implements DataTransformerInterface
 
     private function denormalizeOne(array $item)
     {
-        if (!array_key_exists('type', $item)) {
+        if (!\array_key_exists('type', $item)) {
             throw new TransformationFailedException('the key "type" is missing on element');
         }
 
-        if (!array_key_exists('id', $item)) {
+        if (!\array_key_exists('id', $item)) {
             throw new TransformationFailedException('the key "id" is missing on element');
         }
 
@@ -77,7 +74,7 @@ class EntityToJsonTransformer implements DataTransformerInterface
             'user' => User::class,
             'person' => Person::class,
             'thirdparty' => ThirdParty::class,
-            default => throw new UnexpectedValueException('This type is not supported'),
+            default => throw new \UnexpectedValueException('This type is not supported'),
         };
 
         return
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
index 6c7fefcf5..808093278 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
@@ -21,8 +21,6 @@ class MultipleObjectsToIdTransformer implements DataTransformerInterface
 
     /**
      * Transforms a string (id) to an object (item).
-     *
-     * @param mixed $array
      */
     public function reverseTransform($array)
     {
@@ -49,7 +47,7 @@ class MultipleObjectsToIdTransformer implements DataTransformerInterface
         $ret = [];
 
         foreach ($array as $el) {
-            $ret[] = ($el->getId());
+            $ret[] = $el->getId();
         }
 
         return $ret;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
index a4181a4d2..e56778bf2 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
@@ -22,9 +22,9 @@ class ObjectToIdTransformer implements DataTransformerInterface
     /**
      * Transforms a string (id) to an object.
      *
-     * @param  string $id
+     * @param string $id
      *
-     * @throws TransformationFailedException if object is not found.
+     * @throws TransformationFailedException if object is not found
      */
     public function reverseTransform($id): ?object
     {
@@ -46,8 +46,6 @@ class ObjectToIdTransformer implements DataTransformerInterface
     /**
      * Transforms an object to a string (id).
      *
-     * @param mixed $object
-     *
      * @return string
      */
     public function transform($object)
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/PostalCodeToIdTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/PostalCodeToIdTransformer.php
index 91e4c6cf9..dde8b7b9e 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/PostalCodeToIdTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/PostalCodeToIdTransformer.php
@@ -15,8 +15,6 @@ use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Repository\PostalCodeRepositoryInterface;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
-use function gettype;
-use function is_int;
 
 class PostalCodeToIdTransformer implements DataTransformerInterface
 {
@@ -28,8 +26,8 @@ class PostalCodeToIdTransformer implements DataTransformerInterface
             return null;
         }
 
-        if (!is_int((int) $value)) {
-            throw new TransformationFailedException('Cannot transform ' . gettype($value));
+        if (!\is_int((int) $value)) {
+            throw new TransformationFailedException('Cannot transform '.\gettype($value));
         }
 
         return $this->postalCodeRepository->find((int) $value);
@@ -45,6 +43,6 @@ class PostalCodeToIdTransformer implements DataTransformerInterface
             return $value->getId();
         }
 
-        throw new TransformationFailedException('Could not reverseTransform ' . gettype($value));
+        throw new TransformationFailedException('Could not reverseTransform '.\gettype($value));
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php
index b6bea8c28..2779f2cdd 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php
@@ -32,8 +32,7 @@ class ScopeTransformer implements DataTransformerInterface
             ->find($id);
 
         if (null === $scope) {
-            throw new TransformationFailedException(sprintf('The scope with id '
-                    . "'%d' were not found", $id));
+            throw new TransformationFailedException(sprintf('The scope with id '."'%d' were not found", $id));
         }
 
         return $scope;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php b/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php
index c25b2b324..7a70e7ca6 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php
@@ -20,12 +20,6 @@ use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\GreaterThan;
 
-use function array_diff;
-use function array_values;
-use function count;
-use function implode;
-use function is_array;
-
 /**
  * Show a dateInterval type.
  *
@@ -86,21 +80,17 @@ class DateIntervalType extends AbstractType
                 'Years' => 'Y',
             ])
             ->setAllowedValues('unit_choices', static function ($values) {
-                if (false === is_array($values)) {
+                if (false === \is_array($values)) {
                     throw new InvalidOptionsException('The value `unit_choice` should be an array');
                 }
 
-                $diff = array_diff(array_values($values), ['D', 'W', 'M', 'Y']);
+                $diff = \array_diff(\array_values($values), ['D', 'W', 'M', 'Y']);
 
-                if (count($diff) === 0) {
+                if (0 === \count($diff)) {
                     return true;
                 }
 
-                throw new InvalidOptionsException(sprintf(
-                    'The values of the '
-                        . "units should be 'D', 'W', 'M', 'Y', those are invalid: %s",
-                    implode(', ', $diff)
-                ));
+                throw new InvalidOptionsException(sprintf('The values of the '."units should be 'D', 'W', 'M', 'Y', those are invalid: %s", \implode(', ', $diff)));
             });
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
index cf47d528b..324b5d8d7 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
@@ -49,14 +49,14 @@ class ExportType extends AbstractType
         ];
 
         // add a contraint if required by export
-        $exportBuilder = $builder->create(self::EXPORT_KEY/*, FormType::class, $exportOptions*/);
+        $exportBuilder = $builder->create(self::EXPORT_KEY/* , FormType::class, $exportOptions */);
 
         $export->buildForm($exportBuilder);
 
         $builder->add($exportBuilder, null, $exportOptions);
 
         if ($export instanceof \Chill\MainBundle\Export\ExportInterface) {
-            //add filters
+            // add filters
             $filters = $this->exportManager->getFiltersApplyingOn($export, $options['picked_centers']);
             $filterBuilder = $builder->create(self::FILTER_KEY, FormType::class, ['compound' => true]);
 
@@ -73,7 +73,7 @@ class ExportType extends AbstractType
 
             $builder->add($filterBuilder);
 
-            //add aggregators
+            // add aggregators
             $aggregators = $this->exportManager
                 ->getAggregatorsApplyingOn($export, $options['picked_centers']);
             $aggregatorBuilder = $builder->create(
@@ -115,7 +115,7 @@ class ExportType extends AbstractType
             ->setAllowedTypes('export_alias', ['string'])
             ->setDefault('compound', true)
             ->setDefault('constraints', [
-                //new \Chill\MainBundle\Validator\Constraints\Export\ExportElementConstraint()
+                // new \Chill\MainBundle\Validator\Constraints\Export\ExportElementConstraint()
             ]);
     }
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index 36d82fffd..a093dda44 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -17,15 +17,10 @@ use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Form\DataMapper\ExportPickCenterDataMapper;
 use Chill\MainBundle\Repository\RegroupmentRepository;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-
-use Symfony\Component\Security\Core\User\UserInterface;
-use function count;
 
 /**
  * Pick centers amongst available centers for the user.
@@ -61,7 +56,7 @@ final class PickCenterType extends AbstractType
             'choice_label' => static fn (Center $c) => $c->getName(),
         ]);
 
-        if (count($this->regroupmentRepository->findAllActive()) > 0) {
+        if (\count($this->regroupmentRepository->findAllActive()) > 0) {
             $builder->add('regroupment', EntityType::class, [
                 'class' => Regroupment::class,
                 'label' => 'regroupment',
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php
index b3253ec42..8a2883657 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php
@@ -35,7 +35,7 @@ class PickFormatterType extends AbstractType
         $allowedFormatters = $this->exportManager
             ->getFormattersByTypes($export->getAllowedFormattersTypes());
 
-        //build choices
+        // build choices
         $choices = [];
 
         foreach ($allowedFormatters as $alias => $formatter) {
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
index b0d80176b..5873c0a45 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
@@ -17,16 +17,10 @@ use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SearchType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-use function array_combine;
-use function array_map;
-use function count;
 
 final class FilterOrderType extends \Symfony\Component\Form\AbstractType
 {
@@ -41,7 +35,7 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
                 'required' => false,
                 'attr' => [
                     'placeholder' => 'filter_order.Search',
-                ]
+                ],
             ]);
         }
 
@@ -57,7 +51,7 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
             ]);
         }
 
-        if (0 < count($helper->getCheckboxes())) {
+        if (0 < \count($helper->getCheckboxes())) {
             $builder->add($checkboxesBuilder);
         }
 
@@ -80,7 +74,7 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
             $builder->add($entityChoicesBuilder);
         }
 
-        if (0 < count($helper->getDateRanges())) {
+        if (0 < \count($helper->getDateRanges())) {
             $dateRangesBuilder = $builder->create('dateRanges', null, ['compound' => true]);
 
             foreach ($helper->getDateRanges() as $name => $opts) {
@@ -139,8 +133,8 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
 
     public static function buildCheckboxChoices(array $choices, array $trans = []): array
     {
-        return array_combine(
-            array_map(static function ($c, $t) {
+        return \array_combine(
+            \array_map(static function ($c, $t) {
                 if (null !== $t) {
                     return $t;
                 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php b/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php
index 35c921246..190e09f30 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php
@@ -21,8 +21,6 @@ use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function uniqid;
-
 /**
  * Form type for picking an address.
  *
@@ -52,7 +50,7 @@ final class PickAddressType extends AbstractType
 
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars['uniqid'] = $view->vars['attr']['data-input-address'] = uniqid('input_address_');
+        $view->vars['uniqid'] = $view->vars['attr']['data-input-address'] = \uniqid('input_address_');
         $view->vars['attr']['data-use-valid-from'] = (int) $options['use_valid_from'];
         $view->vars['attr']['data-use-valid-to'] = (int) $options['use_valid_to'];
         $view->vars['attr']['data-button-text-create'] = $this->translator->trans($options['button_text_create']);
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
index 91bc8b2ab..ba6cc874d 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer;
 use Chill\MainBundle\Repository\CenterRepository;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
-use RuntimeException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
@@ -25,9 +24,6 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Security;
-
-use function array_merge;
-use function array_values;
 use function count;
 
 /**
@@ -49,7 +45,7 @@ class PickCenterType extends AbstractType
 
         $centersActive = array_filter($centers, fn (Center $c) => $c->getIsActive());
 
-        if (count($centers) <= 1) {
+        if (\count($centers) <= 1) {
             $multiple = $options['choice_options']['multiple'] ?? false;
             $builder->add('center', HiddenType::class);
             $builder->get('center')->addModelTransformer(
@@ -59,7 +55,7 @@ class PickCenterType extends AbstractType
             $builder->add(
                 'center',
                 EntityType::class,
-                array_merge(
+                \array_merge(
                     $options['choice_options'],
                     [
                         'class' => Center::class,
@@ -84,7 +80,7 @@ class PickCenterType extends AbstractType
 
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars['is_hidden'] = count($this->getReachableCenters(
+        $view->vars['is_hidden'] = \count($this->getReachableCenters(
             $options['role'],
             $options['scopes']
         )) <= 1;
@@ -95,9 +91,9 @@ class PickCenterType extends AbstractType
      *
      * Return a 'choice' field if more than one center is available.
      *
-     * @throws RuntimeException if the user is not associated with any center
-     *
      * @return string
+     *
+     * @throws \RuntimeException if the user is not associated with any center
      */
     /*
     public function getParent()
@@ -134,7 +130,7 @@ class PickCenterType extends AbstractType
 
     private function getReachableCenters(string $role, iterable $scopes): array
     {
-        if (0 < count($scopes)) {
+        if (0 < \count($scopes)) {
             $centers = [];
 
             foreach ($scopes as $scope) {
@@ -146,7 +142,7 @@ class PickCenterType extends AbstractType
                 }
             }
 
-            return array_values($centers);
+            return \array_values($centers);
         }
 
         return $this->authorizationHelper
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickRollingDateType.php b/src/Bundle/ChillMainBundle/Form/Type/PickRollingDateType.php
index b60401a46..c23e0fa81 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickRollingDateType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickRollingDateType.php
@@ -29,7 +29,7 @@ class PickRollingDateType extends AbstractType
         $builder
             ->add('roll', ChoiceType::class, [
                 'choices' => array_combine(
-                    array_map(static fn (string $item) => 'rolling_date.' . $item, RollingDate::ALL_T),
+                    array_map(static fn (string $item) => 'rolling_date.'.$item, RollingDate::ALL_T),
                     RollingDate::ALL_T
                 ),
                 'multiple' => false,
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php
index 03b80b6d7..9d1cdb626 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php
@@ -29,7 +29,7 @@ class PickUserLocationType extends AbstractType
                 'class' => Location::class,
                 'choices' => $this->locationRepository->findByPublicLocations(),
                 'choice_label' => fn (Location $entity) => $entity->getName() ?
-                    $entity->getName() . ' (' . $this->translatableStringHelper->localize($entity->getLocationType()->getTitle()) . ')' :
+                    $entity->getName().' ('.$this->translatableStringHelper->localize($entity->getLocationType()->getTitle()).')' :
                     $this->translatableStringHelper->localize($entity->getLocationType()->getTitle()),
                 'placeholder' => 'Pick a location',
                 'required' => false,
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php b/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
index 51a321be6..b02d069f5 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
@@ -77,8 +77,8 @@ class PostalCodeType extends AbstractType
         $helper = $this->translatableStringHelper;
         $resolver
             ->setDefault('class', PostalCode::class)
-            ->setDefault('choice_label', static fn (PostalCode $code) => $code->getCode() . ' ' . $code->getName() . ' [' .
-                  $helper->localize($code->getCountry()->getName()) . ']')
+            ->setDefault('choice_label', static fn (PostalCode $code) => $code->getCode().' '.$code->getName().' ['.
+                  $helper->localize($code->getCountry()->getName()).']')
             ->setDefault('choice_loader', $this->choiceLoader)
             ->setDefault('placeholder', 'Select a postal code');
     }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
index a35e113c1..0d26b5a95 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
@@ -13,14 +13,11 @@ namespace Chill\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Form\DataMapper\PrivateCommentDataMapper;
-
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
 
 class PrivateCommentType extends AbstractType
 {
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
index edc723603..68ae84549 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\DataMapper\ScopePickerDataMapper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use RuntimeException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
@@ -27,9 +26,7 @@ use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Role\Role;
-
 use Symfony\Component\Security\Core\Security;
-use function count;
 
 /**
  * Allow to pick amongst available scope for the current
@@ -57,11 +54,11 @@ class ScopePickerType extends AbstractType
             )
         );
 
-        if (0 === count($items)) {
-            throw new RuntimeException('no scopes are reachable. This form should not be shown to user');
+        if (0 === \count($items)) {
+            throw new \RuntimeException('no scopes are reachable. This form should not be shown to user');
         }
 
-        if (1 !== count($items)) {
+        if (1 !== \count($items)) {
             $builder->add('scope', EntityType::class, [
                 'class' => Scope::class,
                 'placeholder' => 'Choose the circle',
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
index b3ef2337b..39648c11a 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
@@ -21,9 +21,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-use const SORT_FLAG_CASE;
-use const SORT_STRING;
-
 /**
  * Extends choice to allow adding select2 library on widget.
  */
@@ -56,7 +53,7 @@ class Select2CountryType extends AbstractType
             }
         }
 
-        asort($choices, SORT_STRING | SORT_FLAG_CASE);
+        asort($choices, \SORT_STRING | \SORT_FLAG_CASE);
 
         $resolver->setDefaults([
             'class' => \Chill\MainBundle\Entity\Country::class,
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
index 07f7c13c5..bc25ac638 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
@@ -21,9 +21,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-use const SORT_FLAG_CASE;
-use const SORT_STRING;
-
 /**
  * Extends choice to allow adding select2 library on widget for languages (multiple).
  */
@@ -52,7 +49,7 @@ class Select2LanguageType extends AbstractType
             $preferredChoices[$l] = $choices[$l];
         }
 
-        asort($choices, SORT_STRING | SORT_FLAG_CASE);
+        asort($choices, \SORT_STRING | \SORT_FLAG_CASE);
 
         $resolver->setDefaults([
             'class' => \Chill\MainBundle\Entity\Language::class,
diff --git a/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php b/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
index a0223b823..6945d28fb 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
@@ -20,8 +20,6 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Translation\Translator;
 
-use function in_array;
-
 class TranslatableStringFormType extends AbstractType
 {
     // The langauges availaible
@@ -39,11 +37,11 @@ class TranslatableStringFormType extends AbstractType
             $builder->add(
                 $lang,
                 TextType::class,
-                ['required' => (in_array(
+                ['required' => \in_array(
                     $lang,
                     $this->frameworkTranslatorFallback,
                     true
-                ))]
+                )]
             );
         }
     }
diff --git a/src/Bundle/ChillMainBundle/Form/UserPasswordType.php b/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
index 4fd1a6157..8a5dc01fd 100644
--- a/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
@@ -67,8 +67,8 @@ class UserPasswordType extends AbstractType
                     new Regex([
                         'pattern' => "/((?=.*\\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%!,;:+\"'-\\/{}~=µ\\(\\)£]).{6,})/",
                         'message' => 'The password must contains one letter, one '
-                        . 'capitalized letter, one number and one special character '
-                        . "as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed.",
+                        .'capitalized letter, one number and one special character '
+                        ."as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed.",
                     ]),
                 ],
             ])
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index 53f2949fc..cb5e05c13 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -88,7 +88,7 @@ class UserType extends AbstractType
                 'required' => false,
                 'placeholder' => 'choose a location',
                 'class' => Location::class,
-                'choice_label' => fn (Location $l) => $this->translatableStringHelper->localize($l->getLocationType()->getTitle()) . ' - ' . $l->getName(),
+                'choice_label' => fn (Location $l) => $this->translatableStringHelper->localize($l->getLocationType()->getTitle()).' - '.$l->getName(),
                 'query_builder' => static function (EntityRepository $er) {
                     $qb = $er->createQueryBuilder('l');
                     $qb->orderBy('l.locationType');
@@ -126,8 +126,8 @@ class UserType extends AbstractType
                     new Regex([
                         'pattern' => "/((?=.*\\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%!,;:+\"'-\\/{}~=µ\\(\\)£]).{6,})/",
                         'message' => 'The password must contains one letter, one '
-                        . 'capitalized letter, one number and one special character '
-                        . "as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed.",
+                        .'capitalized letter, one number and one special character '
+                        ."as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed.",
                     ]),
                 ],
             ]);
diff --git a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
index 2891a490d..208af8522 100644
--- a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
+++ b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\MainBundle\Workflow\EntityWorkflowManager;
-use LogicException;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -32,7 +31,6 @@ use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Transition;
-use function array_key_exists;
 
 class WorkflowStepType extends AbstractType
 {
@@ -49,7 +47,7 @@ class WorkflowStepType extends AbstractType
 
         if (true === $options['transition']) {
             if (null === $options['entity_workflow']) {
-                throw new LogicException('if transition is true, entity_workflow should be defined');
+                throw new \LogicException('if transition is true, entity_workflow should be defined');
             }
 
             $transitions = $this->registry
@@ -64,7 +62,7 @@ class WorkflowStepType extends AbstractType
                 $transitions
             );
 
-            if (array_key_exists('validationFilterInputLabels', $placeMetadata)) {
+            if (\array_key_exists('validationFilterInputLabels', $placeMetadata)) {
                 $inputLabels = $placeMetadata['validationFilterInputLabels'];
 
                 $builder->add('transitionFilter', ChoiceType::class, [
@@ -96,7 +94,7 @@ class WorkflowStepType extends AbstractType
                     'choice_label' => function (Transition $transition) use ($workflow) {
                         $meta = $workflow->getMetadataStore()->getTransitionMetadata($transition);
 
-                        if (array_key_exists('label', $meta)) {
+                        if (\array_key_exists('label', $meta)) {
                             return $this->translatableStringHelper->localize($meta['label']);
                         }
 
@@ -108,7 +106,7 @@ class WorkflowStepType extends AbstractType
 
                         $metadata = $workflow->getMetadataStore()->getTransitionMetadata($transition);
 
-                        if (array_key_exists('isForward', $metadata)) {
+                        if (\array_key_exists('isForward', $metadata)) {
                             if ($metadata['isForward']) {
                                 $isForward = 'forward';
                             } else {
@@ -120,7 +118,7 @@ class WorkflowStepType extends AbstractType
                             $meta = $workflow->getMetadataStore()->getPlaceMetadata($to);
 
                             if (
-                                !array_key_exists('isFinal', $meta) || false === $meta['isFinal']
+                                !\array_key_exists('isFinal', $meta) || false === $meta['isFinal']
                             ) {
                                 $toFinal = false;
                             }
@@ -209,7 +207,7 @@ class WorkflowStepType extends AbstractType
                                 $meta = $workflow->getMetadataStore()->getPlaceMetadata($to);
 
                                 if (
-                                    !array_key_exists('isFinal', $meta) || false === $meta['isFinal']
+                                    !\array_key_exists('isFinal', $meta) || false === $meta['isFinal']
                                 ) {
                                     $toFinal = false;
                                 }
@@ -239,7 +237,7 @@ class WorkflowStepType extends AbstractType
                             }
                         }
                     }
-                )
+                ),
             ]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php b/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php
index 7ea80b931..1b4c2d7df 100644
--- a/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php
+++ b/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php
@@ -16,9 +16,7 @@ use Chill\MainBundle\Entity\NotificationComment;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\NotificationRepository;
 use Chill\MainBundle\Templating\UI\NotificationCounterInterface;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PostPersistEventArgs;
-use Doctrine\ORM\Event\PostUpdateEventArgs;
 use Doctrine\ORM\Event\PreFlushEventArgs;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -59,7 +57,7 @@ final readonly class NotificationByUserCounter implements NotificationCounterInt
 
     public static function generateCacheKeyUnreadNotificationByUser(User $user): string
     {
-        return 'chill_main_notif_unread_by_' . $user->getId();
+        return 'chill_main_notif_unread_by_'.$user->getId();
     }
 
     public function onEditNotificationComment(NotificationComment $notificationComment, PostPersistEventArgs $eventArgs): void
diff --git a/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php b/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
index 01995a44a..7b535f1a7 100644
--- a/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
+++ b/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Notification\Email;
 
 use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\NotificationComment;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PostPersistEventArgs;
 use Doctrine\ORM\Event\PostUpdateEventArgs;
 use Psr\Log\LoggerInterface;
@@ -46,7 +45,7 @@ class NotificationMailer
             $email = new TemplatedEmail();
             $email
                 ->to($dest->getEmail())
-                ->subject('Re: ' . $comment->getNotification()->getTitle())
+                ->subject('Re: '.$comment->getNotification()->getTitle())
                 ->textTemplate('@ChillMain/Notification/email_notification_comment_persist.fr.md.twig')
                 ->context([
                     'comment' => $comment,
diff --git a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php
index aa00a9e8c..74c784b4b 100644
--- a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Notification\NotificationPersisterInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\TerminateEvent;
-use function count;
 
 class PersistNotificationOnTerminateEventSubscriber implements EventSubscriberInterface
 {
@@ -39,7 +38,7 @@ class PersistNotificationOnTerminateEventSubscriber implements EventSubscriberIn
 
     private function persistNotifications(): void
     {
-        if (0 < count($this->persister->getWaitingNotifications())) {
+        if (0 < \count($this->persister->getWaitingNotifications())) {
             foreach ($this->persister->getWaitingNotifications() as $notification) {
                 $this->em->persist($notification);
             }
diff --git a/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php b/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php
index 3063d190e..b1acff57b 100644
--- a/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php
+++ b/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php
@@ -11,6 +11,4 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Notification\Exception;
 
-use RuntimeException;
-
-class NotificationHandlerNotFound extends RuntimeException {}
+class NotificationHandlerNotFound extends \RuntimeException {}
diff --git a/src/Bundle/ChillMainBundle/Notification/Mailer.php b/src/Bundle/ChillMainBundle/Notification/Mailer.php
index a57f74722..5dacbc6fa 100644
--- a/src/Bundle/ChillMainBundle/Notification/Mailer.php
+++ b/src/Bundle/ChillMainBundle/Notification/Mailer.php
@@ -13,17 +13,12 @@ namespace Chill\MainBundle\Notification;
 
 use Chill\MainBundle\Entity\User;
 use Psr\Log\LoggerInterface;
-use Swift_Mailer;
-use Swift_Message;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Mime\Email;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Environment;
 
-use function call_user_func;
-
 /**
  * Class Mailer
  * Classe d'aide pour l'envoi de notification.
@@ -37,19 +32,16 @@ class Mailer
     /**
      * Mailer constructor.
      *
-     * @param $routeParameters
      * @param mixed[] $routeParameters
      */
-    public function __construct(private readonly MailerInterface $mailer, private readonly LoggerInterface $logger, private readonly \Twig\Environment $twig, private readonly RouterInterface $router, private readonly TranslatorInterface $translator, protected $routeParameters) {}
+    public function __construct(private readonly MailerInterface $mailer, private readonly LoggerInterface $logger, private readonly Environment $twig, private readonly RouterInterface $router, private readonly TranslatorInterface $translator, protected $routeParameters) {}
 
     /**
-     * @param $template
+     * @return string
      *
      * @throws \Twig\Error\LoaderError
      * @throws \Twig\Error\RuntimeError
      * @throws \Twig\Error\SyntaxError
-     *
-     * @return string
      */
     public function renderContentToUser(User $to, $template, array $parameters = [])
     {
@@ -72,15 +64,15 @@ class Mailer
     /**
      * Envoie une notification à un utilisateur.
      *
-     * @param array $subject Subject of the message [ 0 => $message (required), 1 => $parameters (optional), 3 => $domain (optional) ]
-     * @param array $bodies The bodies. An array where keys are the contentType and values the bodies
+     * @param array    $subject  Subject of the message [ 0 => $message (required), 1 => $parameters (optional), 3 => $domain (optional) ]
+     * @param array    $bodies   The bodies. An array where keys are the contentType and values the bodies
      * @param callable $callback a callback to customize the message (add attachment, etc.)
      */
     public function sendNotification(
         mixed $recipient,
         array $subject,
         array $bodies,
-        ?callable $callback = null,
+        callable $callback = null,
         mixed $force = false
     ) {
         $fromEmail = $this->routeParameters['from_email'];
@@ -104,12 +96,12 @@ class Mailer
         }
 
         if (null !== $callback) {
-            call_user_func($callback, $email);
+            \call_user_func($callback, $email);
         }
 
         $this->logger->info('[notification] Sending notification', [
             'to' => $email->getTo(),
-            'subject' => $email->getSubject()
+            'subject' => $email->getSubject(),
         ]);
 
         $this->mailer->send($email);
diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php b/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php
index c64812a71..5c5cb3dcf 100644
--- a/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php
+++ b/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\NotificationRepository;
 use Symfony\Component\Security\Core\Security;
-use function array_key_exists;
 
 /**
  * Helps to find if a notification exist for a given entity.
@@ -28,11 +27,12 @@ class NotificationPresence
 
     /**
      * @param list<array{relatedEntityClass: class-string, relatedEntityId: int}> $more
+     *
      * @return array{unread: int, sent: int, total: int}
      */
     public function countNotificationsForClassAndEntity(string $relatedEntityClass, int $relatedEntityId, array $more = [], array $options = []): array
     {
-        if ([] === $more && array_key_exists($relatedEntityClass, $this->cache) && array_key_exists($relatedEntityId, $this->cache[$relatedEntityClass])) {
+        if ([] === $more && \array_key_exists($relatedEntityClass, $this->cache) && \array_key_exists($relatedEntityId, $this->cache[$relatedEntityClass])) {
             return $this->cache[$relatedEntityClass][$relatedEntityId];
         }
 
@@ -58,6 +58,7 @@ class NotificationPresence
 
     /**
      * @param list<array{relatedEntityClass: class-string, relatedEntityId: int}> $more
+     *
      * @return array|Notification[]
      */
     public function getNotificationsForClassAndEntity(string $relatedEntityClass, int $relatedEntityId, array $more = []): array
diff --git a/src/Bundle/ChillMainBundle/Pagination/Page.php b/src/Bundle/ChillMainBundle/Pagination/Page.php
index 597d3d2e5..9858a27b8 100644
--- a/src/Bundle/ChillMainBundle/Pagination/Page.php
+++ b/src/Bundle/ChillMainBundle/Pagination/Page.php
@@ -30,7 +30,6 @@ class Page implements PageInterface
         protected int $number,
         /**
          * the number of item per page.
-         *
          */
         protected int $itemPerPage,
         UrlGeneratorInterface $urlGenerator,
diff --git a/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php b/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
index 30b0d6ef3..4c9cb68fe 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
@@ -11,12 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Pagination;
 
-use Iterator;
-
 /**
  * PageGenerator associated with a Paginator.
  */
-class PageGenerator implements Iterator
+class PageGenerator implements \Iterator
 {
     protected int $current = 1;
 
diff --git a/src/Bundle/ChillMainBundle/Pagination/Paginator.php b/src/Bundle/ChillMainBundle/Pagination/Paginator.php
index ecfd4d509..a809bc9f4 100644
--- a/src/Bundle/ChillMainBundle/Pagination/Paginator.php
+++ b/src/Bundle/ChillMainBundle/Pagination/Paginator.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Pagination;
 
-use RuntimeException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
@@ -100,28 +99,21 @@ class Paginator implements PaginatorInterface
     }
 
     /**
-     * @throws RuntimeException if the next page does not exists
-     *
-     * @return \Chill\MainBundle\Pagination\Page
+     * @throws \RuntimeException if the next page does not exists
      */
     public function getNextPage(): Page
     {
         if (!$this->hasNextPage()) {
-            throw new RuntimeException('this page has no next page');
+            throw new \RuntimeException('this page has no next page');
         }
 
         return $this->getPage($this->currentPageNumber + 1);
     }
 
-    /**
-     *
-     * @return \Chill\MainBundle\Pagination\Page
-     */
     public function getPage(int $number): Page
     {
         if (!$this->hasPage($number)) {
-            throw new RuntimeException("The page with number {$number} does not "
-                  . 'exists');
+            throw new \RuntimeException("The page with number {$number} does not ".'exists');
         }
 
         return new Page(
@@ -145,14 +137,14 @@ class Paginator implements PaginatorInterface
     }
 
     /**
-     * @throws RuntimeException if the next page does not exists
-     *
      * @return \Chill\MainBundle\Pagination\Page
+     *
+     * @throws \RuntimeException if the next page does not exists
      */
     public function getPreviousPage(): PageInterface
     {
         if (!$this->hasPreviousPage()) {
-            throw new RuntimeException('this page has no previous page');
+            throw new \RuntimeException('this page has no previous page');
         }
 
         return $this->getPage($this->currentPageNumber - 1);
@@ -163,9 +155,6 @@ class Paginator implements PaginatorInterface
         return $this->totalItems;
     }
 
-    /**
-     * @return bool
-     */
     public function hasNextPage(): bool
     {
         return $this->hasPage($this->currentPageNumber + 1);
@@ -181,9 +170,6 @@ class Paginator implements PaginatorInterface
               && $this->countPages() >= $number;
     }
 
-    /**
-     * @return bool
-     */
     public function hasPreviousPage(): bool
     {
         return $this->hasPage($this->currentPageNumber - 1);
diff --git a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
index ebdb458c8..4bf651280 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
@@ -50,16 +50,16 @@ class PaginatorFactory
      * The default route and route parameters are the current ones. If set,
      * thos route are overriden.
      *
-     * @param int $totalItems
-     * @param string|null $route the specific route to use in pages
-     * @param array|null $routeParameters the specific route parameters to use in pages
+     * @param int         $totalItems
+     * @param string|null $route           the specific route to use in pages
+     * @param array|null  $routeParameters the specific route parameters to use in pages
      *
      * @return PaginatorInterface
      */
     public function create(
         $totalItems,
-        ?string $route = null,
-        ?array $routeParameters = null
+        string $route = null,
+        array $routeParameters = null
     ) {
         return new Paginator(
             $totalItems,
diff --git a/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php b/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php
index cbdc12e6b..4af13b916 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Pagination;
 
-use Countable;
 use Generator;
-use RuntimeException;
 
 /**
  * Represent a set of numbered pages.
@@ -25,26 +23,20 @@ use RuntimeException;
  *
  * The first page number is 1, although the first result number is 0.
  */
-interface PaginatorInterface extends Countable
+interface PaginatorInterface extends \Countable
 {
     /**
      * get the number of pages for this pagination.
-     *
-     * @return int
      */
     public function countPages(): int;
 
     /**
      * get the current page.
-     *
-     * @return PageInterface
      */
     public function getCurrentPage(): PageInterface;
 
     /**
      * get the first result for the current page.
-     *
-     * @return int
      */
     public function getCurrentPageFirstItemNumber(): int;
 
@@ -56,71 +48,53 @@ interface PaginatorInterface extends Countable
     /**
      * get the next page.
      *
-     * @throws RuntimeException if the pagination has not next page
-     *
-     * @return PageInterface
+     * @throws \RuntimeException if the pagination has not next page
      */
     public function getNextPage(): PageInterface;
 
     /**
      * get page by his number.
      *
-     * @param int $number
-     *
-     * @throws RuntimeException if the pagination has no page with specified number
+     * @throws \RuntimeException if the pagination has no page with specified number
      */
     public function getPage(int $number): PageInterface;
 
     /**
      * get a generator to generate pages.
      *
-     * @return Generator which return PageInterface elements
+     * @return \Generator which return PageInterface elements
      */
     public function getPagesGenerator(): iterable;
 
     /**
      * get the previous page.
      *
-     * @throws RuntimeException if the pagination has not previous page
-     *
-     * @return PageInterface
+     * @throws \RuntimeException if the pagination has not previous page
      */
     public function getPreviousPage(): PageInterface;
 
     /**
      * get the number of results for this paginator.
-     *
-     * @return int
      */
     public function getTotalItems(): int;
 
     /**
      * check if the current page has a next page.
-     *
-     * @return bool
      */
     public function hasNextPage(): bool;
 
     /**
      * check if the page with the given number exists.
-     *
-     * @param mixed $number
      */
     public function hasPage($number): bool;
 
     /**
      * check if the current page has a page before.
-     *
-     * @return bool
      */
     public function hasPreviousPage(): bool;
 
     /**
      * check if the given page is the current page.
-     *
-     * @param \Chill\MainBundle\Pagination\PageInterface $page
-     *
-     * @return bool
      */
     public function isCurrentPage(PageInterface $page): bool;
 
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php b/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
index c7cf1ddfd..bd3eeffe5 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
@@ -22,7 +22,7 @@ use libphonenumber\PhoneNumber;
  */
 interface PhoneNumberHelperInterface
 {
-    public function format(?PhoneNumber $phoneNumber = null): string;
+    public function format(PhoneNumber $phoneNumber = null): string;
 
     /**
      * Get type (mobile, landline, ...) for phone number.
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
index bb2e354ee..462f379cf 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
@@ -23,12 +23,6 @@ use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
-use function array_key_exists;
-use function in_array;
-use function json_decode;
-use function preg_replace;
-use function strlen;
-
 final class PhonenumberHelper implements PhoneNumberHelperInterface
 {
     public const FORMAT_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s';
@@ -51,12 +45,12 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
         $this->config = $config = $parameterBag->get('chill_main.phone_helper');
 
         if (
-            array_key_exists('twilio_sid', $config)
+            \array_key_exists('twilio_sid', $config)
             && !empty($config['twilio_sid'])
-            && strlen((string) $config['twilio_sid']) > 2
-            && array_key_exists('twilio_secret', $config)
+            && \strlen((string) $config['twilio_sid']) > 2
+            && \array_key_exists('twilio_secret', $config)
             && !empty($config['twilio_secret'])
-            && strlen((string) $config['twilio_secret']) > 2
+            && \strlen((string) $config['twilio_secret']) > 2
         ) {
             $this->twilioClient = new Client([
                 'auth' => [$config['twilio_sid'], $config['twilio_secret']],
@@ -72,7 +66,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      *
      * @throws NumberParseException
      */
-    public function format(?PhoneNumber $phoneNumber = null): string
+    public function format(PhoneNumber $phoneNumber = null): string
     {
         if (null === $phoneNumber) {
             return '';
@@ -119,7 +113,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             return false;
         }
 
-        return in_array($validation, ['landline', 'voip', 'mobile'], true);
+        return \in_array($validation, ['landline', 'voip', 'mobile'], true);
     }
 
     /**
@@ -140,7 +134,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             return true;
         }
 
-        return in_array($validation, ['landline', 'voip'], true);
+        return \in_array($validation, ['landline', 'voip'], true);
     }
 
     /**
@@ -175,16 +169,16 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
         }
 
         // filter only number
-        $filtered = preg_replace('/[^0-9]/', '', (string) $phonenumber);
+        $filtered = \preg_replace('/[^0-9]/', '', (string) $phonenumber);
 
-        $item = $this->cachePool->getItem('pnum_' . $filtered);
+        $item = $this->cachePool->getItem('pnum_'.$filtered);
 
         if ($item->isHit()) {
             return $item->get();
         }
 
         try {
-            $response = $this->twilioClient->get(sprintf(self::LOOKUP_URI, '+' . $filtered), [
+            $response = $this->twilioClient->get(sprintf(self::LOOKUP_URI, '+'.$filtered), [
                 'http_errors' => true,
                 'query' => [
                     'Type' => 'carrier',
@@ -195,7 +189,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
         } catch (ServerException $e) {
             $response = $e->getResponse();
             $this->logger->error('[phonenumber helper] Could not perform validation '
-                . 'due to server error', [
+                .'due to server error', [
                     'message' => $response->getBody()->getContents(),
                     'status_code' => $response->getStatusCode(),
                     'phonenumber' => $phonenumber,
@@ -204,7 +198,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             return null;
         } catch (ConnectException $e) {
             $this->logger->error('[phonenumber helper] Could not format number '
-                . 'due to connect error', [
+                .'due to connect error', [
                     'message' => $e->getMessage(),
                     'phonenumber' => $phonenumber,
                 ]);
@@ -212,7 +206,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             return null;
         }
 
-        $validation = json_decode($response->getBody()->getContents(), null, 512, JSON_THROW_ON_ERROR)->carrier->type;
+        $validation = \json_decode($response->getBody()->getContents(), null, 512, JSON_THROW_ON_ERROR)->carrier->type;
 
         $item
             ->set($validation)
diff --git a/src/Bundle/ChillMainBundle/Redis/ChillRedis.php b/src/Bundle/ChillMainBundle/Redis/ChillRedis.php
index b3a8570d8..b9e454b46 100644
--- a/src/Bundle/ChillMainBundle/Redis/ChillRedis.php
+++ b/src/Bundle/ChillMainBundle/Redis/ChillRedis.php
@@ -16,4 +16,4 @@ use Redis;
 /**
  * Redis client configured by chill main.
  */
-class ChillRedis extends Redis {}
+class ChillRedis extends \Redis {}
diff --git a/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php b/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php
index fdf81d441..d41f9225f 100644
--- a/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php
+++ b/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Redis;
 
-use RuntimeException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 final class RedisConnectionFactory implements EventSubscriberInterface
@@ -37,7 +36,7 @@ final class RedisConnectionFactory implements EventSubscriberInterface
         $result = $this->redis->connect($this->host, $this->port, $this->timeout);
 
         if (false === $result) {
-            throw new RuntimeException('Could not connect to redis instance');
+            throw new \RuntimeException('Could not connect to redis instance');
         }
 
         return $this->redis;
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
index 8cb4b2084..d029226d0 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
@@ -19,12 +19,6 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Doctrine\Persistence\ObjectRepository;
-use RuntimeException;
-
-use function explode;
-use function implode;
-use function strtr;
-use function trim;
 
 final class AddressReferenceRepository implements ObjectRepository
 {
@@ -77,7 +71,7 @@ final class AddressReferenceRepository implements ObjectRepository
      *
      * @return AddressReference[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -94,11 +88,11 @@ final class AddressReferenceRepository implements ObjectRepository
             $rsm->addRootEntityFromClassMetadata(AddressReference::class, 'cma');
             $query->addSelectClause($rsm->generateSelectClause());
         } else {
-            throw new RuntimeException('not implemented');
+            throw new \RuntimeException('not implemented');
         }
 
-        $sql = strtr(
-            $query->buildQuery() . 'ORDER BY pertinence DESC, lpad(streetnumber, 10, \'0\') ASC OFFSET ? LIMIT ? ',
+        $sql = \strtr(
+            $query->buildQuery().'ORDER BY pertinence DESC, lpad(streetnumber, 10, \'0\') ASC OFFSET ? LIMIT ? ',
             // little hack for adding sql method to point
             ['cma.point AS point' => 'ST_AsGeojson(cma.point) AS point']
         );
@@ -109,7 +103,7 @@ final class AddressReferenceRepository implements ObjectRepository
             ->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?AddressReference
+    public function findOneBy(array $criteria, array $orderBy = null): ?AddressReference
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
@@ -121,10 +115,10 @@ final class AddressReferenceRepository implements ObjectRepository
 
     private function buildQueryByPostalCodePattern(PostalCode $postalCode, string $pattern): SearchApiQuery
     {
-        $pattern = trim($pattern);
+        $pattern = \trim($pattern);
 
         if ('' === $pattern) {
-            throw new RuntimeException('the search pattern must not be empty');
+            throw new \RuntimeException('the search pattern must not be empty');
         }
         $query = new SearchApiQuery();
 
@@ -138,8 +132,8 @@ final class AddressReferenceRepository implements ObjectRepository
         $andWhere = [];
         $andWhereArgs = [];
 
-        foreach (explode(' ', $pattern) as $part) {
-            $part = trim($part);
+        foreach (\explode(' ', $pattern) as $part) {
+            $part = \trim($part);
 
             if ('' === $part) {
                 continue;
@@ -154,8 +148,8 @@ final class AddressReferenceRepository implements ObjectRepository
             array_push($pertinenceArgs, $part, $part);
         }
         $query
-            ->setSelectPertinence(implode(' + ', $pertinenceClause), $pertinenceArgs)
-            ->andWhereClause(implode(' AND ', $andWhere), $andWhereArgs);
+            ->setSelectPertinence(\implode(' + ', $pertinenceClause), $pertinenceArgs)
+            ->andWhereClause(\implode(' AND ', $andWhere), $andWhereArgs);
 
         return $query;
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
index 074b1fc32..eee1d5b1f 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
@@ -26,7 +26,7 @@ final class AddressRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(Address::class);
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -50,12 +50,12 @@ final class AddressRepository implements ObjectRepository
      *
      * @return Address[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Address
+    public function findOneBy(array $criteria, array $orderBy = null): ?Address
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/CenterRepository.php b/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
index 0b507faa1..46e87cb10 100644
--- a/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
@@ -51,12 +51,12 @@ final class CenterRepository implements CenterRepositoryInterface
      *
      * @return Center[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Center
+    public function findOneBy(array $criteria, array $orderBy = null): ?Center
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php b/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
index 982d3dd4c..9ed4cbf01 100644
--- a/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
@@ -34,7 +34,7 @@ class CivilityRepository implements CivilityRepositoryInterface
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/CivilityRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/CivilityRepositoryInterface.php
index 5d687ac7e..f838b54e8 100644
--- a/src/Bundle/ChillMainBundle/Repository/CivilityRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/CivilityRepositoryInterface.php
@@ -26,7 +26,7 @@ interface CivilityRepositoryInterface extends ObjectRepository
     /**
      * @return array|Civility[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?Civility;
 
diff --git a/src/Bundle/ChillMainBundle/Repository/CountryRepository.php b/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
index 701019dba..000ecb4e1 100644
--- a/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
@@ -26,7 +26,7 @@ final class CountryRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(Country::class);
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -50,12 +50,12 @@ final class CountryRepository implements ObjectRepository
      *
      * @return Country[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Country
+    public function findOneBy(array $criteria, array $orderBy = null): ?Country
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepository.php b/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepository.php
index 1f369ef4e..8fa4ea8f6 100644
--- a/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepository.php
@@ -40,7 +40,7 @@ class CronJobExecutionRepository implements CronJobExecutionRepositoryInterface
     /**
      * @return array|CronJobExecution[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepositoryInterface.php
index df894bbfb..cef997edd 100644
--- a/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepositoryInterface.php
@@ -26,7 +26,7 @@ interface CronJobExecutionRepositoryInterface extends ObjectRepository
     /**
      * @return array|CronJobExecution[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?CronJobExecution;
 
diff --git a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php
index 11a03c209..88d92a7dc 100644
--- a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php
@@ -49,7 +49,7 @@ final class GeographicalUnitLayerLayerRepository implements GeographicalUnitLaye
     /**
      * @return array|GeographicalUnitLayer[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
index a59ac9a8c..2bb22b842 100644
--- a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
@@ -27,7 +27,6 @@ final class GeographicalUnitRepository implements GeographicalUnitRepositoryInte
         $this->repository = $em->getRepository($this->getClassName());
     }
 
-
     public function countGeographicalUnitContainingAddress(Address $address): int
     {
         $qb = $this->buildQueryGeographicalUnitContainingAddress($address);
@@ -45,7 +44,7 @@ final class GeographicalUnitRepository implements GeographicalUnitRepositoryInte
         return $qb
             ->select(sprintf('NEW %s(gu.id, gu.unitName, gu.unitRefId, IDENTITY(gu.layer))', GeographicalUnit\SimpleGeographicalUnitDTO::class))
             ->addOrderBy('IDENTITY(gu.layer)')
-            ->addOrderBy(('gu.unitName'))
+            ->addOrderBy('gu.unitName')
             ->getQuery()
             ->setFirstResult($offset)
             ->setMaxResults($limit)
@@ -57,6 +56,7 @@ final class GeographicalUnitRepository implements GeographicalUnitRepositoryInte
         $qb = $this->repository
             ->createQueryBuilder('gu')
         ;
+
         return $qb
             ->select(sprintf('NEW %s(gu.id, gu.unitName, gu.unitRefId, IDENTITY(gu.layer))', GeographicalUnit\SimpleGeographicalUnitDTO::class))
             ->innerJoin(Address::class, 'address', Join::WITH, 'ST_CONTAINS(gu.geom, address.point) = TRUE')
@@ -81,12 +81,12 @@ final class GeographicalUnitRepository implements GeographicalUnitRepositoryInte
             ->createQueryBuilder('gu')
             ->select(sprintf('NEW %s(gu.id, gu.unitName, gu.unitRefId, IDENTITY(gu.layer))', GeographicalUnit\SimpleGeographicalUnitDTO::class))
             ->addOrderBy('IDENTITY(gu.layer)')
-            ->addOrderBy(('gu.unitName'))
+            ->addOrderBy('gu.unitName')
             ->getQuery()
             ->getResult();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): ?GeographicalUnit
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): ?GeographicalUnit
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepositoryInterface.php
index f2c102407..b00b0cd98 100644
--- a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepositoryInterface.php
@@ -18,13 +18,10 @@ use Doctrine\Persistence\ObjectRepository;
 interface GeographicalUnitRepositoryInterface extends ObjectRepository
 {
     /**
-     * Return the geographical units as @link{SimpleGeographicalUnitDTO} whithin the address is contained.
+     * Return the geographical units as @see{SimpleGeographicalUnitDTO} whithin the address is contained.
      *
      * This query is executed in real time (without the refresh of the materialized view which load the addresses).
      *
-     * @param Address $address
-     * @param int $offset
-     * @param int $limit
      * @return SimpleGeographicalUnitDTO[]
      */
     public function findGeographicalUnitContainingAddress(Address $address, int $offset = 0, int $limit = 50): array;
diff --git a/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php b/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
index 2d9ad8c5a..a07087369 100644
--- a/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
@@ -44,12 +44,12 @@ final class GroupCenterRepository implements ObjectRepository
      *
      * @return GroupCenter[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?GroupCenter
+    public function findOneBy(array $criteria, array $orderBy = null): ?GroupCenter
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php b/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
index d8c5d54f8..1bbf2c168 100644
--- a/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
@@ -43,12 +43,12 @@ final class LanguageRepository implements LanguageRepositoryInterface
      *
      * @return Language[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Language
+    public function findOneBy(array $criteria, array $orderBy = null): ?Language
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/LanguageRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/LanguageRepositoryInterface.php
index 397b264e4..ab110fc24 100644
--- a/src/Bundle/ChillMainBundle/Repository/LanguageRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/LanguageRepositoryInterface.php
@@ -29,9 +29,9 @@ interface LanguageRepositoryInterface extends ObjectRepository
      *
      * @return Language[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array;
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Language;
+    public function findOneBy(array $criteria, array $orderBy = null): ?Language;
 
     public function getClassName(): string;
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
index 84e5f0c25..bc26981b2 100644
--- a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
@@ -35,7 +35,6 @@ final class NotificationRepository implements ObjectRepository
                 FROM chill_main_notification cmn
     SQL;
 
-
     public function __construct(private readonly EntityManagerInterface $em)
     {
         $this->repository = $em->getRepository(Notification::class);
@@ -59,6 +58,7 @@ final class NotificationRepository implements ObjectRepository
 
     /**
      * @param list<array{relatedEntityClass: class-string, relatedEntityId: int}> $more
+     *
      * @return array{unread: int, sent: int, total: int}
      */
     public function countNotificationByRelatedEntityAndUserAssociated(string $relatedEntityClass, int $relatedEntityId, User $user, array $more = []): array
@@ -67,7 +67,7 @@ final class NotificationRepository implements ObjectRepository
 
         if ([] === $more) {
             if (null === $this->notificationByRelatedEntityAndUserAssociatedStatement) {
-                $sql = self::BASE_COUNTER_SQL . ' WHERE relatedentityclass = :relatedEntityClass AND relatedentityid = :relatedEntityId AND sender_id IS NOT NULL';
+                $sql = self::BASE_COUNTER_SQL.' WHERE relatedentityclass = :relatedEntityClass AND relatedentityid = :relatedEntityId AND sender_id IS NOT NULL';
 
                 $this->notificationByRelatedEntityAndUserAssociatedStatement =
                     $this->em->getConnection()->prepare($sql);
@@ -83,14 +83,14 @@ final class NotificationRepository implements ObjectRepository
             $wheres = [];
             foreach ([
                 ['relatedEntityClass' => $relatedEntityClass, 'relatedEntityId' => $relatedEntityId],
-                ...$more
+                ...$more,
             ] as $k => ['relatedEntityClass' => $relClass, 'relatedEntityId' => $relId]) {
                 $wheres[] = "(relatedEntityClass = :relatedEntityClass_{$k} AND relatedEntityId = :relatedEntityId_{$k})";
                 $sqlParams["relatedEntityClass_{$k}"] = $relClass;
                 $sqlParams["relatedEntityId_{$k}"] = $relId;
             }
 
-            $sql = self::BASE_COUNTER_SQL . ' WHERE sender_id IS NOT NULL AND (' . implode(' OR ', $wheres) . ')';
+            $sql = self::BASE_COUNTER_SQL.' WHERE sender_id IS NOT NULL AND ('.implode(' OR ', $wheres).')';
 
             $result = $this->em->getConnection()->fetchAssociative($sql, $sqlParams);
         }
@@ -194,13 +194,14 @@ final class NotificationRepository implements ObjectRepository
      *
      * @return Notification[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
     /**
      * @param list<array{relatedEntityClass: class-string, relatedEntityId: int}> $more
+     *
      * @return array|Notification[]
      */
     public function findNotificationByRelatedEntityAndUserAssociated(string $relatedEntityClass, int $relatedEntityId, User $user, array $more): array
@@ -213,7 +214,7 @@ final class NotificationRepository implements ObjectRepository
                 ->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Notification
+    public function findOneBy(array $criteria, array $orderBy = null): ?Notification
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
@@ -226,11 +227,11 @@ final class NotificationRepository implements ObjectRepository
         $rsm = new Query\ResultSetMappingBuilder($this->em);
         $rsm->addRootEntityFromClassMetadata(Notification::class, 'cmn');
 
-        $sql = 'SELECT ' . $rsm->generateSelectClause(['cmn' => 'cmn']) . ' ' .
-        'FROM chill_main_notification cmn ' .
-        'WHERE ' .
-              'EXISTS (select 1 FROM chill_main_notification_addresses_unread cmnau WHERE cmnau.user_id = :userId and cmnau.notification_id = cmn.id) ' .
-        'ORDER BY cmn.date DESC ' .
+        $sql = 'SELECT '.$rsm->generateSelectClause(['cmn' => 'cmn']).' '.
+        'FROM chill_main_notification cmn '.
+        'WHERE '.
+              'EXISTS (select 1 FROM chill_main_notification_addresses_unread cmnau WHERE cmnau.user_id = :userId and cmnau.notification_id = cmn.id) '.
+        'ORDER BY cmn.date DESC '.
         'LIMIT :limit OFFSET :offset';
 
         $nq = $this->em->createNativeQuery($sql, $rsm)
diff --git a/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php b/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
index 910d924db..59b7c93a4 100644
--- a/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
@@ -57,12 +57,12 @@ final class PermissionsGroupRepository implements ObjectRepository
      *
      * @return PermissionsGroup[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?PermissionsGroup
+    public function findOneBy(array $criteria, array $orderBy = null): ?PermissionsGroup
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
index 3d2b2bb11..45e10816a 100644
--- a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
@@ -18,7 +18,6 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
-use RuntimeException;
 
 final class PostalCodeRepository implements PostalCodeRepositoryInterface
 {
@@ -55,7 +54,7 @@ final class PostalCodeRepository implements PostalCodeRepositoryInterface
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -69,7 +68,7 @@ final class PostalCodeRepository implements PostalCodeRepositoryInterface
         $query->addSelectClause($rsm->generateSelectClause());
 
         $sql = strtr(
-            $query->buildQuery() . 'ORDER BY pertinence DESC, canonical ASC OFFSET ? LIMIT ? ',
+            $query->buildQuery().'ORDER BY pertinence DESC, canonical ASC OFFSET ? LIMIT ? ',
             // little hack for adding sql method to point
             ['cmpc.center AS center' => 'ST_AsGeojson(cmpc.center) AS center']
         );
@@ -80,7 +79,7 @@ final class PostalCodeRepository implements PostalCodeRepositoryInterface
             ->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?PostalCode
+    public function findOneBy(array $criteria, array $orderBy = null): ?PostalCode
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
@@ -95,7 +94,7 @@ final class PostalCodeRepository implements PostalCodeRepositoryInterface
         $pattern = trim($pattern);
 
         if ('' === $pattern) {
-            throw new RuntimeException('the search pattern must not be empty');
+            throw new \RuntimeException('the search pattern must not be empty');
         }
         $query = new SearchApiQuery();
 
diff --git a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepositoryInterface.php
index fe3dee195..590598cb0 100644
--- a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepositoryInterface.php
@@ -32,11 +32,11 @@ interface PostalCodeRepositoryInterface extends ObjectRepository
      *
      * @return PostalCode[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array;
 
     public function findByPattern(string $pattern, ?Country $country, ?int $start = 0, ?int $limit = 50): array;
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?PostalCode;
+    public function findOneBy(array $criteria, array $orderBy = null): ?PostalCode;
 
     public function getClassName(): string;
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
index e18279944..cd51b7913 100644
--- a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
@@ -51,12 +51,12 @@ final class RegroupmentRepository implements ObjectRepository
      *
      * @return Regroupment[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Regroupment
+    public function findOneBy(array $criteria, array $orderBy = null): ?Regroupment
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php b/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
index ddf52af5b..6ee488ffe 100644
--- a/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
@@ -44,12 +44,12 @@ final class RoleScopeRepository implements ObjectRepository
      *
      * @return RoleScope[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?RoleScope
+    public function findOneBy(array $criteria, array $orderBy = null): ?RoleScope
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/SavedExportRepository.php b/src/Bundle/ChillMainBundle/Repository/SavedExportRepository.php
index c56e9927d..4c0a5035b 100644
--- a/src/Bundle/ChillMainBundle/Repository/SavedExportRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/SavedExportRepository.php
@@ -42,12 +42,12 @@ class SavedExportRepository implements SavedExportRepositoryInterface
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findByUser(User $user, ?array $orderBy = [], ?int $limit = null, ?int $offset = null): array
+    public function findByUser(User $user, ?array $orderBy = [], int $limit = null, int $offset = null): array
     {
         $qb = $this->repository->createQueryBuilder('se');
 
@@ -64,7 +64,7 @@ class SavedExportRepository implements SavedExportRepositoryInterface
         }
 
         foreach ($orderBy as $field => $order) {
-            $qb->addOrderBy('se.' . $field, $order);
+            $qb->addOrderBy('se.'.$field, $order);
         }
 
         return $qb->getQuery()->getResult();
diff --git a/src/Bundle/ChillMainBundle/Repository/SavedExportRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/SavedExportRepositoryInterface.php
index 3b168505f..488139846 100644
--- a/src/Bundle/ChillMainBundle/Repository/SavedExportRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/SavedExportRepositoryInterface.php
@@ -27,12 +27,12 @@ interface SavedExportRepositoryInterface extends ObjectRepository
      */
     public function findAll(): array;
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     /**
      * @return array|SavedExport[]
      */
-    public function findByUser(User $user, ?array $orderBy = [], ?int $limit = null, ?int $offset = null): array;
+    public function findByUser(User $user, ?array $orderBy = [], int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?SavedExport;
 
diff --git a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
index ba4ddae9b..21e55954b 100644
--- a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
@@ -58,12 +58,12 @@ final class ScopeRepository implements ScopeRepositoryInterface
      *
      * @return Scope[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Scope
+    public function findOneBy(array $criteria, array $orderBy = null): ?Scope
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php
index 3cfb6042d..6c68b08b2 100644
--- a/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php
@@ -32,14 +32,14 @@ interface ScopeRepositoryInterface extends ObjectRepository
     public function findAllActive(): array;
 
     /**
-     * @param null|mixed $limit
-     * @param null|mixed $offset
+     * @param mixed|null $limit
+     * @param mixed|null $offset
      *
      * @return Scope[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array;
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Scope;
+    public function findOneBy(array $criteria, array $orderBy = null): ?Scope;
 
     public function getClassName(): string;
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/User/UserJobHistoryRepository.php b/src/Bundle/ChillMainBundle/Repository/User/UserJobHistoryRepository.php
index 443e01213..2e0ac988f 100644
--- a/src/Bundle/ChillMainBundle/Repository/User/UserJobHistoryRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/User/UserJobHistoryRepository.php
@@ -13,8 +13,6 @@ namespace Chill\MainBundle\Repository\User;
 
 use Chill\MainBundle\Entity\User\UserJobHistory;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\ORM\OptimisticLockException;
-use Doctrine\ORM\ORMException;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Repository/User/UserScopeHistoryRepository.php b/src/Bundle/ChillMainBundle/Repository/User/UserScopeHistoryRepository.php
index 040155457..6ded91ba4 100644
--- a/src/Bundle/ChillMainBundle/Repository/User/UserScopeHistoryRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/User/UserScopeHistoryRepository.php
@@ -13,8 +13,6 @@ namespace Chill\MainBundle\Repository\User;
 
 use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\ORM\OptimisticLockException;
-use Doctrine\ORM\ORMException;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
index 28ada8b69..6c8d7191f 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
@@ -21,8 +21,8 @@ interface UserACLAwareRepositoryInterface
      * Find the users reaching the given center and scope, for the given role.
      *
      * @param array|Center|Center[]|null $center
-     * @param array|Scope|Scope[]|null $scope
-     * @param bool $onlyActive true if get only active users
+     * @param array|Scope|Scope[]|null   $scope
+     * @param bool                       $onlyActive true if get only active users
      *
      * @return User[]
      */
diff --git a/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php b/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php
index 302830cdc..ca3c60e1c 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php
@@ -48,7 +48,7 @@ class UserJobRepository implements UserJobRepositoryInterface
      *
      * @return array|object[]|UserJob[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/UserJobRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/UserJobRepositoryInterface.php
index a752f452b..3c3f16fc1 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserJobRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserJobRepositoryInterface.php
@@ -34,7 +34,7 @@ interface UserJobRepositoryInterface extends ObjectRepository
      *
      * @return array|object[]|UserJob[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null);
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null);
 
     public function findOneBy(array $criteria): ?UserJob;
 
diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepository.php b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
index 17775f475..3bc24a6ac 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
@@ -22,8 +22,6 @@ use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Doctrine\ORM\QueryBuilder;
 
-use function count;
-
 final readonly class UserRepository implements UserRepositoryInterface
 {
     private EntityRepository $repository;
@@ -127,7 +125,7 @@ final readonly class UserRepository implements UserRepositoryInterface
 
             $converted['absenceStart'] = null !== $u['absencestart'] ? new \DateTimeImmutable($u['absencestart']) : null;
 
-            /** @phpstan-ignore-next-line phpstan does not take into account that all required keys will be present */
+            /* @phpstan-ignore-next-line phpstan does not take into account that all required keys will be present */
             yield $converted;
         }
     }
@@ -160,14 +158,13 @@ final readonly class UserRepository implements UserRepositoryInterface
         }
     }
 
-
     /**
      * @param mixed|null $limit
      * @param mixed|null $offset
      *
      * @return User[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -175,7 +172,7 @@ final readonly class UserRepository implements UserRepositoryInterface
     /**
      * @return array|User[]
      */
-    public function findByActive(?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findByActive(array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->findBy(['enabled' => true], $orderBy, $limit, $offset);
     }
@@ -185,12 +182,12 @@ final readonly class UserRepository implements UserRepositoryInterface
      *
      * @return array|User[]
      */
-    public function findByNotHavingAttribute(string $key, ?int $limit = null, ?int $offset = null): array
+    public function findByNotHavingAttribute(string $key, int $limit = null, int $offset = null): array
     {
         $rsm = new ResultSetMappingBuilder($this->entityManager);
         $rsm->addRootEntityFromClassMetadata(User::class, 'u');
 
-        $sql = 'SELECT ' . $rsm->generateSelectClause() . ' FROM users u WHERE NOT attributes ?? :key OR attributes IS NULL AND enabled IS TRUE';
+        $sql = 'SELECT '.$rsm->generateSelectClause().' FROM users u WHERE NOT attributes ?? :key OR attributes IS NULL AND enabled IS TRUE';
 
         if (null !== $limit) {
             $sql .= " LIMIT {$limit}";
@@ -203,7 +200,7 @@ final readonly class UserRepository implements UserRepositoryInterface
         return $this->entityManager->createNativeQuery($sql, $rsm)->setParameter(':key', $key)->getResult();
     }
 
-    public function findByUsernameOrEmail(string $pattern, ?array $orderBy = [], ?int $limit = null, ?int $offset = null): array
+    public function findByUsernameOrEmail(string $pattern, ?array $orderBy = [], int $limit = null, int $offset = null): array
     {
         $qb = $this->queryByUsernameOrEmail($pattern);
 
@@ -218,13 +215,13 @@ final readonly class UserRepository implements UserRepositoryInterface
         }
 
         foreach ($orderBy as $field => $order) {
-            $qb->addOrderBy('u.' . $field, $order);
+            $qb->addOrderBy('u.'.$field, $order);
         }
 
         return $qb->getQuery()->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?User
+    public function findOneBy(array $criteria, array $orderBy = null): ?User
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
@@ -248,17 +245,16 @@ final readonly class UserRepository implements UserRepositoryInterface
      * and, then filter those users having some flags.
      *
      * @param \Chill\MainBundle\Entity\User[] $amongstUsers
-     * @param mixed $flag
      */
     public function findUsersHavingFlags($flag, array $amongstUsers = []): array
     {
         $gcs = $this
             ->entityManager
             ->createQuery(
-                'SELECT DISTINCT gc ' .
-                'FROM ' . GroupCenter::class . ' gc ' .
-                'JOIN gc.permissionsGroup pg ' .
-                'WHERE ' .
+                'SELECT DISTINCT gc '.
+                'FROM '.GroupCenter::class.' gc '.
+                'JOIN gc.permissionsGroup pg '.
+                'WHERE '.
                 'JSONB_EXISTS_IN_ARRAY(pg.flags, :flag) = :true '
             )
             ->setParameters([
@@ -267,7 +263,7 @@ final readonly class UserRepository implements UserRepositoryInterface
             ])
             ->getResult();
 
-        if (count($gcs) === 0) {
+        if (0 === \count($gcs)) {
             return [];
         }
 
@@ -280,8 +276,8 @@ final readonly class UserRepository implements UserRepositoryInterface
         $orx = $qb->expr()->orX();
 
         foreach ($gcs as $i => $gc) {
-            $orx->add(':gc_' . $i . ' MEMBER OF u.groupCenters');
-            $qb->setParameter('gc_' . $i, $gc);
+            $orx->add(':gc_'.$i.' MEMBER OF u.groupCenters');
+            $qb->setParameter('gc_'.$i, $gc);
         }
 
         $qb->andWhere($orx);
diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php
index ef97cb2fe..f05da315d 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php
@@ -33,6 +33,7 @@ interface UserRepositoryInterface extends ObjectRepository
      * The main purpose for this method is to provide a lightweight list of all users in the database.
      *
      * @param string $lang The lang to display all the translatable string (no fallback if not present)
+     *
      * @return iterable<array{id: int, username: string, email: string, enabled: bool, civility_id: int, civility_abbreviation: string, civility_name: string, label: string, mainCenter_id: int, mainCenter_name: string, mainScope_id: int, mainScope_name: string, userJob_id: int, userJob_name: string, currentLocation_id: int, currentLocation_name: string, mainLocation_id: int, mainLocation_name: string, absenceStart: \DateTimeImmutable}>
      */
     public function findAllAsArray(string $lang): iterable;
@@ -50,16 +51,16 @@ interface UserRepositoryInterface extends ObjectRepository
     /**
      * @return array|User[]
      */
-    public function findByActive(?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findByActive(array $orderBy = null, int $limit = null, int $offset = null): array;
 
     /**
      * Find users which does not have a key on attribute column.
      *
      * @return array|User[]
      */
-    public function findByNotHavingAttribute(string $key, ?int $limit = null, ?int $offset = null): array;
+    public function findByNotHavingAttribute(string $key, int $limit = null, int $offset = null): array;
 
-    public function findByUsernameOrEmail(string $pattern, ?array $orderBy = [], ?int $limit = null, ?int $offset = null): array;
+    public function findByUsernameOrEmail(string $pattern, ?array $orderBy = [], int $limit = null, int $offset = null): array;
 
     public function findOneByUsernameOrEmail(string $pattern): ?User;
 
@@ -71,7 +72,6 @@ interface UserRepositoryInterface extends ObjectRepository
      * and, then filter those users having some flags.
      *
      * @param \Chill\MainBundle\Entity\User[] $amongstUsers
-     * @param mixed $flag
      */
     public function findUsersHavingFlags(mixed $flag, array $amongstUsers = []): array;
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
index 3ca56a2a0..234ea258e 100644
--- a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
@@ -72,13 +72,13 @@ class EntityWorkflowRepository implements ObjectRepository
         foreach ($relateds as $related) {
             $orX->add(
                 $qb->expr()->andX(
-                    $qb->expr()->eq('w.relatedEntityClass', ':entity_class_' . $i),
-                    $qb->expr()->eq('w.relatedEntityId', ':entity_id_' . $i)
+                    $qb->expr()->eq('w.relatedEntityClass', ':entity_class_'.$i),
+                    $qb->expr()->eq('w.relatedEntityId', ':entity_id_'.$i)
                 )
             );
             $qb
-                ->setParameter('entity_class_' . $i, $related['entityClass'])
-                ->setParameter('entity_id_' . $i, $related['entityId']);
+                ->setParameter('entity_class_'.$i, $related['entityClass'])
+                ->setParameter('entity_id_'.$i, $related['entityId']);
             ++$i;
         }
         $qb->where($orX);
@@ -100,22 +100,22 @@ class EntityWorkflowRepository implements ObjectRepository
     }
 
     /**
-     * @param null|mixed $limit
-     * @param null|mixed $offset
+     * @param mixed|null $limit
+     * @param mixed|null $offset
      *
      * @return array|EntityWorkflow[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findByCc(User $user, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findByCc(User $user, array $orderBy = null, $limit = null, $offset = null): array
     {
         $qb = $this->buildQueryByCc($user)->select('ew');
 
         foreach ($orderBy as $key => $sort) {
-            $qb->addOrderBy('ew.' . $key, $sort);
+            $qb->addOrderBy('ew.'.$key, $sort);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
@@ -123,12 +123,12 @@ class EntityWorkflowRepository implements ObjectRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findByDest(User $user, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findByDest(User $user, array $orderBy = null, $limit = null, $offset = null): array
     {
         $qb = $this->buildQueryByDest($user)->select('ew');
 
         foreach ($orderBy as $key => $sort) {
-            $qb->addOrderBy('ew.' . $key, $sort);
+            $qb->addOrderBy('ew.'.$key, $sort);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
@@ -136,12 +136,12 @@ class EntityWorkflowRepository implements ObjectRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findByPreviousDestWithoutReaction(User $user, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findByPreviousDestWithoutReaction(User $user, array $orderBy = null, $limit = null, $offset = null): array
     {
         $qb = $this->buildQueryByPreviousDestWithoutReaction($user)->select('ew');
 
         foreach ($orderBy as $key => $sort) {
-            $qb->addOrderBy('ew.' . $key, $sort);
+            $qb->addOrderBy('ew.'.$key, $sort);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
@@ -149,12 +149,12 @@ class EntityWorkflowRepository implements ObjectRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findByPreviousTransitionned(User $user, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findByPreviousTransitionned(User $user, array $orderBy = null, $limit = null, $offset = null): array
     {
         $qb = $this->buildQueryByPreviousTransitionned($user)->select('ew')->distinct(true);
 
         foreach ($orderBy as $key => $sort) {
-            $qb->addOrderBy('ew.' . $key, $sort);
+            $qb->addOrderBy('ew.'.$key, $sort);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
@@ -162,12 +162,12 @@ class EntityWorkflowRepository implements ObjectRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findBySubscriber(User $user, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBySubscriber(User $user, array $orderBy = null, $limit = null, $offset = null): array
     {
         $qb = $this->buildQueryBySubscriber($user)->select('ew');
 
         foreach ($orderBy as $key => $sort) {
-            $qb->addOrderBy('ew.' . $key, $sort);
+            $qb->addOrderBy('ew.'.$key, $sort);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
diff --git a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepRepository.php b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepRepository.php
index 545ec2873..d7e5455ba 100644
--- a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepRepository.php
@@ -27,7 +27,7 @@ class EntityWorkflowStepRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(EntityWorkflowStep::class);
     }
 
-    public function countUnreadByUser(User $user, ?array $orderBy = null, $limit = null, $offset = null): int
+    public function countUnreadByUser(User $user, array $orderBy = null, $limit = null, $offset = null): int
     {
         $qb = $this->buildQueryByUser($user)->select('count(e)');
 
@@ -44,7 +44,7 @@ class EntityWorkflowStepRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php b/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php
index ca160f0db..6dfab882a 100644
--- a/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php
+++ b/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php
@@ -14,14 +14,13 @@ namespace Chill\MainBundle\Routing;
 use Knp\Menu\MenuItem;
 
 /**
- * Implements a builder for menu
+ * Implements a builder for menu.
  *
  * @template TParams of array
  */
 interface LocalMenuBuilderInterface
 {
     /**
-     * @param $menuId
      * @param TParams $parameters
      */
     public function buildMenu($menuId, MenuItem $menu, array $parameters);
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
index 89700c71c..37c47e1bd 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
@@ -28,9 +28,6 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
      */
     public function __construct(protected AuthorizationCheckerInterface $authorizationChecker, protected TranslatorInterface $translator, protected ParameterBagInterface $parameterBag) {}
 
-    /**
-     * @param $menuId
-     */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         $menu->addChild($this->translator->trans('Homepage'), [
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
index 927faf981..2c28ff2e8 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
@@ -52,7 +52,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
 
             $nbNotifications = $this->notificationByUserCounter->countUnreadByUser($user);
 
-            //TODO add an icon? How exactly? For example a clock icon...
+            // TODO add an icon? How exactly? For example a clock icon...
             $menu
                 ->addChild($this->translator->trans('absence.Set absence date'), [
                     'route' => 'chill_main_user_absence_index',
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuComposer.php b/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
index 08fd70ecc..e16b10e8f 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
@@ -17,10 +17,6 @@ use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-use function array_merge;
-use function array_values;
-
 /**
  * This class permit to build menu from the routing information
  * stored in each bundle.
@@ -53,7 +49,7 @@ class MenuComposer
                 'order' => $order,
             ])
                 ->setExtras([
-                    //'icon' => $route['icon'],
+                    // 'icon' => $route['icon'],
                     // sf4 check: commented to avoid error: `An exception has been thrown during the rendering of a template ("Notice: Undefined index: icon").`
                     'order' => $order,
                 ]);
@@ -76,7 +72,7 @@ class MenuComposer
      * The array is aimed to build route with MenuTwig.
      *
      * @param string $menuId
-     * @param array $parameters see https://redmine.champs-libres.coop/issues/179
+     * @param array  $parameters see https://redmine.champs-libres.coop/issues/179
      *
      * @return array
      */
@@ -87,13 +83,13 @@ class MenuComposer
 
         foreach ($routeCollection->all() as $routeKey => $route) {
             if ($route->hasOption('menus')) {
-                if (array_key_exists($menuId, $route->getOption('menus'))) {
+                if (\array_key_exists($menuId, $route->getOption('menus'))) {
                     $route = $route->getOption('menus')[$menuId];
 
                     $route['key'] = $routeKey;
 
                     $order = $this->resolveOrder($routes, $route['order']);
-                    //we do not want to duplicate order information
+                    // we do not want to duplicate order information
                     unset($route['order']);
                     $routes[$order] = $route;
                 }
@@ -116,7 +112,7 @@ class MenuComposer
      */
     public function hasLocalMenuBuilder($menuId): bool
     {
-        return array_key_exists($menuId, $this->localMenuBuilders);
+        return \array_key_exists($menuId, $this->localMenuBuilders);
     }
 
     /**
@@ -147,7 +143,7 @@ class MenuComposer
 
         ksort($ordered);
 
-        $menus = array_merge(array_values($ordered), $unordered);
+        $menus = \array_merge(\array_values($ordered), $unordered);
         $menu->reorderChildren($menus);
     }
 
@@ -157,7 +153,7 @@ class MenuComposer
      * first next order available.
      *
      * @param array $routes the routes previously added
-     * @param int $order
+     * @param int   $order
      *
      * @return int
      */
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
index 4503fe3fd..65608ba4d 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
@@ -47,7 +47,7 @@ class MenuTwig extends AbstractExtension implements ContainerAwareInterface
      *
      * @deprecated link: see https://redmine.champs-libres.coop/issues/179 for more informations
      *
-     * @param string $menuId
+     * @param string  $menuId
      * @param mixed[] $params
      */
     public function chillMenu(Environment $env, $menuId, array $params = [])
@@ -57,7 +57,7 @@ class MenuTwig extends AbstractExtension implements ContainerAwareInterface
         $layout = $resolvedParams['layout'];
         unset($resolvedParams['layout']);
 
-        if ($this->menuComposer->hasLocalMenuBuilder($menuId) === false) {
+        if (false === $this->menuComposer->hasLocalMenuBuilder($menuId)) {
             $resolvedParams['routes'] = $this->menuComposer->getRoutesFor($menuId, $resolvedParams);
 
             return $env->render($layout, $resolvedParams);
@@ -85,7 +85,7 @@ class MenuTwig extends AbstractExtension implements ContainerAwareInterface
         return 'chill_menu';
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
     }
diff --git a/src/Bundle/ChillMainBundle/Search/AbstractSearch.php b/src/Bundle/ChillMainBundle/Search/AbstractSearch.php
index 9cd2cbd77..9c3f96f5d 100644
--- a/src/Bundle/ChillMainBundle/Search/AbstractSearch.php
+++ b/src/Bundle/ChillMainBundle/Search/AbstractSearch.php
@@ -13,9 +13,6 @@ namespace Chill\MainBundle\Search;
 
 use DateTime;
 
-use function array_key_exists;
-use function strpos;
-
 /**
  * This class implements abstract search with most common responses.
  *
@@ -29,17 +26,17 @@ abstract class AbstractSearch implements SearchInterface
      *
      * @param type $string
      *
-     * @throws ParsingException if the  date is not parseable
+     * @return \DateTime
      *
-     * @return DateTime
+     * @throws ParsingException if the  date is not parseable
      */
     public function parseDate($string)
     {
         try {
-            return new DateTime($string);
+            return new \DateTime($string);
         } catch (ParsingException $ex) {
             $exception = new ParsingException('The date is '
-                      . 'not parsable', 0, $ex);
+                      .'not parsable', 0, $ex);
 
             throw $exception;
         }
@@ -59,18 +56,18 @@ abstract class AbstractSearch implements SearchInterface
         $recomposed = '';
 
         if (null !== $domain) {
-            $recomposed .= '@' . $domain . ' ';
+            $recomposed .= '@'.$domain.' ';
         }
 
         foreach ($supportedTerms as $term) {
-            if (array_key_exists($term, $terms) && '_default' !== $term) {
-                $recomposed .= ' ' . $term . ':';
+            if (\array_key_exists($term, $terms) && '_default' !== $term) {
+                $recomposed .= ' '.$term.':';
                 $containsSpace = str_contains((string) $terms[$term], ' ');
 
                 if ($containsSpace) {
                     $recomposed .= '"';
                 }
-                $recomposed .= (mb_stristr(' ', (string) $terms[$term]) === false) ? $terms[$term] : '(' . $terms[$term] . ')';
+                $recomposed .= (false === mb_stristr(' ', (string) $terms[$term])) ? $terms[$term] : '('.$terms[$term].')';
 
                 if ($containsSpace) {
                     $recomposed .= '"';
@@ -79,11 +76,11 @@ abstract class AbstractSearch implements SearchInterface
         }
 
         if ('' !== $terms['_default']) {
-            $recomposed .= ' ' . $terms['_default'];
+            $recomposed .= ' '.$terms['_default'];
         }
 
-        //strip first character if empty
-        if (mb_strcut($recomposed, 0, 1) === ' ') {
+        // strip first character if empty
+        if (' ' === mb_strcut($recomposed, 0, 1)) {
             $recomposed = mb_strcut($recomposed, 1);
         }
 
diff --git a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
index c2b8ba434..12568287d 100644
--- a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
+++ b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
@@ -15,9 +15,6 @@ use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Search\SearchApiInterface;
 use Chill\MainBundle\Search\SearchApiQuery;
 
-use function array_map;
-use function in_array;
-
 class SearchUserApiProvider implements SearchApiInterface
 {
     public function __construct(private readonly UserRepository $userRepository) {}
@@ -29,7 +26,7 @@ class SearchUserApiProvider implements SearchApiInterface
 
     public function prepare(array $metadatas): void
     {
-        $ids = array_map(static fn ($m) => $m['id'], $metadatas);
+        $ids = \array_map(static fn ($m) => $m['id'], $metadatas);
 
         $this->userRepository->findBy(['id' => $ids]);
     }
@@ -61,6 +58,6 @@ class SearchUserApiProvider implements SearchApiInterface
 
     public function supportsTypes(string $pattern, array $types, array $parameters): bool
     {
-        return in_array('user', $types, true);
+        return \in_array('user', $types, true);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Search/Model/Result.php b/src/Bundle/ChillMainBundle/Search/Model/Result.php
index 619c6ad79..1866da2f2 100644
--- a/src/Bundle/ChillMainBundle/Search/Model/Result.php
+++ b/src/Bundle/ChillMainBundle/Search/Model/Result.php
@@ -13,9 +13,6 @@ namespace Chill\MainBundle\Search\Model;
 
 class Result
 {
-    /**
-     * @param $result
-     */
     public function __construct(
         private readonly float $relevance,
         /**
diff --git a/src/Bundle/ChillMainBundle/Search/ParsingException.php b/src/Bundle/ChillMainBundle/Search/ParsingException.php
index 550535d73..241079925 100644
--- a/src/Bundle/ChillMainBundle/Search/ParsingException.php
+++ b/src/Bundle/ChillMainBundle/Search/ParsingException.php
@@ -11,6 +11,4 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
-use Exception;
-
-class ParsingException extends Exception {}
+class ParsingException extends \Exception {}
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApi.php b/src/Bundle/ChillMainBundle/Search/SearchApi.php
index 1b54e13bd..267b90313 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApi.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApi.php
@@ -18,12 +18,6 @@ use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 
-use function array_map;
-use function array_merge;
-use function count;
-use function implode;
-use function strtr;
-
 class SearchApi
 {
     public function __construct(private readonly EntityManagerInterface $em, private readonly iterable $providers, private readonly PaginatorFactory $paginator) {}
@@ -32,7 +26,7 @@ class SearchApi
     {
         $queries = $this->findQueries($pattern, $types, $parameters);
 
-        if (0 === count($queries)) {
+        if (0 === \count($queries)) {
             throw new SearchApiNoQueryException($pattern, $types, $parameters);
         }
 
@@ -55,13 +49,13 @@ class SearchApi
 
         foreach ($queries as $q) {
             $unions[] = $q->buildQuery(true);
-            $parameters = array_merge($parameters, $q->buildParameters(true));
+            $parameters = \array_merge($parameters, $q->buildParameters(true));
         }
 
-        $unionUnordered = implode(' UNION ', $unions);
+        $unionUnordered = \implode(' UNION ', $unions);
 
         return [
-            strtr($query, ['{union_unordered}' => $unionUnordered]),
+            \strtr($query, ['{union_unordered}' => $unionUnordered]),
             $parameters,
         ];
     }
@@ -94,17 +88,17 @@ class SearchApi
 
         foreach ($queries as $q) {
             $unions[] = $q->buildQuery();
-            $parameters = array_merge($parameters, $q->buildParameters());
+            $parameters = \array_merge($parameters, $q->buildParameters());
         }
 
         // add pagination limit
         $parameters[] = $paginator->getItemsPerPage();
         $parameters[] = $paginator->getCurrentPageFirstItemNumber();
 
-        $union = implode(' UNION ', $unions);
+        $union = \implode(' UNION ', $unions);
 
         return [
-            strtr($query, ['{unions}' => $union]),
+            \strtr($query, ['{unions}' => $union]),
             $parameters,
         ];
     }
@@ -149,7 +143,7 @@ class SearchApi
 
     private function findQueries($pattern, array $types, array $parameters): array
     {
-        return array_map(
+        return \array_map(
             static fn ($p) => $p->provideQuery($pattern, $parameters),
             $this->findProviders($pattern, $types, $parameters),
         );
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php b/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
index c006b4bee..b16cec9c5 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
@@ -11,20 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
-use RuntimeException;
-use Throwable;
-
-use function implode;
-
-class SearchApiNoQueryException extends RuntimeException
+class SearchApiNoQueryException extends \RuntimeException
 {
     private readonly string $pattern;
 
     private readonly array $types;
 
-    public function __construct(string $pattern = '', array $types = [], private readonly array $parameters = [], $code = 0, ?Throwable $previous = null)
+    public function __construct(string $pattern = '', array $types = [], private readonly array $parameters = [], $code = 0, \Throwable $previous = null)
     {
-        $typesStr = implode(', ', $types);
+        $typesStr = \implode(', ', $types);
         $message = "No query for this search: pattern : {$pattern}, types: {$typesStr}";
         $this->pattern = $pattern;
         $this->types = $types;
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php b/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
index ad852d95a..325fba31d 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
@@ -11,11 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
-use function array_push;
-use function count;
-use function implode;
-use function strtr;
-
 /**
  * This create a query optimized for searching for the api response.
  *
@@ -24,9 +19,9 @@ use function strtr;
  *
  * `SELECT '<key>' as key, <metadata> as metadata, <pertinence> as pertinence FROM <from clause> WHERE <where clause>`.
  *
- * The clause between `<>` are provided through the dedicated method in this class (@link{self::setSelectKey},
- * @link{self::setFromClause}), etc.).
+ * The clause between `<>` are provided through the dedicated method in this class (@see{self::setSelectKey},
  *
+ * @see{self::setFromClause}), etc.).
  */
 class SearchApiQuery
 {
@@ -76,7 +71,7 @@ class SearchApiQuery
     public function andWhereClause(string $whereClause, array $params = []): self
     {
         $this->whereClauses[] = $whereClause;
-        array_push($this->whereClausesParams, ...$params);
+        \array_push($this->whereClausesParams, ...$params);
 
         return $this;
     }
@@ -99,18 +94,18 @@ class SearchApiQuery
 
     public function buildQuery(bool $countOnly = false): string
     {
-        $isMultiple = count($this->whereClauses);
+        $isMultiple = \count($this->whereClauses);
         $where =
-            ($isMultiple ? '(' : '') .
-            implode(
-                ($isMultiple ? ')' : '') . ' AND ' . ($isMultiple ? '(' : ''),
+            ($isMultiple ? '(' : '').
+            \implode(
+                ($isMultiple ? ')' : '').' AND '.($isMultiple ? '(' : ''),
                 $this->whereClauses
-            ) .
+            ).
             ($isMultiple ? ')' : '');
 
         $select = $this->buildSelectClause($countOnly);
 
-        return strtr('SELECT
+        return \strtr('SELECT
                 {select}
             FROM {from}
             WHERE {where}
@@ -218,24 +213,24 @@ class SearchApiQuery
                 return 'count(*) AS c';
             }
 
-            return 'count(distinct ' . $this->isDistinctKey . ') AS c';
+            return 'count(distinct '.$this->isDistinctKey.') AS c';
         }
 
         $selects = $this->getSelectClauses();
 
         if (null !== $this->selectKey) {
-            $selects[] = strtr("'{key}' AS key", ['{key}' => $this->selectKey]);
+            $selects[] = \strtr("'{key}' AS key", ['{key}' => $this->selectKey]);
         }
 
         if (null !== $this->jsonbMetadata) {
-            $selects[] = strtr('{metadata} AS metadata', ['{metadata}' => $this->jsonbMetadata]);
+            $selects[] = \strtr('{metadata} AS metadata', ['{metadata}' => $this->jsonbMetadata]);
         }
 
         if (null !== $this->pertinence) {
-            $selects[] = strtr('{pertinence} AS pertinence', ['{pertinence}' => $this->pertinence]);
+            $selects[] = \strtr('{pertinence} AS pertinence', ['{pertinence}' => $this->pertinence]);
         }
 
-        return ($this->isDistinct ? 'DISTINCT ' : '') . implode(', ', $selects);
+        return ($this->isDistinct ? 'DISTINCT ' : '').\implode(', ', $selects);
     }
 
     private function buildSelectParams(bool $count = false): array
diff --git a/src/Bundle/ChillMainBundle/Search/SearchInterface.php b/src/Bundle/ChillMainBundle/Search/SearchInterface.php
index a7cd285fe..10d4f2a06 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchInterface.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchInterface.php
@@ -68,10 +68,10 @@ interface SearchInterface
      * take only the given parameters into account; the results from pagination
      * should be ignored. (Most of the time, it should be the same).
      *
-     * @param array  $terms   the string to search
-     * @param int    $start   the first result (for pagination)
-     * @param int    $limit   the number of result (for pagination)
-     * @param "html"|"json" $format  The format for result
+     * @param array         $terms  the string to search
+     * @param int           $start  the first result (for pagination)
+     * @param int           $limit  the number of result (for pagination)
+     * @param "html"|"json" $format The format for result
      *
      * @return string|array a string if format is html, an array if format is json
      */
@@ -80,9 +80,6 @@ interface SearchInterface
     /**
      * indicate if the implementation supports the given domain.
      *
-     * @param mixed $domain
-     * @param mixed $format
-     *
      * @return bool
      */
     public function supports($domain, $format);
diff --git a/src/Bundle/ChillMainBundle/Search/SearchProvider.php b/src/Bundle/ChillMainBundle/Search/SearchProvider.php
index e173b1acb..e239b872d 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchProvider.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchProvider.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
-use function array_key_exists;
 use function chr;
-use function count;
 
 /**
  * a service which gather all search services defined into the bundles
@@ -62,9 +60,9 @@ class SearchProvider
      * return search services with a specific name, defined in service
      * definition.
      *
+     * @return SearchInterface
      *
      * @throws UnknowSearchNameException if not exists
-     * @return SearchInterface
      */
     public function getByName(mixed $name)
     {
@@ -87,7 +85,7 @@ class SearchProvider
      */
     public function getByOrder()
     {
-        //sort the array
+        // sort the array
         uasort($this->searchServices, static fn (SearchInterface $a, SearchInterface $b) => $a->getOrder() <=> $b->getOrder());
 
         return $this->searchServices;
@@ -101,7 +99,7 @@ class SearchProvider
      */
     public function getHasAdvancedFormByName(string $name): HasAdvancedSearchFormInterface
     {
-        if (array_key_exists($name, $this->hasAdvancedFormSearchServices)) {
+        if (\array_key_exists($name, $this->hasAdvancedFormSearchServices)) {
             return $this->hasAdvancedFormSearchServices[$name];
         }
 
@@ -110,7 +108,7 @@ class SearchProvider
 
     public function getHasAdvancedFormSearchServices()
     {
-        //sort the array
+        // sort the array
         uasort($this->hasAdvancedFormSearchServices, static fn (HasAdvancedSearchFormInterface $a, HasAdvancedSearchFormInterface $b): int => $a->getOrder() <=> $b->getOrder());
 
         return $this->hasAdvancedFormSearchServices;
@@ -143,9 +141,9 @@ class SearchProvider
      * @param number $limit
      * @param string $format
      *
-     * @throws UnknowSearchDomainException if the domain is unknow
-     *
      * @return array of results from different SearchInterface
+     *
+     * @throws UnknowSearchDomainException if the domain is unknow
      */
     public function getSearchResults(
         $pattern,
@@ -157,7 +155,7 @@ class SearchProvider
         $terms = $this->parse($pattern);
         $results = [];
 
-        //sort searchServices by order
+        // sort searchServices by order
         $sortedSearchServices = [];
 
         foreach ($this->searchServices as $service) {
@@ -171,7 +169,7 @@ class SearchProvider
                 }
             }
 
-            if (count($results) === 0) {
+            if (0 === \count($results)) {
                 throw new UnknowSearchDomainException($terms['_domain']);
             }
         } else { // no domain provided, we use default search
@@ -182,7 +180,7 @@ class SearchProvider
             }
         }
 
-        //sort array
+        // sort array
         ksort($results);
 
         return $results;
@@ -197,9 +195,9 @@ class SearchProvider
      */
     public function parse($pattern)
     {
-        //reset must be extracted
+        // reset must be extracted
         $this->mustBeExtracted = [];
-        //filter to lower and remove accentued
+        // filter to lower and remove accentued
         $filteredPattern = mb_strtolower($this->remove_accents($pattern));
 
         $terms = $this->extractTerms($filteredPattern);
@@ -228,19 +226,19 @@ class SearchProvider
      *
      * @param type $subject
      *
-     * @throws ParsingException
-     *
      * @return string
+     *
+     * @throws ParsingException
      */
     private function extractDomain(&$subject)
     {
         preg_match_all('/@([a-z]+)/', $subject, $terms);
 
-        if (count($terms[0]) > 1) {
+        if (\count($terms[0]) > 1) {
             throw new ParsingException('You should not have more than one domain.');
         }
 
-        //add pattern to be extracted
+        // add pattern to be extracted
         if (isset($terms[0][0])) {
             $this->mustBeExtracted[] = $terms[0][0];
         }
@@ -255,12 +253,12 @@ class SearchProvider
         preg_match_all('/([a-z\-]+):(([^"][\S\-]+)|"[^"]*")/', (string) $subject, $matches);
 
         foreach ($matches[2] as $key => $match) {
-            //remove from search pattern
+            // remove from search pattern
             $this->mustBeExtracted[] = $matches[0][$key];
-            //strip parenthesis
+            // strip parenthesis
             if (
-                mb_substr((string) $match, 0, 1) === '"'
-                  && mb_substr((string) $match, mb_strlen((string) $match) - 1) === '"'
+                '"' === mb_substr((string) $match, 0, 1)
+                  && '"' === mb_substr((string) $match, mb_strlen((string) $match) - 1)
             ) {
                 $match = trim(mb_substr((string) $match, 1, mb_strlen((string) $match) - 2));
             }
@@ -279,7 +277,7 @@ class SearchProvider
      *
      * @param string $string Text that might have accent characters
      *
-     * @return string Filtered string with replaced "nice" characters.
+     * @return string filtered string with replaced "nice" characters
      *
      * @license GNU GPLv2 : https://core.trac.wordpress.org/browser/tags/4.1/src/license.txt
      */
@@ -289,182 +287,182 @@ class SearchProvider
             return $string;
         }
 
-        //if ($this->seems_utf8($string)) { // remove from wordpress: we use only UTF-8
+        // if ($this->seems_utf8($string)) { // remove from wordpress: we use only UTF-8
         if (true) {
             $chars = [
                 // Decompositions for Latin-1 Supplement
-                chr(194) . chr(170) => 'a', chr(194) . chr(186) => 'o',
-                chr(195) . chr(128) => 'A', chr(195) . chr(129) => 'A',
-                chr(195) . chr(130) => 'A', chr(195) . chr(131) => 'A',
-                chr(195) . chr(132) => 'A', chr(195) . chr(133) => 'A',
-                chr(195) . chr(134) => 'AE', chr(195) . chr(135) => 'C',
-                chr(195) . chr(136) => 'E', chr(195) . chr(137) => 'E',
-                chr(195) . chr(138) => 'E', chr(195) . chr(139) => 'E',
-                chr(195) . chr(140) => 'I', chr(195) . chr(141) => 'I',
-                chr(195) . chr(142) => 'I', chr(195) . chr(143) => 'I',
-                chr(195) . chr(144) => 'D', chr(195) . chr(145) => 'N',
-                chr(195) . chr(146) => 'O', chr(195) . chr(147) => 'O',
-                chr(195) . chr(148) => 'O', chr(195) . chr(149) => 'O',
-                chr(195) . chr(150) => 'O', chr(195) . chr(153) => 'U',
-                chr(195) . chr(154) => 'U', chr(195) . chr(155) => 'U',
-                chr(195) . chr(156) => 'U', chr(195) . chr(157) => 'Y',
-                chr(195) . chr(158) => 'TH', chr(195) . chr(159) => 's',
-                chr(195) . chr(160) => 'a', chr(195) . chr(161) => 'a',
-                chr(195) . chr(162) => 'a', chr(195) . chr(163) => 'a',
-                chr(195) . chr(164) => 'a', chr(195) . chr(165) => 'a',
-                chr(195) . chr(166) => 'ae', chr(195) . chr(167) => 'c',
-                chr(195) . chr(168) => 'e', chr(195) . chr(169) => 'e',
-                chr(195) . chr(170) => 'e', chr(195) . chr(171) => 'e',
-                chr(195) . chr(172) => 'i', chr(195) . chr(173) => 'i',
-                chr(195) . chr(174) => 'i', chr(195) . chr(175) => 'i',
-                chr(195) . chr(176) => 'd', chr(195) . chr(177) => 'n',
-                chr(195) . chr(178) => 'o', chr(195) . chr(179) => 'o',
-                chr(195) . chr(180) => 'o', chr(195) . chr(181) => 'o',
-                chr(195) . chr(182) => 'o', chr(195) . chr(184) => 'o',
-                chr(195) . chr(185) => 'u', chr(195) . chr(186) => 'u',
-                chr(195) . chr(187) => 'u', chr(195) . chr(188) => 'u',
-                chr(195) . chr(189) => 'y', chr(195) . chr(190) => 'th',
-                chr(195) . chr(191) => 'y', chr(195) . chr(152) => 'O',
+                \chr(194).\chr(170) => 'a', \chr(194).\chr(186) => 'o',
+                \chr(195).\chr(128) => 'A', \chr(195).\chr(129) => 'A',
+                \chr(195).\chr(130) => 'A', \chr(195).\chr(131) => 'A',
+                \chr(195).\chr(132) => 'A', \chr(195).\chr(133) => 'A',
+                \chr(195).\chr(134) => 'AE', \chr(195).\chr(135) => 'C',
+                \chr(195).\chr(136) => 'E', \chr(195).\chr(137) => 'E',
+                \chr(195).\chr(138) => 'E', \chr(195).\chr(139) => 'E',
+                \chr(195).\chr(140) => 'I', \chr(195).\chr(141) => 'I',
+                \chr(195).\chr(142) => 'I', \chr(195).\chr(143) => 'I',
+                \chr(195).\chr(144) => 'D', \chr(195).\chr(145) => 'N',
+                \chr(195).\chr(146) => 'O', \chr(195).\chr(147) => 'O',
+                \chr(195).\chr(148) => 'O', \chr(195).\chr(149) => 'O',
+                \chr(195).\chr(150) => 'O', \chr(195).\chr(153) => 'U',
+                \chr(195).\chr(154) => 'U', \chr(195).\chr(155) => 'U',
+                \chr(195).\chr(156) => 'U', \chr(195).\chr(157) => 'Y',
+                \chr(195).\chr(158) => 'TH', \chr(195).\chr(159) => 's',
+                \chr(195).\chr(160) => 'a', \chr(195).\chr(161) => 'a',
+                \chr(195).\chr(162) => 'a', \chr(195).\chr(163) => 'a',
+                \chr(195).\chr(164) => 'a', \chr(195).\chr(165) => 'a',
+                \chr(195).\chr(166) => 'ae', \chr(195).\chr(167) => 'c',
+                \chr(195).\chr(168) => 'e', \chr(195).\chr(169) => 'e',
+                \chr(195).\chr(170) => 'e', \chr(195).\chr(171) => 'e',
+                \chr(195).\chr(172) => 'i', \chr(195).\chr(173) => 'i',
+                \chr(195).\chr(174) => 'i', \chr(195).\chr(175) => 'i',
+                \chr(195).\chr(176) => 'd', \chr(195).\chr(177) => 'n',
+                \chr(195).\chr(178) => 'o', \chr(195).\chr(179) => 'o',
+                \chr(195).\chr(180) => 'o', \chr(195).\chr(181) => 'o',
+                \chr(195).\chr(182) => 'o', \chr(195).\chr(184) => 'o',
+                \chr(195).\chr(185) => 'u', \chr(195).\chr(186) => 'u',
+                \chr(195).\chr(187) => 'u', \chr(195).\chr(188) => 'u',
+                \chr(195).\chr(189) => 'y', \chr(195).\chr(190) => 'th',
+                \chr(195).\chr(191) => 'y', \chr(195).\chr(152) => 'O',
                 // Decompositions for Latin Extended-A
-                chr(196) . chr(128) => 'A', chr(196) . chr(129) => 'a',
-                chr(196) . chr(130) => 'A', chr(196) . chr(131) => 'a',
-                chr(196) . chr(132) => 'A', chr(196) . chr(133) => 'a',
-                chr(196) . chr(134) => 'C', chr(196) . chr(135) => 'c',
-                chr(196) . chr(136) => 'C', chr(196) . chr(137) => 'c',
-                chr(196) . chr(138) => 'C', chr(196) . chr(139) => 'c',
-                chr(196) . chr(140) => 'C', chr(196) . chr(141) => 'c',
-                chr(196) . chr(142) => 'D', chr(196) . chr(143) => 'd',
-                chr(196) . chr(144) => 'D', chr(196) . chr(145) => 'd',
-                chr(196) . chr(146) => 'E', chr(196) . chr(147) => 'e',
-                chr(196) . chr(148) => 'E', chr(196) . chr(149) => 'e',
-                chr(196) . chr(150) => 'E', chr(196) . chr(151) => 'e',
-                chr(196) . chr(152) => 'E', chr(196) . chr(153) => 'e',
-                chr(196) . chr(154) => 'E', chr(196) . chr(155) => 'e',
-                chr(196) . chr(156) => 'G', chr(196) . chr(157) => 'g',
-                chr(196) . chr(158) => 'G', chr(196) . chr(159) => 'g',
-                chr(196) . chr(160) => 'G', chr(196) . chr(161) => 'g',
-                chr(196) . chr(162) => 'G', chr(196) . chr(163) => 'g',
-                chr(196) . chr(164) => 'H', chr(196) . chr(165) => 'h',
-                chr(196) . chr(166) => 'H', chr(196) . chr(167) => 'h',
-                chr(196) . chr(168) => 'I', chr(196) . chr(169) => 'i',
-                chr(196) . chr(170) => 'I', chr(196) . chr(171) => 'i',
-                chr(196) . chr(172) => 'I', chr(196) . chr(173) => 'i',
-                chr(196) . chr(174) => 'I', chr(196) . chr(175) => 'i',
-                chr(196) . chr(176) => 'I', chr(196) . chr(177) => 'i',
-                chr(196) . chr(178) => 'IJ', chr(196) . chr(179) => 'ij',
-                chr(196) . chr(180) => 'J', chr(196) . chr(181) => 'j',
-                chr(196) . chr(182) => 'K', chr(196) . chr(183) => 'k',
-                chr(196) . chr(184) => 'k', chr(196) . chr(185) => 'L',
-                chr(196) . chr(186) => 'l', chr(196) . chr(187) => 'L',
-                chr(196) . chr(188) => 'l', chr(196) . chr(189) => 'L',
-                chr(196) . chr(190) => 'l', chr(196) . chr(191) => 'L',
-                chr(197) . chr(128) => 'l', chr(197) . chr(129) => 'L',
-                chr(197) . chr(130) => 'l', chr(197) . chr(131) => 'N',
-                chr(197) . chr(132) => 'n', chr(197) . chr(133) => 'N',
-                chr(197) . chr(134) => 'n', chr(197) . chr(135) => 'N',
-                chr(197) . chr(136) => 'n', chr(197) . chr(137) => 'N',
-                chr(197) . chr(138) => 'n', chr(197) . chr(139) => 'N',
-                chr(197) . chr(140) => 'O', chr(197) . chr(141) => 'o',
-                chr(197) . chr(142) => 'O', chr(197) . chr(143) => 'o',
-                chr(197) . chr(144) => 'O', chr(197) . chr(145) => 'o',
-                chr(197) . chr(146) => 'OE', chr(197) . chr(147) => 'oe',
-                chr(197) . chr(148) => 'R', chr(197) . chr(149) => 'r',
-                chr(197) . chr(150) => 'R', chr(197) . chr(151) => 'r',
-                chr(197) . chr(152) => 'R', chr(197) . chr(153) => 'r',
-                chr(197) . chr(154) => 'S', chr(197) . chr(155) => 's',
-                chr(197) . chr(156) => 'S', chr(197) . chr(157) => 's',
-                chr(197) . chr(158) => 'S', chr(197) . chr(159) => 's',
-                chr(197) . chr(160) => 'S', chr(197) . chr(161) => 's',
-                chr(197) . chr(162) => 'T', chr(197) . chr(163) => 't',
-                chr(197) . chr(164) => 'T', chr(197) . chr(165) => 't',
-                chr(197) . chr(166) => 'T', chr(197) . chr(167) => 't',
-                chr(197) . chr(168) => 'U', chr(197) . chr(169) => 'u',
-                chr(197) . chr(170) => 'U', chr(197) . chr(171) => 'u',
-                chr(197) . chr(172) => 'U', chr(197) . chr(173) => 'u',
-                chr(197) . chr(174) => 'U', chr(197) . chr(175) => 'u',
-                chr(197) . chr(176) => 'U', chr(197) . chr(177) => 'u',
-                chr(197) . chr(178) => 'U', chr(197) . chr(179) => 'u',
-                chr(197) . chr(180) => 'W', chr(197) . chr(181) => 'w',
-                chr(197) . chr(182) => 'Y', chr(197) . chr(183) => 'y',
-                chr(197) . chr(184) => 'Y', chr(197) . chr(185) => 'Z',
-                chr(197) . chr(186) => 'z', chr(197) . chr(187) => 'Z',
-                chr(197) . chr(188) => 'z', chr(197) . chr(189) => 'Z',
-                chr(197) . chr(190) => 'z', chr(197) . chr(191) => 's',
+                \chr(196).\chr(128) => 'A', \chr(196).\chr(129) => 'a',
+                \chr(196).\chr(130) => 'A', \chr(196).\chr(131) => 'a',
+                \chr(196).\chr(132) => 'A', \chr(196).\chr(133) => 'a',
+                \chr(196).\chr(134) => 'C', \chr(196).\chr(135) => 'c',
+                \chr(196).\chr(136) => 'C', \chr(196).\chr(137) => 'c',
+                \chr(196).\chr(138) => 'C', \chr(196).\chr(139) => 'c',
+                \chr(196).\chr(140) => 'C', \chr(196).\chr(141) => 'c',
+                \chr(196).\chr(142) => 'D', \chr(196).\chr(143) => 'd',
+                \chr(196).\chr(144) => 'D', \chr(196).\chr(145) => 'd',
+                \chr(196).\chr(146) => 'E', \chr(196).\chr(147) => 'e',
+                \chr(196).\chr(148) => 'E', \chr(196).\chr(149) => 'e',
+                \chr(196).\chr(150) => 'E', \chr(196).\chr(151) => 'e',
+                \chr(196).\chr(152) => 'E', \chr(196).\chr(153) => 'e',
+                \chr(196).\chr(154) => 'E', \chr(196).\chr(155) => 'e',
+                \chr(196).\chr(156) => 'G', \chr(196).\chr(157) => 'g',
+                \chr(196).\chr(158) => 'G', \chr(196).\chr(159) => 'g',
+                \chr(196).\chr(160) => 'G', \chr(196).\chr(161) => 'g',
+                \chr(196).\chr(162) => 'G', \chr(196).\chr(163) => 'g',
+                \chr(196).\chr(164) => 'H', \chr(196).\chr(165) => 'h',
+                \chr(196).\chr(166) => 'H', \chr(196).\chr(167) => 'h',
+                \chr(196).\chr(168) => 'I', \chr(196).\chr(169) => 'i',
+                \chr(196).\chr(170) => 'I', \chr(196).\chr(171) => 'i',
+                \chr(196).\chr(172) => 'I', \chr(196).\chr(173) => 'i',
+                \chr(196).\chr(174) => 'I', \chr(196).\chr(175) => 'i',
+                \chr(196).\chr(176) => 'I', \chr(196).\chr(177) => 'i',
+                \chr(196).\chr(178) => 'IJ', \chr(196).\chr(179) => 'ij',
+                \chr(196).\chr(180) => 'J', \chr(196).\chr(181) => 'j',
+                \chr(196).\chr(182) => 'K', \chr(196).\chr(183) => 'k',
+                \chr(196).\chr(184) => 'k', \chr(196).\chr(185) => 'L',
+                \chr(196).\chr(186) => 'l', \chr(196).\chr(187) => 'L',
+                \chr(196).\chr(188) => 'l', \chr(196).\chr(189) => 'L',
+                \chr(196).\chr(190) => 'l', \chr(196).\chr(191) => 'L',
+                \chr(197).\chr(128) => 'l', \chr(197).\chr(129) => 'L',
+                \chr(197).\chr(130) => 'l', \chr(197).\chr(131) => 'N',
+                \chr(197).\chr(132) => 'n', \chr(197).\chr(133) => 'N',
+                \chr(197).\chr(134) => 'n', \chr(197).\chr(135) => 'N',
+                \chr(197).\chr(136) => 'n', \chr(197).\chr(137) => 'N',
+                \chr(197).\chr(138) => 'n', \chr(197).\chr(139) => 'N',
+                \chr(197).\chr(140) => 'O', \chr(197).\chr(141) => 'o',
+                \chr(197).\chr(142) => 'O', \chr(197).\chr(143) => 'o',
+                \chr(197).\chr(144) => 'O', \chr(197).\chr(145) => 'o',
+                \chr(197).\chr(146) => 'OE', \chr(197).\chr(147) => 'oe',
+                \chr(197).\chr(148) => 'R', \chr(197).\chr(149) => 'r',
+                \chr(197).\chr(150) => 'R', \chr(197).\chr(151) => 'r',
+                \chr(197).\chr(152) => 'R', \chr(197).\chr(153) => 'r',
+                \chr(197).\chr(154) => 'S', \chr(197).\chr(155) => 's',
+                \chr(197).\chr(156) => 'S', \chr(197).\chr(157) => 's',
+                \chr(197).\chr(158) => 'S', \chr(197).\chr(159) => 's',
+                \chr(197).\chr(160) => 'S', \chr(197).\chr(161) => 's',
+                \chr(197).\chr(162) => 'T', \chr(197).\chr(163) => 't',
+                \chr(197).\chr(164) => 'T', \chr(197).\chr(165) => 't',
+                \chr(197).\chr(166) => 'T', \chr(197).\chr(167) => 't',
+                \chr(197).\chr(168) => 'U', \chr(197).\chr(169) => 'u',
+                \chr(197).\chr(170) => 'U', \chr(197).\chr(171) => 'u',
+                \chr(197).\chr(172) => 'U', \chr(197).\chr(173) => 'u',
+                \chr(197).\chr(174) => 'U', \chr(197).\chr(175) => 'u',
+                \chr(197).\chr(176) => 'U', \chr(197).\chr(177) => 'u',
+                \chr(197).\chr(178) => 'U', \chr(197).\chr(179) => 'u',
+                \chr(197).\chr(180) => 'W', \chr(197).\chr(181) => 'w',
+                \chr(197).\chr(182) => 'Y', \chr(197).\chr(183) => 'y',
+                \chr(197).\chr(184) => 'Y', \chr(197).\chr(185) => 'Z',
+                \chr(197).\chr(186) => 'z', \chr(197).\chr(187) => 'Z',
+                \chr(197).\chr(188) => 'z', \chr(197).\chr(189) => 'Z',
+                \chr(197).\chr(190) => 'z', \chr(197).\chr(191) => 's',
                 // Decompositions for Latin Extended-B
-                chr(200) . chr(152) => 'S', chr(200) . chr(153) => 's',
-                chr(200) . chr(154) => 'T', chr(200) . chr(155) => 't',
+                \chr(200).\chr(152) => 'S', \chr(200).\chr(153) => 's',
+                \chr(200).\chr(154) => 'T', \chr(200).\chr(155) => 't',
                 // Euro Sign
-                chr(226) . chr(130) . chr(172) => 'E',
+                \chr(226).\chr(130).\chr(172) => 'E',
                 // GBP (Pound) Sign
-                chr(194) . chr(163) => '',
+                \chr(194).\chr(163) => '',
                 // Vowels with diacritic (Vietnamese)
                 // unmarked
-                chr(198) . chr(160) => 'O', chr(198) . chr(161) => 'o',
-                chr(198) . chr(175) => 'U', chr(198) . chr(176) => 'u',
+                \chr(198).\chr(160) => 'O', \chr(198).\chr(161) => 'o',
+                \chr(198).\chr(175) => 'U', \chr(198).\chr(176) => 'u',
                 // grave accent
-                chr(225) . chr(186) . chr(166) => 'A', chr(225) . chr(186) . chr(167) => 'a',
-                chr(225) . chr(186) . chr(176) => 'A', chr(225) . chr(186) . chr(177) => 'a',
-                chr(225) . chr(187) . chr(128) => 'E', chr(225) . chr(187) . chr(129) => 'e',
-                chr(225) . chr(187) . chr(146) => 'O', chr(225) . chr(187) . chr(147) => 'o',
-                chr(225) . chr(187) . chr(156) => 'O', chr(225) . chr(187) . chr(157) => 'o',
-                chr(225) . chr(187) . chr(170) => 'U', chr(225) . chr(187) . chr(171) => 'u',
-                chr(225) . chr(187) . chr(178) => 'Y', chr(225) . chr(187) . chr(179) => 'y',
+                \chr(225).\chr(186).\chr(166) => 'A', \chr(225).\chr(186).\chr(167) => 'a',
+                \chr(225).\chr(186).\chr(176) => 'A', \chr(225).\chr(186).\chr(177) => 'a',
+                \chr(225).\chr(187).\chr(128) => 'E', \chr(225).\chr(187).\chr(129) => 'e',
+                \chr(225).\chr(187).\chr(146) => 'O', \chr(225).\chr(187).\chr(147) => 'o',
+                \chr(225).\chr(187).\chr(156) => 'O', \chr(225).\chr(187).\chr(157) => 'o',
+                \chr(225).\chr(187).\chr(170) => 'U', \chr(225).\chr(187).\chr(171) => 'u',
+                \chr(225).\chr(187).\chr(178) => 'Y', \chr(225).\chr(187).\chr(179) => 'y',
                 // hook
-                chr(225) . chr(186) . chr(162) => 'A', chr(225) . chr(186) . chr(163) => 'a',
-                chr(225) . chr(186) . chr(168) => 'A', chr(225) . chr(186) . chr(169) => 'a',
-                chr(225) . chr(186) . chr(178) => 'A', chr(225) . chr(186) . chr(179) => 'a',
-                chr(225) . chr(186) . chr(186) => 'E', chr(225) . chr(186) . chr(187) => 'e',
-                chr(225) . chr(187) . chr(130) => 'E', chr(225) . chr(187) . chr(131) => 'e',
-                chr(225) . chr(187) . chr(136) => 'I', chr(225) . chr(187) . chr(137) => 'i',
-                chr(225) . chr(187) . chr(142) => 'O', chr(225) . chr(187) . chr(143) => 'o',
-                chr(225) . chr(187) . chr(148) => 'O', chr(225) . chr(187) . chr(149) => 'o',
-                chr(225) . chr(187) . chr(158) => 'O', chr(225) . chr(187) . chr(159) => 'o',
-                chr(225) . chr(187) . chr(166) => 'U', chr(225) . chr(187) . chr(167) => 'u',
-                chr(225) . chr(187) . chr(172) => 'U', chr(225) . chr(187) . chr(173) => 'u',
-                chr(225) . chr(187) . chr(182) => 'Y', chr(225) . chr(187) . chr(183) => 'y',
+                \chr(225).\chr(186).\chr(162) => 'A', \chr(225).\chr(186).\chr(163) => 'a',
+                \chr(225).\chr(186).\chr(168) => 'A', \chr(225).\chr(186).\chr(169) => 'a',
+                \chr(225).\chr(186).\chr(178) => 'A', \chr(225).\chr(186).\chr(179) => 'a',
+                \chr(225).\chr(186).\chr(186) => 'E', \chr(225).\chr(186).\chr(187) => 'e',
+                \chr(225).\chr(187).\chr(130) => 'E', \chr(225).\chr(187).\chr(131) => 'e',
+                \chr(225).\chr(187).\chr(136) => 'I', \chr(225).\chr(187).\chr(137) => 'i',
+                \chr(225).\chr(187).\chr(142) => 'O', \chr(225).\chr(187).\chr(143) => 'o',
+                \chr(225).\chr(187).\chr(148) => 'O', \chr(225).\chr(187).\chr(149) => 'o',
+                \chr(225).\chr(187).\chr(158) => 'O', \chr(225).\chr(187).\chr(159) => 'o',
+                \chr(225).\chr(187).\chr(166) => 'U', \chr(225).\chr(187).\chr(167) => 'u',
+                \chr(225).\chr(187).\chr(172) => 'U', \chr(225).\chr(187).\chr(173) => 'u',
+                \chr(225).\chr(187).\chr(182) => 'Y', \chr(225).\chr(187).\chr(183) => 'y',
                 // tilde
-                chr(225) . chr(186) . chr(170) => 'A', chr(225) . chr(186) . chr(171) => 'a',
-                chr(225) . chr(186) . chr(180) => 'A', chr(225) . chr(186) . chr(181) => 'a',
-                chr(225) . chr(186) . chr(188) => 'E', chr(225) . chr(186) . chr(189) => 'e',
-                chr(225) . chr(187) . chr(132) => 'E', chr(225) . chr(187) . chr(133) => 'e',
-                chr(225) . chr(187) . chr(150) => 'O', chr(225) . chr(187) . chr(151) => 'o',
-                chr(225) . chr(187) . chr(160) => 'O', chr(225) . chr(187) . chr(161) => 'o',
-                chr(225) . chr(187) . chr(174) => 'U', chr(225) . chr(187) . chr(175) => 'u',
-                chr(225) . chr(187) . chr(184) => 'Y', chr(225) . chr(187) . chr(185) => 'y',
+                \chr(225).\chr(186).\chr(170) => 'A', \chr(225).\chr(186).\chr(171) => 'a',
+                \chr(225).\chr(186).\chr(180) => 'A', \chr(225).\chr(186).\chr(181) => 'a',
+                \chr(225).\chr(186).\chr(188) => 'E', \chr(225).\chr(186).\chr(189) => 'e',
+                \chr(225).\chr(187).\chr(132) => 'E', \chr(225).\chr(187).\chr(133) => 'e',
+                \chr(225).\chr(187).\chr(150) => 'O', \chr(225).\chr(187).\chr(151) => 'o',
+                \chr(225).\chr(187).\chr(160) => 'O', \chr(225).\chr(187).\chr(161) => 'o',
+                \chr(225).\chr(187).\chr(174) => 'U', \chr(225).\chr(187).\chr(175) => 'u',
+                \chr(225).\chr(187).\chr(184) => 'Y', \chr(225).\chr(187).\chr(185) => 'y',
                 // acute accent
-                chr(225) . chr(186) . chr(164) => 'A', chr(225) . chr(186) . chr(165) => 'a',
-                chr(225) . chr(186) . chr(174) => 'A', chr(225) . chr(186) . chr(175) => 'a',
-                chr(225) . chr(186) . chr(190) => 'E', chr(225) . chr(186) . chr(191) => 'e',
-                chr(225) . chr(187) . chr(144) => 'O', chr(225) . chr(187) . chr(145) => 'o',
-                chr(225) . chr(187) . chr(154) => 'O', chr(225) . chr(187) . chr(155) => 'o',
-                chr(225) . chr(187) . chr(168) => 'U', chr(225) . chr(187) . chr(169) => 'u',
+                \chr(225).\chr(186).\chr(164) => 'A', \chr(225).\chr(186).\chr(165) => 'a',
+                \chr(225).\chr(186).\chr(174) => 'A', \chr(225).\chr(186).\chr(175) => 'a',
+                \chr(225).\chr(186).\chr(190) => 'E', \chr(225).\chr(186).\chr(191) => 'e',
+                \chr(225).\chr(187).\chr(144) => 'O', \chr(225).\chr(187).\chr(145) => 'o',
+                \chr(225).\chr(187).\chr(154) => 'O', \chr(225).\chr(187).\chr(155) => 'o',
+                \chr(225).\chr(187).\chr(168) => 'U', \chr(225).\chr(187).\chr(169) => 'u',
                 // dot below
-                chr(225) . chr(186) . chr(160) => 'A', chr(225) . chr(186) . chr(161) => 'a',
-                chr(225) . chr(186) . chr(172) => 'A', chr(225) . chr(186) . chr(173) => 'a',
-                chr(225) . chr(186) . chr(182) => 'A', chr(225) . chr(186) . chr(183) => 'a',
-                chr(225) . chr(186) . chr(184) => 'E', chr(225) . chr(186) . chr(185) => 'e',
-                chr(225) . chr(187) . chr(134) => 'E', chr(225) . chr(187) . chr(135) => 'e',
-                chr(225) . chr(187) . chr(138) => 'I', chr(225) . chr(187) . chr(139) => 'i',
-                chr(225) . chr(187) . chr(140) => 'O', chr(225) . chr(187) . chr(141) => 'o',
-                chr(225) . chr(187) . chr(152) => 'O', chr(225) . chr(187) . chr(153) => 'o',
-                chr(225) . chr(187) . chr(162) => 'O', chr(225) . chr(187) . chr(163) => 'o',
-                chr(225) . chr(187) . chr(164) => 'U', chr(225) . chr(187) . chr(165) => 'u',
-                chr(225) . chr(187) . chr(176) => 'U', chr(225) . chr(187) . chr(177) => 'u',
-                chr(225) . chr(187) . chr(180) => 'Y', chr(225) . chr(187) . chr(181) => 'y',
+                \chr(225).\chr(186).\chr(160) => 'A', \chr(225).\chr(186).\chr(161) => 'a',
+                \chr(225).\chr(186).\chr(172) => 'A', \chr(225).\chr(186).\chr(173) => 'a',
+                \chr(225).\chr(186).\chr(182) => 'A', \chr(225).\chr(186).\chr(183) => 'a',
+                \chr(225).\chr(186).\chr(184) => 'E', \chr(225).\chr(186).\chr(185) => 'e',
+                \chr(225).\chr(187).\chr(134) => 'E', \chr(225).\chr(187).\chr(135) => 'e',
+                \chr(225).\chr(187).\chr(138) => 'I', \chr(225).\chr(187).\chr(139) => 'i',
+                \chr(225).\chr(187).\chr(140) => 'O', \chr(225).\chr(187).\chr(141) => 'o',
+                \chr(225).\chr(187).\chr(152) => 'O', \chr(225).\chr(187).\chr(153) => 'o',
+                \chr(225).\chr(187).\chr(162) => 'O', \chr(225).\chr(187).\chr(163) => 'o',
+                \chr(225).\chr(187).\chr(164) => 'U', \chr(225).\chr(187).\chr(165) => 'u',
+                \chr(225).\chr(187).\chr(176) => 'U', \chr(225).\chr(187).\chr(177) => 'u',
+                \chr(225).\chr(187).\chr(180) => 'Y', \chr(225).\chr(187).\chr(181) => 'y',
                 // Vowels with diacritic (Chinese, Hanyu Pinyin)
-                chr(201) . chr(145) => 'a',
+                \chr(201).\chr(145) => 'a',
                 // macron
-                chr(199) . chr(149) => 'U', chr(199) . chr(150) => 'u',
+                \chr(199).\chr(149) => 'U', \chr(199).\chr(150) => 'u',
                 // acute accent
-                chr(199) . chr(151) => 'U', chr(199) . chr(152) => 'u',
+                \chr(199).\chr(151) => 'U', \chr(199).\chr(152) => 'u',
                 // caron
-                chr(199) . chr(141) => 'A', chr(199) . chr(142) => 'a',
-                chr(199) . chr(143) => 'I', chr(199) . chr(144) => 'i',
-                chr(199) . chr(145) => 'O', chr(199) . chr(146) => 'o',
-                chr(199) . chr(147) => 'U', chr(199) . chr(148) => 'u',
-                chr(199) . chr(153) => 'U', chr(199) . chr(154) => 'u',
+                \chr(199).\chr(141) => 'A', \chr(199).\chr(142) => 'a',
+                \chr(199).\chr(143) => 'I', \chr(199).\chr(144) => 'i',
+                \chr(199).\chr(145) => 'O', \chr(199).\chr(146) => 'o',
+                \chr(199).\chr(147) => 'U', \chr(199).\chr(148) => 'u',
+                \chr(199).\chr(153) => 'U', \chr(199).\chr(154) => 'u',
                 // grave accent
-                chr(199) . chr(155) => 'U', chr(199) . chr(156) => 'u',
+                \chr(199).\chr(155) => 'U', \chr(199).\chr(156) => 'u',
             ];
 
             // Used for locale-specific rules
diff --git a/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php b/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php
index 110bfee9c..3f3ea6dee 100644
--- a/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php
+++ b/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php
@@ -11,12 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
-use Exception;
-
 /**
  * Throw by search provider when the search name is not found.
  */
-class UnknowSearchDomainException extends Exception
+class UnknowSearchDomainException extends \Exception
 {
     private $domain;
 
diff --git a/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php b/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php
index 7f65aaf22..69e7a135f 100644
--- a/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php
+++ b/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php
@@ -11,12 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
-use Exception;
-
 /**
  * Throw by search provider when the search name is not found.
  */
-class UnknowSearchNameException extends Exception
+class UnknowSearchNameException extends \Exception
 {
     private $name;
 
diff --git a/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php b/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php
index 3c9be8954..f858797f5 100644
--- a/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php
+++ b/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php
@@ -11,12 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search\Utils;
 
-use DateTimeImmutable;
-
-use function preg_match_all;
-use function strtr;
-use function trim;
-
 class ExtractDateFromPattern
 {
     private const DATE_PATTERN = [
@@ -32,15 +26,15 @@ class ExtractDateFromPattern
 
         foreach (self::DATE_PATTERN as [$pattern, $format]) {
             $matches = [];
-            preg_match_all($pattern, $filteredSubject, $matches);
+            \preg_match_all($pattern, $filteredSubject, $matches);
 
             foreach ($matches[0] as $match) {
-                $date = DateTimeImmutable::createFromFormat($format, $match);
+                $date = \DateTimeImmutable::createFromFormat($format, $match);
 
                 if (false !== $date) {
                     $dates[] = $date;
                     // filter string: remove what is found
-                    $filteredSubject = trim(strtr($filteredSubject, [$match => '']));
+                    $filteredSubject = \trim(\strtr($filteredSubject, [$match => '']));
                 }
             }
         }
diff --git a/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php b/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
index ce79a637b..1823e462c 100644
--- a/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
+++ b/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
@@ -12,15 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Search\Utils;
 
 use libphonenumber\PhoneNumberUtil;
-use LogicException;
-
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-use function count;
-use function implode;
-use function preg_match;
-use function str_split;
-use function strtr;
-use function trim;
 
 class ExtractPhonenumberFromPattern
 {
@@ -36,19 +28,19 @@ class ExtractPhonenumberFromPattern
     public function extractPhonenumber(string $subject): SearchExtractionResult
     {
         $matches = [];
-        preg_match(self::PATTERN, $subject, $matches);
+        \preg_match(self::PATTERN, $subject, $matches);
 
-        if (0 < count($matches)) {
+        if (0 < \count($matches)) {
             $phonenumber = [];
             $length = 0;
 
-            foreach (str_split(trim($matches[0])) as $key => $char) {
+            foreach (\str_split(\trim($matches[0])) as $key => $char) {
                 switch ($char) {
                     case '+':
                         if (0 === $key) {
                             $phonenumber[] = $char;
                         } else {
-                            throw new LogicException('should not match not alnum character');
+                            throw new \LogicException('should not match not alnum character');
                         }
 
                         break;
@@ -58,7 +50,7 @@ class ExtractPhonenumberFromPattern
 
                         if (0 === $key) {
                             $util = PhoneNumberUtil::getInstance();
-                            $phonenumber[] = '+' . $util->getCountryCodeForRegion($this->defaultCarrierCode);
+                            $phonenumber[] = '+'.$util->getCountryCodeForRegion($this->defaultCarrierCode);
                         } else {
                             $phonenumber[] = $char;
                         }
@@ -83,14 +75,14 @@ class ExtractPhonenumberFromPattern
                         break;
 
                     default:
-                        throw new LogicException('should not match not alnum character');
+                        throw new \LogicException('should not match not alnum character');
                 }
             }
 
             if (5 < $length) {
-                $filtered = trim(strtr($subject, [$matches[0] => '']));
+                $filtered = \trim(\strtr($subject, [$matches[0] => '']));
 
-                return new SearchExtractionResult($filtered, [implode('', $phonenumber)]);
+                return new SearchExtractionResult($filtered, [\implode('', $phonenumber)]);
             }
         }
 
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
index 934a80956..d80020285 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
@@ -11,14 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Security\Authorization;
 
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 
-use function get_class;
-use function in_array;
-
-use const E_USER_DEPRECATED;
-
 /**
  * Voter for Chill software.
  *
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
index 413492915..e37c3171e 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
@@ -20,11 +20,6 @@ use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Traversable;
-use UnexpectedValueException;
-
-use function array_merge;
-use function get_class;
 
 /**
  * Helper for authorizations.
@@ -44,7 +39,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
     /**
      * Filter an array of centers, return only center which are reachable.
      *
-     * @param User $user The user
+     * @param User  $user    The user
      * @param array $centers a list of centers which are going to be filtered
      */
     public function filterReachableCenters(User $user, array $centers, mixed $role): array
@@ -63,10 +58,9 @@ class AuthorizationHelper implements AuthorizationHelperInterface
     /**
      * @deprecated use UserACLAwareRepositoryInterface::findUsersByReachedACL instead
      *
-     *
      * @return User[]
      */
-    public function findUsersReaching(string $role, array|\Chill\MainBundle\Entity\Center $center, null|array|\Chill\MainBundle\Entity\Scope $scope = null, bool $onlyEnabled = true): array
+    public function findUsersReaching(string $role, array|\Chill\MainBundle\Entity\Center $center, array|\Chill\MainBundle\Entity\Scope $scope = null, bool $onlyEnabled = true): array
     {
         return $this->userACLAwareRepository
             ->findUsersByReachedACL($role, $center, $scope, $onlyEnabled);
@@ -91,7 +85,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
      *
      * @return list<Center>
      */
-    public function getReachableCenters(UserInterface $user, string $role, ?Scope $scope = null): array
+    public function getReachableCenters(UserInterface $user, string $role, Scope $scope = null): array
     {
         if (!$user instanceof User) {
             return [];
@@ -102,9 +96,9 @@ class AuthorizationHelper implements AuthorizationHelperInterface
 
         foreach ($user->getGroupCenters() as $groupCenter) {
             $permissionGroup = $groupCenter->getPermissionsGroup();
-            //iterate on roleScopes
+            // iterate on roleScopes
             foreach ($permissionGroup->getRoleScopes() as $roleScope) {
-                //check that the role is in the reachable roles
+                // check that the role is in the reachable roles
                 if ($this->isRoleReached($role, $roleScope->getRole())) {
                     if (null === $scope) {
                         $centers[spl_object_hash($groupCenter->getCenter())] = $groupCenter->getCenter();
@@ -128,6 +122,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
      * Return all reachable circle for a given user, center and role.
      *
      * @param Center|Center[] $center
+     *
      * @return Scope[]
      */
     public function getReachableCircles(UserInterface $user, string $role, array|\Chill\MainBundle\Entity\Center $center)
@@ -136,7 +131,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
 
         if (is_iterable($center)) {
             foreach ($center as $c) {
-                $scopes = array_merge($scopes, $this->getReachableCircles($user, $role, $c));
+                $scopes = \array_merge($scopes, $this->getReachableCircles($user, $role, $c));
             }
 
             return $scopes;
@@ -144,11 +139,11 @@ class AuthorizationHelper implements AuthorizationHelperInterface
 
         foreach ($user->getGroupCenters() as $groupCenter) {
             if ($center->getId() === $groupCenter->getCenter()->getId()) {
-                //iterate on permissionGroup
+                // iterate on permissionGroup
                 $permissionGroup = $groupCenter->getPermissionsGroup();
-                //iterate on roleScopes
+                // iterate on roleScopes
                 foreach ($permissionGroup->getRoleScopes() as $roleScope) {
-                    //check that the role is in the reachable roles
+                    // check that the role is in the reachable roles
                     if ($this->isRoleReached($role, $roleScope->getRole())) {
                         $scopes[] = $roleScope->getScope();
                     }
@@ -174,7 +169,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
      */
     public function userCanReachCenter(User $user, array|\Chill\MainBundle\Entity\Center $center): bool
     {
-        if ($center instanceof Traversable) {
+        if ($center instanceof \Traversable) {
             foreach ($center as $c) {
                 if ($c->userCanReachCenter($user, $c)) {
                     return true;
@@ -194,13 +189,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
             return false;
         }
 
-        throw new UnexpectedValueException(
-            sprintf(
-                'The entity given is not an instance of %s or an array of centers, %s given',
-                Center::class,
-                gettype($center)
-            )
-        );
+        throw new \UnexpectedValueException(sprintf('The entity given is not an instance of %s or an array of centers, %s given', Center::class, gettype($center)));
     }
 
     /**
@@ -229,7 +218,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
     /**
      * Test if a parent role may give access to a given child role.
      *
-     * @param string $childRole The role we want to test if he is reachable
+     * @param string $childRole  The role we want to test if he is reachable
      * @param string $parentRole The role which should give access to $childRole
      *
      * @return bool true if the child role is granted by parent role
@@ -255,11 +244,11 @@ class AuthorizationHelper implements AuthorizationHelperInterface
             // we cannot compare the objects: we must compare the ids here
             if ($groupCenter->getCenter()->getId() === $center->getId()) {
                 $permissionGroup = $groupCenter->getPermissionsGroup();
-                //iterate on roleScopes
+                // iterate on roleScopes
                 foreach ($permissionGroup->getRoleScopes() as $roleScope) {
-                    //check that the role allow to reach the required role
+                    // check that the role allow to reach the required role
                     if ($this->isRoleReached($attribute, $roleScope->getRole())) {
-                        //if yes, we have a right on something...
+                        // if yes, we have a right on something...
                         // perform check on scope if necessary
                         if ($this->scopeResolverDispatcher->isConcerned($entity)) {// here, we should also check that the role need a scope
                             $scope = $this->scopeResolverDispatcher->resolveScope($entity);
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUser.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUser.php
index bb59cc003..e9bb709a8 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUser.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUser.php
@@ -19,7 +19,7 @@ class AuthorizationHelperForCurrentUser implements AuthorizationHelperForCurrent
 {
     public function __construct(private readonly AuthorizationHelperInterface $authorizationHelper, private readonly Security $security) {}
 
-    public function getReachableCenters(string $role, ?Scope $scope = null): array
+    public function getReachableCenters(string $role, Scope $scope = null): array
     {
         if (!$this->security->getUser() instanceof User) {
             return [];
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUserInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUserInterface.php
index 54e30c244..04b34c8e5 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUserInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUserInterface.php
@@ -22,10 +22,11 @@ interface AuthorizationHelperForCurrentUserInterface
      *
      * @return Center[]
      */
-    public function getReachableCenters(string $role, ?Scope $scope = null): array;
+    public function getReachableCenters(string $role, Scope $scope = null): array;
 
     /**
      * @param list<Center>|Center $center
+     *
      * @return list<Scope>
      */
     public function getReachableScopes(string $role, array|Center $center): array;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php
index 2a8c6587c..5df54a0d6 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php
@@ -23,10 +23,11 @@ interface AuthorizationHelperInterface
      *
      * @return list<Center>
      */
-    public function getReachableCenters(UserInterface $user, string $role, ?Scope $scope = null): array;
+    public function getReachableCenters(UserInterface $user, string $role, Scope $scope = null): array;
 
     /**
      * @param Center|array<Center> $center
+     *
      * @return list<Scope>
      */
     public function getReachableScopes(UserInterface $user, string $role, array|Center $center): array;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
index 9b378231c..071388fcf 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
@@ -12,9 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
-
-use function in_array;
 
 final readonly class DefaultVoterHelper implements VoterHelperInterface
 {
@@ -27,11 +24,11 @@ final readonly class DefaultVoterHelper implements VoterHelperInterface
     {
         foreach ($this->configuration as [$attributes, $subj]) {
             if (null === $subj) {
-                if (null === $subject && in_array($attribute, $attributes, true)) {
+                if (null === $subject && \in_array($attribute, $attributes, true)) {
                     return true;
                 }
             } elseif ($subject instanceof $subj) {
-                return in_array($attribute, $attributes, true);
+                return \in_array($attribute, $attributes, true);
             }
         }
 
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
index b952d845e..805ba03e5 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Security\Authorization;
 
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
-
 class DefaultVoterHelperFactory implements VoterHelperFactoryInterface
 {
     public function __construct(protected AuthorizationHelper $authorizationHelper) {}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
index d72c60c0f..44766a583 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
@@ -16,8 +16,6 @@ use Chill\MainBundle\Workflow\EntityWorkflowManager;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
-use UnexpectedValueException;
-use function in_array;
 
 class EntityWorkflowVoter extends Voter
 {
@@ -33,12 +31,11 @@ class EntityWorkflowVoter extends Voter
 
     protected function supports($attribute, $subject)
     {
-        return $subject instanceof EntityWorkflow && in_array($attribute, self::getRoles(), true);
+        return $subject instanceof EntityWorkflow && \in_array($attribute, self::getRoles(), true);
     }
 
     /**
      * @param EntityWorkflow $subject
-     * @param mixed $attribute
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
@@ -72,10 +69,10 @@ class EntityWorkflowVoter extends Voter
                 return false;
 
             case self::DELETE:
-                return $subject->getStep() === 'initial';
+                return 'initial' === $subject->getStep();
 
             case self::SHOW_ENTITY_LINK:
-                if ($subject->getStep() === 'initial') {
+                if ('initial' === $subject->getStep()) {
                     return false;
                 }
 
@@ -88,7 +85,7 @@ class EntityWorkflowVoter extends Voter
                 return $currentStep->getPrevious()->getTransitionBy() === $this->security->getUser();
 
             default:
-                throw new UnexpectedValueException("attribute {$attribute} not supported");
+                throw new \UnexpectedValueException("attribute {$attribute} not supported");
         }
     }
 
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php
index a1707d7c5..9cca4c019 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Entity\NotificationComment;
 use Chill\MainBundle\Entity\User;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use UnexpectedValueException;
 
 final class NotificationVoter extends Voter
 {
@@ -42,7 +41,6 @@ final class NotificationVoter extends Voter
 
     /**
      * @param string $attribute
-     * @param mixed $subject
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
@@ -59,7 +57,7 @@ final class NotificationVoter extends Voter
                 ),
                 self::NOTIFICATION_SEE, self::NOTIFICATION_TOGGLE_READ_STATUS => $subject->getSender() === $user || $subject->getAddressees()->contains($user),
                 self::NOTIFICATION_UPDATE => $subject->getSender() === $user && false === $subject->isSystem(),
-                default => throw new UnexpectedValueException("this subject {$attribute} is not implemented"),
+                default => throw new \UnexpectedValueException("this subject {$attribute} is not implemented"),
             };
         } elseif ($subject instanceof NotificationComment) {
             return match ($attribute) {
@@ -67,10 +65,10 @@ final class NotificationVoter extends Voter
                     $subject->getNotification()->getAddressees()->contains($user) || $subject->getNotification()->getSender() === $user
                 ),
                 self::COMMENT_EDIT => $subject->getCreatedBy() === $user && false === $subject->getNotification()->isSystem(),
-                default => throw new UnexpectedValueException("this subject {$attribute} is not implemented"),
+                default => throw new \UnexpectedValueException("this subject {$attribute} is not implemented"),
             };
         }
 
-        throw new UnexpectedValueException();
+        throw new \UnexpectedValueException();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/SavedExportVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/SavedExportVoter.php
index 32281f6dc..0e9a7da52 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/SavedExportVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/SavedExportVoter.php
@@ -14,8 +14,6 @@ namespace Chill\MainBundle\Security\Authorization;
 use Chill\MainBundle\Entity\SavedExport;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use UnexpectedValueException;
-use function in_array;
 
 class SavedExportVoter extends Voter
 {
@@ -33,14 +31,14 @@ class SavedExportVoter extends Voter
 
     protected function supports($attribute, $subject): bool
     {
-        return $subject instanceof SavedExport && in_array($attribute, self::ALL, true);
+        return $subject instanceof SavedExport && \in_array($attribute, self::ALL, true);
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
         return match ($attribute) {
             self::DELETE, self::EDIT, self::GENERATE => $subject->getUser() === $token->getUser(),
-            default => throw new UnexpectedValueException('attribute not supported: ' . $attribute),
+            default => throw new \UnexpectedValueException('attribute not supported: '.$attribute),
         };
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
index 15e2f2585..0c72ade3e 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
@@ -14,8 +14,8 @@ namespace Chill\MainBundle\Security\Authorization;
 interface VoterGeneratorInterface
 {
     /**
-     * @param string $class The FQDN of a class
-     * @param array $attributes an array of attributes
+     * @param string $class      The FQDN of a class
+     * @param array  $attributes an array of attributes
      *
      * @return $this
      */
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
index 9fea68519..9718cf013 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
@@ -12,12 +12,8 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
-use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
-use RuntimeException;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use function in_array;
-use function is_object;
 
 class WorkflowEntityDeletionVoter extends Voter
 {
@@ -28,13 +24,13 @@ class WorkflowEntityDeletionVoter extends Voter
 
     protected function supports($attribute, $subject)
     {
-        if (!is_object($subject)) {
+        if (!\is_object($subject)) {
             return false;
         }
 
         foreach ($this->handlers as $handler) {
             if ($handler->isObjectSupported($subject)
-                && in_array($attribute, $handler->getDeletionRoles($subject), true)) {
+                && \in_array($attribute, $handler->getDeletionRoles($subject), true)) {
                 return true;
             }
         }
@@ -52,6 +48,6 @@ class WorkflowEntityDeletionVoter extends Voter
             }
         }
 
-        throw new RuntimeException('no handlers found');
+        throw new \RuntimeException('no handlers found');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php b/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
index 65ca6b233..231bc021d 100644
--- a/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
@@ -15,9 +15,6 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 
-use function array_keys;
-use function in_array;
-
 /**
  * Helper which traverse all role to find parents.
  */
@@ -50,12 +47,12 @@ class ParentRoleHelper
     {
         $parentRoles = [$role];
         // transform the roles from role hierarchy from string to Role
-        $roles = array_keys($this->hierarchy);
+        $roles = \array_keys($this->hierarchy);
 
         foreach ($roles as $r) {
             $childRoles = $this->roleHierarchy->getReachableRoleNames([$r]);
 
-            if (in_array($role, $childRoles, true)) {
+            if (\in_array($role, $childRoles, true)) {
                 $parentRoles[] = $r;
             }
         }
@@ -66,7 +63,7 @@ class ParentRoleHelper
     /**
      * Test if a parent role may give access to a given child role.
      *
-     * @param string $childRole The role we want to test if he is reachable
+     * @param string $childRole  The role we want to test if he is reachable
      * @param string $parentRole The role which should give access to $childRole
      *
      * @return bool true if the child role is granted by parent role
@@ -76,6 +73,6 @@ class ParentRoleHelper
         $reachableRoles = $this->roleHierarchy
             ->getReachableRoleNames([$parentRole]);
 
-        return in_array($childRole, $reachableRoles, true);
+        return \in_array($childRole, $reachableRoles, true);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
index c32411d1b..264b77056 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
-use Symfony\Component\EventDispatcher\Event;
 
 class PasswordRecoverEvent extends \Symfony\Contracts\EventDispatcher\Event
 {
@@ -23,8 +22,8 @@ class PasswordRecoverEvent extends \Symfony\Contracts\EventDispatcher\Event
     final public const INVALID_TOKEN = 'chill_main.password_recover_invalid_token';
 
     /**
-     * @param bool $safelyGenerated true if generated safely (from console command, etc.)
-     * @param null|mixed $ip
+     * @param bool       $safelyGenerated true if generated safely (from console command, etc.)
+     * @param mixed|null $ip
      */
     public function __construct(
         private readonly ?string $token = null,
@@ -46,7 +45,7 @@ class PasswordRecoverEvent extends \Symfony\Contracts\EventDispatcher\Event
         return $this->token;
     }
 
-    public function getUser(): ?\Chill\MainBundle\Entity\User
+    public function getUser(): ?User
     {
         return $this->user;
     }
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
index 1266453e7..11d14c374 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
@@ -12,9 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Redis\ChillRedis;
-use LogicException;
 use Psr\Log\LoggerInterface;
-use UnexpectedValueException;
 
 class PasswordRecoverLocker
 {
@@ -75,7 +73,7 @@ class PasswordRecoverLocker
     }
 
     /**
-     * @param string $usage 'invalid_token_global' or ...
+     * @param string     $usage         'invalid_token_global' or ...
      * @param mixed|null $discriminator
      */
     public static function generateLockKey($usage, int $number, $discriminator = null)
@@ -86,7 +84,7 @@ class PasswordRecoverLocker
             'ask_token_invalid_form_global' => sprintf('ask_token_invalid_form_global_%d', $number),
             'ask_token_invalid_form_by_ip' => sprintf('ask_token_invalid_form_by_ip_%s_%d', $discriminator, $number),
             'ask_token_success_by_user' => sprintf('ask_token_success_by_user_%s_%d', $discriminator->getId(), $number),
-            default => throw new LogicException('this usage is not implemented'),
+            default => throw new \LogicException('this usage is not implemented'),
         };
     }
 
@@ -98,7 +96,7 @@ class PasswordRecoverLocker
             'ask_token_invalid_form_global' => self::MAX_ASK_TOKEN_INVALID_FORM_GLOBAL,
             'ask_token_invalid_form_by_ip' => self::MAX_ASK_TOKEN_INVALID_FORM_BY_IP,
             'ask_token_success_by_user' => self::MAX_ASK_TOKEN_BY_USER,
-            default => throw new UnexpectedValueException("this usage '{$usage}' is not yet implemented"),
+            default => throw new \UnexpectedValueException("this usage '{$usage}' is not yet implemented"),
         };
     }
 
@@ -108,7 +106,7 @@ class PasswordRecoverLocker
             'invalid_token_global', 'invalid_token_by_ip' => self::INVALID_TOKEN_TTL,
             'ask_token_invalid_form_global', 'ask_token_invalid_form_by_ip' => self::ASK_TOKEN_INVALID_FORM_TTL,
             'ask_token_success_by_user' => self::ASK_TOKEN_INVALID_FORM_TTL * 24,
-            default => throw new UnexpectedValueException("this usage '{$usage}' is not yet implemented"),
+            default => throw new \UnexpectedValueException("this usage '{$usage}' is not yet implemented"),
         };
     }
 
@@ -119,7 +117,7 @@ class PasswordRecoverLocker
         for ($i = 0; $i < $max; ++$i) {
             $key = self::generateLockKey($usage, $i, $discriminator);
 
-            if ($this->chillRedis->exists($key) === 0) {
+            if (0 === $this->chillRedis->exists($key)) {
                 return false;
             }
         }
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
index b2a17d2da..ab847aa5e 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
@@ -16,8 +16,6 @@ use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 
-use function in_array;
-
 class PasswordRecoverVoter extends Voter
 {
     final public const ASK_TOKEN = 'CHILL_PASSWORD_ASK_TOKEN';
@@ -47,7 +45,7 @@ class PasswordRecoverVoter extends Voter
 
     protected function supports($attribute, $subject): bool
     {
-        if (!in_array($attribute, $this->supported, true)) {
+        if (!\in_array($attribute, $this->supported, true)) {
             return false;
         }
 
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
index af81443bb..e868262e2 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
@@ -12,14 +12,10 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Notification\Mailer;
-use DateTimeInterface;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
-use function array_merge;
-
 class RecoverPasswordHelper
 {
     final public const RECOVER_PASSWORD_ROUTE = 'password_recover';
@@ -27,16 +23,16 @@ class RecoverPasswordHelper
     public function __construct(private readonly TokenManager $tokenManager, private readonly UrlGeneratorInterface $urlGenerator, private readonly MailerInterface $mailer) {}
 
     /**
-     * @param bool $absolute
+     * @param bool  $absolute
      * @param array $parameters additional parameters to url
      *
      * @return string
      */
-    public function generateUrl(User $user, DateTimeInterface $expiration, $absolute = true, array $parameters = [])
+    public function generateUrl(User $user, \DateTimeInterface $expiration, $absolute = true, array $parameters = [])
     {
         return $this->urlGenerator->generate(
             self::RECOVER_PASSWORD_ROUTE,
-            array_merge(
+            \array_merge(
                 $this->tokenManager->generate($user, $expiration),
                 $parameters
             ),
@@ -46,7 +42,7 @@ class RecoverPasswordHelper
 
     public function sendRecoverEmail(
         User $user,
-        DateTimeInterface $expiration,
+        \DateTimeInterface $expiration,
         $template = '@ChillMain/Password/recover_email.txt.twig',
         array $templateParameters = [],
         $force = false,
@@ -54,7 +50,7 @@ class RecoverPasswordHelper
         $emailSubject = 'Recover your password'
     ) {
         if (null === $user->getEmail() || '' === trim($user->getEmail())) {
-            throw new \UnexpectedValueException("No emaail associated to the user");
+            throw new \UnexpectedValueException('No emaail associated to the user');
         }
 
         $email = (new TemplatedEmail())
@@ -64,7 +60,7 @@ class RecoverPasswordHelper
             ->context([
                 'user' => $user,
                 'url' => $this->generateUrl($user, $expiration, true, $additionalUrlParameters),
-                ...$templateParameters
+                ...$templateParameters,
             ]);
 
         $this->mailer->send($email);
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
index f442ae4a7..acb010ca9 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
@@ -12,18 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
-use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Psr\Log\LoggerInterface;
-use UnexpectedValueException;
-
-use function bin2hex;
-use function hash;
-use function hex2bin;
-use function random_bytes;
-use function strlen;
-use function trim;
 
 class TokenManager
 {
@@ -50,21 +39,21 @@ class TokenManager
         $this->logger = $logger;
     }
 
-    public function generate(User $user, DateTimeInterface $expiration)
+    public function generate(User $user, \DateTimeInterface $expiration)
     {
-        $token = random_bytes(self::TOKEN_LENGTH);
+        $token = \random_bytes(self::TOKEN_LENGTH);
         $username = $user->getUsernameCanonical();
 
         if (empty($username)) {
-            throw new UnexpectedValueException('username should not be empty to generate a token');
+            throw new \UnexpectedValueException('username should not be empty to generate a token');
         }
 
         $timestamp = (string) $expiration->getTimestamp();
-        $hash = hash('sha1', $token . $username . $timestamp . $this->secret);
+        $hash = \hash('sha1', $token.$username.$timestamp.$this->secret);
 
         return [
             self::HASH => $hash,
-            self::TOKEN => bin2hex($token),
+            self::TOKEN => \bin2hex($token),
             self::TIMESTAMP => $timestamp,
             self::USERNAME_CANONICAL => $username,
         ];
@@ -72,23 +61,23 @@ class TokenManager
 
     public function verify($hash, $token, User $user, string $timestamp)
     {
-        $token = hex2bin(trim((string) $token));
+        $token = \hex2bin(\trim((string) $token));
 
-        if (strlen($token) !== self::TOKEN_LENGTH) {
+        if (self::TOKEN_LENGTH !== \strlen($token)) {
             return false;
         }
 
         $username = $user->getUsernameCanonical();
-        $date = DateTimeImmutable::createFromFormat('U', $timestamp);
+        $date = \DateTimeImmutable::createFromFormat('U', $timestamp);
 
-        if ($date < new DateTime('now')) {
+        if ($date < new \DateTime('now')) {
             $this->logger->info('receiving a password recover token with expired '
-                . 'validity');
+                .'validity');
 
             return false;
         }
 
-        $expected = hash('sha1', $token . $username . $timestamp . $this->secret);
+        $expected = \hash('sha1', $token.$username.$timestamp.$this->secret);
 
         if ($expected !== $hash) {
             return false;
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
index 3ef3bd8da..f629459b4 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
@@ -12,10 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\Center;
-use UnexpectedValueException;
-
-use function get_class;
-use function is_array;
 
 final readonly class CenterResolverManager implements CenterResolverManagerInterface
 {
@@ -38,16 +34,11 @@ final readonly class CenterResolverManager implements CenterResolverManagerInter
                     return [$resolved];
                 }
 
-                if (is_array($resolved)) {
+                if (\is_array($resolved)) {
                     return $resolved;
                 }
 
-                throw new UnexpectedValueException(sprintf(
-                    'the return type of a %s should be an instance of %s, an array or null. Resolver is %s',
-                    CenterResolverInterface::class,
-                    Center::class,
-                    $resolver::class
-                ));
+                throw new \UnexpectedValueException(sprintf('the return type of a %s should be an instance of %s, an array or null. Resolver is %s', CenterResolverInterface::class, Center::class, $resolver::class));
             }
         }
 
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
index 3d699bec5..0f9eddd38 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasCentersInterface;
-use UnexpectedValueException;
 
 class DefaultCenterResolver implements CenterResolverInterface
 {
@@ -24,7 +23,6 @@ class DefaultCenterResolver implements CenterResolverInterface
 
     /**
      * @param HasCenterInterface $entity
-     * @param array $options
      */
     public function resolveCenter($entity, ?array $options = [])
     {
@@ -36,7 +34,7 @@ class DefaultCenterResolver implements CenterResolverInterface
             return $entity->getCenters();
         }
 
-        throw new UnexpectedValueException('should be an instanceof');
+        throw new \UnexpectedValueException('should be an instanceof');
     }
 
     public function supports($entity, ?array $options = []): bool
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
index 25697ac15..1551725e1 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\HasScopesInterface;
-use UnexpectedValueException;
 
 class DefaultScopeResolver implements ScopeResolverInterface
 {
@@ -40,13 +39,7 @@ class DefaultScopeResolver implements ScopeResolverInterface
             return $entity->getScopes();
         }
 
-        throw new UnexpectedValueException(
-            sprintf(
-                'should be an instanceof %s or %s',
-                HasScopesInterface::class,
-                HasScopeInterface::class
-            )
-        );
+        throw new \UnexpectedValueException(sprintf('should be an instanceof %s or %s', HasScopesInterface::class, HasScopeInterface::class));
     }
 
     public function supports($entity, ?array $options = []): bool
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
index c809f3f48..032c28a9b 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
@@ -27,8 +27,6 @@ final class ResolverTwigExtension extends \Twig\Extension\AbstractExtension
     }
 
     /**
-     * @param $entity
-     *
      * @return bool
      */
     public function isScopeConcerned($entity, ?array $options = [])
@@ -45,8 +43,6 @@ final class ResolverTwigExtension extends \Twig\Extension\AbstractExtension
     }
 
     /**
-     * @param $entity
-     *
      * @return array|\Chill\MainBundle\Entity\Scope|\Chill\MainBundle\Entity\Scope[]
      */
     public function resolveScope($entity, ?array $options = []): array|\Chill\MainBundle\Entity\Scope
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
index 20586d3a1..bafadf1a6 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
@@ -33,7 +33,6 @@ final readonly class ScopeResolverDispatcher
     }
 
     /**
-     * @param array|null $options
      * @return Scope|iterable<Scope>|Scope|null
      */
     public function resolveScope(mixed $entity, ?array $options = []): null|\Chill\MainBundle\Entity\Scope|iterable
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
index d56e54f2e..1ea3260a0 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
@@ -26,24 +26,18 @@ interface ScopeResolverInterface
 
     /**
      * Return true if the entity is concerned by scope, false otherwise.
-     *
-     * @param mixed $entity
      */
     public function isConcerned($entity, ?array $options = []): bool;
 
     /**
      * Will return the scope for the entity.
      *
-     * @param mixed $entity
-     *
      * @return array|Scope|Scope[]
      */
     public function resolveScope($entity, ?array $options = []);
 
     /**
      * Return true if this resolve is able to decide "something" on this entity.
-     *
-     * @param mixed $entity
      */
     public function supports($entity, ?array $options = []): bool;
 }
diff --git a/src/Bundle/ChillMainBundle/Security/RoleProvider.php b/src/Bundle/ChillMainBundle/Security/RoleProvider.php
index 891066b76..95e4a666f 100644
--- a/src/Bundle/ChillMainBundle/Security/RoleProvider.php
+++ b/src/Bundle/ChillMainBundle/Security/RoleProvider.php
@@ -11,9 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Security;
 
-use function array_fill_keys;
-use function array_key_exists;
-
 class RoleProvider
 {
     /**
@@ -44,9 +41,7 @@ class RoleProvider
         $roles = [];
 
         foreach ($this->providers as $provider) {
-            if ($provider->getRoles() !== null) {
-                $roles = array_merge($roles, $provider->getRoles());
-            }
+            $roles = array_merge($roles, $provider->getRoles());
         }
 
         return $roles;
@@ -57,9 +52,7 @@ class RoleProvider
         $roles = [];
 
         foreach ($this->providers as $provider) {
-            if ($provider->getRolesWithoutScope() !== null) {
-                $roles = array_merge($roles, $provider->getRolesWithoutScope());
-            }
+            $roles = array_merge($roles, $provider->getRolesWithoutScope());
         }
 
         return $roles;
@@ -76,7 +69,7 @@ class RoleProvider
     {
         $this->initializeRolesTitlesCache();
 
-        if (!array_key_exists($role, $this->rolesTitlesCache)) {
+        if (!\array_key_exists($role, $this->rolesTitlesCache)) {
             // this case might happens when the role is not described in
             // `getRolesWithHierarchy`
             return null;
@@ -103,12 +96,10 @@ class RoleProvider
                     }
                 }
             } else {
-                if ($provider->getRoles() !== null) {
-                    $this->rolesTitlesCache = array_merge(
-                        $this->rolesTitlesCache,
-                        array_fill_keys($provider->getRoles(), null)
-                    );
-                }
+                $this->rolesTitlesCache = array_merge(
+                    $this->rolesTitlesCache,
+                    \array_fill_keys($provider->getRoles(), null)
+                );
             }
         }
     }
diff --git a/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php b/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php
index 27c545286..c624c6a99 100644
--- a/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php
+++ b/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php
@@ -28,19 +28,15 @@ class UserProvider implements UserProviderInterface
         try {
             $user = $this->em->createQuery(sprintf(
                 'SELECT u FROM %s u '
-                    . 'WHERE u.usernameCanonical = UNACCENT(LOWER(:pattern)) '
-                    . 'OR '
-                    . 'u.emailCanonical = UNACCENT(LOWER(:pattern))',
+                    .'WHERE u.usernameCanonical = UNACCENT(LOWER(:pattern)) '
+                    .'OR '
+                    .'u.emailCanonical = UNACCENT(LOWER(:pattern))',
                 User::class
             ))
                 ->setParameter('pattern', $username)
                 ->getSingleResult();
         } catch (NoResultException $e) {
-            throw new UsernameNotFoundException(
-                'Bad credentials.',
-                0,
-                $e
-            );
+            throw new UsernameNotFoundException('Bad credentials.', 0, $e);
         }
 
         return $user;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php b/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php
index 3a8c33e74..476d68568 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Serializer\Model;
 
-use JsonSerializable;
-
-class Counter implements JsonSerializable
+class Counter implements \JsonSerializable
 {
     public function __construct(private ?int $counter) {}
 
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
index 54ae36582..bbae6bd40 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
@@ -14,7 +14,6 @@ namespace Chill\MainBundle\Serializer\Normalizer;
 use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Templating\Entity\AddressRender;
-use DateTimeInterface;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
@@ -43,15 +42,15 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
         'buildingName',
         'distribution',
         'extra',
-        'validFrom' => DateTimeInterface::class,
-        'validTo' => DateTimeInterface::class,
+        'validFrom' => \DateTimeInterface::class,
+        'validTo' => \DateTimeInterface::class,
         'confidential',
     ];
 
     public function __construct(private readonly AddressRender $addressRender) {}
 
     /**
-     * @param Address $address
+     * @param Address     $address
      * @param string|null $format
      */
     public function normalize($address, $format = null, array $context = [])
@@ -100,7 +99,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
                 );
                 $data['isNoAddress'] = $address->isNoAddress();
             } elseif ('docgen' === $format) {
-                $dateContext = array_merge($context, ['docgen:expects' => DateTimeInterface::class]);
+                $dateContext = array_merge($context, ['docgen:expects' => \DateTimeInterface::class]);
                 $data['validFrom'] = $this->normalizer->normalize($address->getValidFrom(), $format, $dateContext);
                 $data['validTo'] = $this->normalizer->normalize($address->getValidTo(), $format, $dateContext);
             }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
index dacea7e23..7c41bcb8a 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
@@ -18,8 +18,6 @@ use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-use function array_key_exists;
-
 class CenterNormalizer implements DenormalizerInterface, NormalizerInterface
 {
     public function __construct(private readonly CenterRepository $repository) {}
@@ -30,7 +28,7 @@ class CenterNormalizer implements DenormalizerInterface, NormalizerInterface
             return null;
         }
 
-        if (false === array_key_exists('type', $data)) {
+        if (false === \array_key_exists('type', $data)) {
             throw new InvalidArgumentException('missing "type" key in data');
         }
 
@@ -38,7 +36,7 @@ class CenterNormalizer implements DenormalizerInterface, NormalizerInterface
             throw new InvalidArgumentException('type should be equal to "center"');
         }
 
-        if (false === array_key_exists('id', $data)) {
+        if (false === \array_key_exists('id', $data)) {
             throw new InvalidArgumentException('missing "id" key in data');
         }
 
@@ -53,12 +51,12 @@ class CenterNormalizer implements DenormalizerInterface, NormalizerInterface
 
     public function normalize($center, $format = null, array $context = [])
     {
-        /** @var Center $center */
+        /* @var Center $center */
         return [
             'id' => $center->getId(),
             'type' => 'center',
             'name' => $center->getName(),
-            'isActive' => $center->getIsActive()
+            'isActive' => $center->getIsActive(),
         ];
     }
 
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
index b9cbe9caa..117e18704 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
@@ -21,7 +21,7 @@ class CollectionNormalizer implements NormalizerAwareInterface, NormalizerInterf
     use NormalizerAwareTrait;
 
     /**
-     * @param Collection $collection
+     * @param Collection  $collection
      * @param string|null $format
      */
     public function normalize($collection, $format = null, array $context = [])
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
index 3eb7cd0ff..41cf94e1b 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
@@ -14,12 +14,10 @@ namespace Chill\MainBundle\Serializer\Normalizer;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\UserRepository;
-use DateTime;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
-use function array_key_exists;
 
 class CommentEmbeddableDocGenNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
@@ -32,14 +30,14 @@ class CommentEmbeddableDocGenNormalizer implements ContextAwareNormalizerInterfa
      *
      * @throws ExceptionInterface
      */
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($object, string $format = null, array $context = []): array
     {
-        if (null === $object || ($object->isEmpty())) {
+        if (null === $object || $object->isEmpty()) {
             return [
                 'comment' => '',
                 'isNull' => true,
                 'date' => $this->normalizer->normalize(null, $format, array_merge($context, [
-                    'docgen:expects' => DateTime::class,
+                    'docgen:expects' => \DateTime::class,
                 ])),
                 'user' => $this->normalizer->normalize(null, $format, array_merge($context, [
                     'docgen:expects' => User::class,
@@ -57,7 +55,7 @@ class CommentEmbeddableDocGenNormalizer implements ContextAwareNormalizerInterfa
             'comment' => $object->getComment(),
             'isNull' => false,
             'date' => $this->normalizer->normalize($object->getDate(), $format, array_merge($context, [
-                'docgen:expects' => DateTime::class,
+                'docgen:expects' => \DateTime::class,
             ])),
             'user' => $this->normalizer->normalize($user, $format, array_merge($context, [
                 'docgen:expects' => User::class,
@@ -65,7 +63,7 @@ class CommentEmbeddableDocGenNormalizer implements ContextAwareNormalizerInterfa
         ];
     }
 
-    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
+    public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
         if ('docgen' !== $format) {
             return false;
@@ -77,7 +75,7 @@ class CommentEmbeddableDocGenNormalizer implements ContextAwareNormalizerInterfa
 
         if (
             null === $data
-            && array_key_exists('docgen:expects', $context)
+            && \array_key_exists('docgen:expects', $context)
             && CommentEmbeddable::class === $context['docgen:expects']) {
             return true;
         }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
index 09ca0924a..9ee8bf158 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
@@ -11,19 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Serializer\Normalizer;
 
-use DateTime;
-use DateTimeImmutable;
 use DateTimeInterface;
-use IntlDateFormatter;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
-use function array_key_exists;
-use function is_array;
-
 class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
     public function __construct(private readonly RequestStack $requestStack, private readonly ParameterBagInterface $parameterBag) {}
@@ -35,14 +29,14 @@ class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInt
         }
 
         switch ($type) {
-            case DateTime::class:
-                $result = DateTime::createFromFormat(DateTimeInterface::ISO8601, $data['datetime']);
+            case \DateTime::class:
+                $result = \DateTime::createFromFormat(\DateTimeInterface::ISO8601, $data['datetime']);
 
                 break;
 
-            case DateTimeInterface::class:
-            case DateTimeImmutable::class:
-                $result = DateTimeImmutable::createFromFormat(DateTimeInterface::ISO8601, $data['datetime']);
+            case \DateTimeInterface::class:
+            case \DateTimeImmutable::class:
+                $result = \DateTimeImmutable::createFromFormat(\DateTimeInterface::ISO8601, $data['datetime']);
 
                 break;
 
@@ -59,12 +53,12 @@ class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInt
 
     public function normalize($date, $format = null, array $context = [])
     {
-        /** @var DateTimeInterface $date */
+        /* @var DateTimeInterface $date */
         switch ($format) {
             case 'json':
                 return [
-                    'datetime' => $date->format(DateTimeInterface::ISO8601),
-                    'datetime8601' => $date->format(DateTimeInterface::ATOM),
+                    'datetime' => $date->format(\DateTimeInterface::ISO8601),
+                    'datetime8601' => $date->format(\DateTimeInterface::ATOM),
                 ];
 
             case 'docgen':
@@ -74,18 +68,18 @@ class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInt
                     ];
                 }
 
-                $hasTime = $date->format('His') !== '000000';
+                $hasTime = '000000' !== $date->format('His');
                 $request = $this->requestStack->getCurrentRequest();
                 $locale = null !== $request ? $request->getLocale() : $this->parameterBag->get('kernel.default_locale');
-                $formatterLong = IntlDateFormatter::create(
+                $formatterLong = \IntlDateFormatter::create(
                     $locale,
-                    IntlDateFormatter::LONG,
-                    $hasTime ? IntlDateFormatter::SHORT : IntlDateFormatter::NONE
+                    \IntlDateFormatter::LONG,
+                    $hasTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE
                 );
-                $formatterShort = IntlDateFormatter::create(
+                $formatterShort = \IntlDateFormatter::create(
                     $locale,
-                    IntlDateFormatter::SHORT,
-                    $hasTime ? IntlDateFormatter::SHORT : IntlDateFormatter::NONE
+                    \IntlDateFormatter::SHORT,
+                    $hasTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE
                 );
 
                 return [
@@ -97,26 +91,26 @@ class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInt
 
     public function supportsDenormalization($data, $type, $format = null): bool
     {
-        return DateTimeInterface::class === $type
-            || DateTime::class === $type
-            || DateTimeImmutable::class === $type
-            || (is_array($data) && array_key_exists('datetime', $data));
+        return \DateTimeInterface::class === $type
+            || \DateTime::class === $type
+            || \DateTimeImmutable::class === $type
+            || (\is_array($data) && \array_key_exists('datetime', $data));
     }
 
     public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         if ('json' === $format) {
-            return $data instanceof DateTimeInterface;
+            return $data instanceof \DateTimeInterface;
         }
 
         if ('docgen' === $format) {
-            return $data instanceof DateTimeInterface || (
+            return $data instanceof \DateTimeInterface || (
                 null === $data
-                && array_key_exists('docgen:expects', $context)
+                && \array_key_exists('docgen:expects', $context)
                 && (
-                    DateTimeInterface::class === $context['docgen:expects']
-                    || DateTime::class === $context['docgen:expects']
-                    || DateTimeImmutable::class === $context['docgen:expects']
+                    \DateTimeInterface::class === $context['docgen:expects']
+                    || \DateTime::class === $context['docgen:expects']
+                    || \DateTimeImmutable::class === $context['docgen:expects']
                 )
             );
         }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
index 4149e387b..1ecb7824f 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
@@ -11,16 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Serializer\Normalizer;
 
-use LogicException;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Exception\RuntimeException;
 use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 
-use function count;
-use function implode;
-
 /**
  * Denormalize an object given a list of supported class.
  */
@@ -51,8 +47,7 @@ class DiscriminatedObjectDenormalizer implements ContextAwareDenormalizerInterfa
             }
         }
 
-        throw new RuntimeException(sprintf('Could not find any denormalizer for those ' .
-            'ALLOWED_TYPES: %s', implode(', ', $context[self::ALLOWED_TYPES])));
+        throw new RuntimeException(sprintf('Could not find any denormalizer for those ALLOWED_TYPES: %s', \implode(', ', $context[self::ALLOWED_TYPES])));
     }
 
     public function supportsDenormalization($data, $type, $format = null, array $context = [])
@@ -61,8 +56,8 @@ class DiscriminatedObjectDenormalizer implements ContextAwareDenormalizerInterfa
             return false;
         }
 
-        if (0 === count($context[self::ALLOWED_TYPES] ?? [])) {
-            throw new LogicException('The context should contains a list of
+        if (0 === \count($context[self::ALLOWED_TYPES] ?? [])) {
+            throw new \LogicException('The context should contains a list of
                 allowed types');
         }
 
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
index d200a604a..ed34a45be 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
@@ -17,17 +17,13 @@ use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
-use function array_key_exists;
-use function count;
-use function is_array;
-
 class DoctrineExistingEntityNormalizer implements DenormalizerInterface
 {
     public function __construct(private readonly EntityManagerInterface $em, private readonly ClassMetadataFactoryInterface $serializerMetadataFactory) {}
 
     public function denormalize($data, $type, $format = null, array $context = [])
     {
-        if (array_key_exists(AbstractNormalizer::OBJECT_TO_POPULATE, $context)) {
+        if (\array_key_exists(AbstractNormalizer::OBJECT_TO_POPULATE, $context)) {
             return $context[AbstractNormalizer::OBJECT_TO_POPULATE];
         }
 
@@ -37,11 +33,11 @@ class DoctrineExistingEntityNormalizer implements DenormalizerInterface
 
     public function supportsDenormalization($data, $type, $format = null)
     {
-        if (false === is_array($data)) {
+        if (false === \is_array($data)) {
             return false;
         }
 
-        if (false === array_key_exists('id', $data)) {
+        if (false === \array_key_exists('id', $data)) {
             return false;
         }
 
@@ -60,13 +56,13 @@ class DoctrineExistingEntityNormalizer implements DenormalizerInterface
                 // check that only 2 keys
                 // that the second key is property
                 // and that the type match the class for given type property
-                return count($data) === 2
-                    && array_key_exists($typeProperty, $data)
+                return 2 === \count($data)
+                    && \array_key_exists($typeProperty, $data)
                     && $classDiscriminator->getClassForType($data[$typeProperty]) === $type;
             }
         }
 
         // we do not have any class discriminator. Check that the id is the only one key
-        return count($data) === 1;
+        return 1 === \count($data);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
index b1f3807ed..c4284a526 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
@@ -30,7 +30,7 @@ class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareIn
      *
      * @return array
      */
-    public function normalize($object, ?string $format = null, array $context = [])
+    public function normalize($object, string $format = null, array $context = [])
     {
         $workflow = $this->registry->get($object, $object->getWorkflowName());
         $handler = $this->entityWorkflowManager->getHandler($object);
@@ -48,7 +48,7 @@ class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareIn
         ];
     }
 
-    public function supportsNormalization($data, ?string $format = null): bool
+    public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof EntityWorkflow && 'json' === $format;
     }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
index f5ffc245b..1edc6e74c 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
@@ -26,7 +26,7 @@ class EntityWorkflowStepNormalizer implements NormalizerAwareInterface, Normaliz
     /**
      * @param EntityWorkflowStep $object
      */
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($object, string $format = null, array $context = []): array
     {
         $data = [
             'type' => 'entity_workflow_step',
@@ -75,7 +75,7 @@ class EntityWorkflowStepNormalizer implements NormalizerAwareInterface, Normaliz
         return $data;
     }
 
-    public function supportsNormalization($data, ?string $format = null): bool
+    public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof EntityWorkflowStep && 'json' === $format;
     }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
index 39a3b7b2a..3195f9aab 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Serializer\Normalizer;
 
-use ArrayObject;
 use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Notification\NotificationHandlerManager;
 use Doctrine\ORM\EntityManagerInterface;
@@ -29,9 +28,9 @@ class NotificationNormalizer implements NormalizerAwareInterface, NormalizerInte
     /**
      * @param Notification $object
      *
-     * @return array|ArrayObject|bool|float|int|string|void|null
+     * @return array|\ArrayObject|bool|float|int|string|void|null
      */
-    public function normalize($object, ?string $format = null, array $context = [])
+    public function normalize($object, string $format = null, array $context = [])
     {
         $entity = $this->entityManager
             ->getRepository($object->getRelatedEntityClass())
@@ -52,7 +51,7 @@ class NotificationNormalizer implements NormalizerAwareInterface, NormalizerInte
         ];
     }
 
-    public function supportsNormalization($data, ?string $format = null)
+    public function supportsNormalization($data, string $format = null)
     {
         return $data instanceof Notification && 'json' === $format;
     }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index ec6e3d5e6..583c8a75b 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -33,8 +33,7 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
 
     /**
      * @param string|null $data
-     * @param mixed $type
-     * @param null|mixed $format
+     * @param mixed|null  $format
      *
      * @throws UnexpectedValueException
      */
@@ -51,7 +50,7 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
         }
     }
 
-    public function normalize($object, ?string $format = null, array $context = []): string
+    public function normalize($object, string $format = null, array $context = []): string
     {
         if ('docgen' === $format && null === $object) {
             return '';
@@ -65,7 +64,7 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
         return 'libphonenumber\PhoneNumber' === $type;
     }
 
-    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
+    public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
         if ($data instanceof PhoneNumber && 'json' === $format) {
             return true;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
index 46e6f45d3..4084bce44 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
@@ -15,18 +15,15 @@ use Chill\MainBundle\Doctrine\Model\Point;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
-use function count;
-use function is_array;
-
 class PointNormalizer implements DenormalizerInterface
 {
     public function denormalize($data, $type, $format = null, array $context = [])
     {
-        if (!is_array($data)) {
+        if (!\is_array($data)) {
             throw new InvalidArgumentException('point data is not an array. It should be an array of 2 coordinates.');
         }
 
-        if (count($data) !== 2) {
+        if (2 !== \count($data)) {
             throw new InvalidArgumentException('point data is not an array of 2 elements. It should be an array of 2 coordinates.');
         }
 
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
index 515e831c0..565fa34fc 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
@@ -20,7 +20,7 @@ class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, Denorma
 {
     public function __construct(private readonly Security $security) {}
 
-    public function denormalize($data, string $type, ?string $format = null, array $context = []): PrivateCommentEmbeddable
+    public function denormalize($data, string $type, string $format = null, array $context = []): PrivateCommentEmbeddable
     {
         $comment = new PrivateCommentEmbeddable();
 
@@ -38,12 +38,12 @@ class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, Denorma
         return $object->getCommentForUser($this->security->getUser());
     }
 
-    public function supportsDenormalization($data, string $type, ?string $format = null): bool
+    public function supportsDenormalization($data, string $type, string $format = null): bool
     {
         return PrivateCommentEmbeddable::class === $type;
     }
 
-    public function supportsNormalization($data, ?string $format = null): bool
+    public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof PrivateCommentEmbeddable;
     }
diff --git a/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCode.php b/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCode.php
index 4d4c4ec10..a4589b836 100644
--- a/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCode.php
+++ b/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCode.php
@@ -19,7 +19,7 @@ final readonly class CollateAddressWithReferenceOrPostalCode implements CollateA
     private const LOG_PREFIX = '[collate addresses] ';
     /**
      * For the address having an "invented" postal code, find the postal code "reference" with the same code,
-     * and the most similar name. When two reference code match, we add
+     * and the most similar name. When two reference code match, we add.
      *
      * This query intentionally includes also address with reference, as the reference may be wrong.
      */
@@ -77,7 +77,7 @@ final readonly class CollateAddressWithReferenceOrPostalCode implements CollateA
     SQL;
 
     /**
-     * Update the point's address with the:
+     * Update the point's address with the:.
      *
      * - address reference point, if the address match the reference with sufficient similarity
      * - or the postcal code center
@@ -97,7 +97,6 @@ final readonly class CollateAddressWithReferenceOrPostalCode implements CollateA
         SELECT MAX(id) AS max_id FROM chill_main_address;
     SQL;
 
-
     public function __construct(
         private Connection $connection,
         private LoggerInterface $logger,
@@ -128,15 +127,15 @@ final readonly class CollateAddressWithReferenceOrPostalCode implements CollateA
                 ];
             });
         } catch (\Throwable $e) {
-            $this->logger->error(self::LOG_PREFIX . "error while re-collating addresses", [
+            $this->logger->error(self::LOG_PREFIX.'error while re-collating addresses', [
                 'message' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
+                'trace' => $e->getTraceAsString(),
             ]);
 
             throw $e;
         }
 
-        $this->logger->info(self::LOG_PREFIX . "Collate the addresses with reference", [
+        $this->logger->info(self::LOG_PREFIX.'Collate the addresses with reference', [
             'set_postcode_from_most_similar' => $postCodeSetReferenceFromMostSimilar,
             'address_reference_match' => $addressReferenceMatch,
             'point_update' => $pointUpdates,
diff --git a/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJob.php b/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJob.php
index fee075998..06eb2104d 100644
--- a/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJob.php
+++ b/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJob.php
@@ -13,11 +13,8 @@ namespace Chill\MainBundle\Service\AddressGeographicalUnit;
 
 use Chill\MainBundle\Cron\CronJobInterface;
 use Chill\MainBundle\Entity\CronJobExecution;
-use DateInterval;
-use DateTimeImmutable;
 use Doctrine\DBAL\Connection;
 use Symfony\Component\Clock\ClockInterface;
-use UnexpectedValueException;
 
 final readonly class RefreshAddressToGeographicalUnitMaterializedViewCronJob implements CronJobInterface
 {
@@ -33,14 +30,14 @@ final readonly class RefreshAddressToGeographicalUnitMaterializedViewCronJob imp
         }
 
         if ($cronJobExecution->getKey() !== $this->getKey()) {
-            throw new UnexpectedValueException();
+            throw new \UnexpectedValueException();
         }
 
         $now = $this->clock->now();
 
-        return $cronJobExecution->getLastStart() < $now->sub(new DateInterval('P1D'))
+        return $cronJobExecution->getLastStart() < $now->sub(new \DateInterval('P1D'))
             // introduce a random component to ensure a roll when multiple instances are hosted on same machines
-            && random_int(0, 10) === 0;
+            && 0 === random_int(0, 10);
     }
 
     public function getKey(): string
diff --git a/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoManager.php b/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoManager.php
index c5ef96d0b..b545d3979 100644
--- a/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoManager.php
+++ b/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoManager.php
@@ -30,7 +30,7 @@ class ViewEntityInfoManager
         $this->connection->transactional(function (Connection $conn): void {
             foreach ($this->vienEntityInfoProviders as $viewProvider) {
                 foreach ($this->createOrReplaceViewSQL($viewProvider, $viewProvider->getViewName()) as $sql) {
-                    $this->logger->debug("Will execute create view sql", ['sql' => $sql]);
+                    $this->logger->debug('Will execute create view sql', ['sql' => $sql]);
                     $this->logger->debug($sql);
                     $conn->executeQuery($sql);
                 }
@@ -45,7 +45,7 @@ class ViewEntityInfoManager
     {
         return [
             "DROP VIEW IF EXISTS {$viewName}",
-            sprintf("CREATE OR REPLACE VIEW {$viewName} AS %s", $viewProvider->getViewQuery())
+            sprintf("CREATE OR REPLACE VIEW {$viewName} AS %s", $viewProvider->getViewQuery()),
         ];
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
index 6677edcfa..25749aa89 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
@@ -11,10 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Service\Import;
 
-use Exception;
 use League\Csv\Reader;
 use League\Csv\Statement;
-use RuntimeException;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -37,10 +35,10 @@ class AddressReferenceBEFromBestAddress
             $release = $this->client->request('GET', self::RELEASE)
                 ->toArray();
         } catch (TransportExceptionInterface $e) {
-            throw new RuntimeException('could not get the release definition', 0, $e);
+            throw new \RuntimeException('could not get the release definition', 0, $e);
         }
 
-        $asset = array_filter($release['assets'], static fn (array $item) => 'addresses-' . $list . '.' . $lang . '.csv.gz' === $item['name']);
+        $asset = array_filter($release['assets'], static fn (array $item) => 'addresses-'.$list.'.'.$lang.'.csv.gz' === $item['name']);
 
         return array_values($asset)[0]['browser_download_url'];
     }
@@ -52,10 +50,10 @@ class AddressReferenceBEFromBestAddress
         $response = $this->client->request('GET', $downloadUrl);
 
         if (200 !== $response->getStatusCode()) {
-            throw new Exception('Could not download CSV: ' . $response->getStatusCode());
+            throw new \Exception('Could not download CSV: '.$response->getStatusCode());
         }
 
-        $tmpname = tempnam(sys_get_temp_dir(), 'php-add-' . $list . $lang);
+        $tmpname = tempnam(sys_get_temp_dir(), 'php-add-'.$list.$lang);
         $file = fopen($tmpname, 'r+b');
 
         foreach ($this->client->stream($response) as $chunk) {
@@ -79,8 +77,8 @@ class AddressReferenceBEFromBestAddress
                 $record['municipality_objectid'],
                 $record['postal_info_objectid'],
                 $record['streetname'],
-                $record['housenumber'] .($record['boxnumber'] !== '' ? ' bte '. $record['boxnumber'] : ''),
-                'bestaddress.' . $list,
+                $record['housenumber'].('' !== $record['boxnumber'] ? ' bte '.$record['boxnumber'] : ''),
+                'bestaddress.'.$list,
                 (float) $record['Y'],
                 (float) $record['X'],
                 3812
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
index 76dca7ebc..bc656ebc5 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
@@ -13,12 +13,7 @@ namespace Chill\MainBundle\Service\Import;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Statement;
-use Exception;
-use LogicException;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
-use function array_key_exists;
-use function count;
 
 final class AddressReferenceBaseImporter
 {
@@ -71,16 +66,16 @@ final class AddressReferenceBaseImporter
         string $street,
         string $streetNumber,
         string $source,
-        ?float $lat = null,
-        ?float $lon = null,
-        ?int $srid = null
+        float $lat = null,
+        float $lon = null,
+        int $srid = null
     ): void {
         if (!$this->isInitialized) {
             $this->initialize($source);
         }
 
         if ($this->currentSource !== $source) {
-            throw new LogicException('Cannot store addresses from different sources during same import. Execute finalize to commit inserts before changing the source');
+            throw new \LogicException('Cannot store addresses from different sources during same import. Execute finalize to commit inserts before changing the source');
         }
 
         $this->waitingForInsert[] = [
@@ -95,7 +90,7 @@ final class AddressReferenceBaseImporter
             $srid,
         ];
 
-        if (100 <= count($this->waitingForInsert)) {
+        if (100 <= \count($this->waitingForInsert)) {
             $this->doInsertPending();
         }
     }
@@ -122,7 +117,7 @@ final class AddressReferenceBaseImporter
 
     private function doInsertPending(): void
     {
-        if (!array_key_exists($forNumber = count($this->waitingForInsert), $this->cachingStatements)) {
+        if (!\array_key_exists($forNumber = \count($this->waitingForInsert), $this->cachingStatements)) {
             $sql = strtr(self::INSERT, [
                 '{{ values }}' => implode(
                     ', ',
@@ -130,7 +125,7 @@ final class AddressReferenceBaseImporter
                 ),
             ]);
 
-            $this->logger->debug(self::LOG_PREFIX . ' generated sql for insert', [
+            $this->logger->debug(self::LOG_PREFIX.' generated sql for insert', [
                 'sql' => $sql,
                 'forNumber' => $forNumber,
             ]);
@@ -142,7 +137,7 @@ final class AddressReferenceBaseImporter
             return;
         }
 
-        $this->logger->debug(self::LOG_PREFIX . ' inserting pending addresses', [
+        $this->logger->debug(self::LOG_PREFIX.' inserting pending addresses', [
             'number' => $forNumber,
             'first' => $this->waitingForInsert[0] ?? null,
         ]);
@@ -153,11 +148,11 @@ final class AddressReferenceBaseImporter
             $affected = $statement->executeStatement(array_merge(...$this->waitingForInsert));
 
             if (0 === $affected) {
-                throw new RuntimeException('no row affected');
+                throw new \RuntimeException('no row affected');
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // in some case, we can add debug code here
-            //dump($this->waitingForInsert);
+            // dump($this->waitingForInsert);
             throw $e;
         } finally {
             $this->waitingForInsert = [];
@@ -178,8 +173,8 @@ final class AddressReferenceBaseImporter
             'CREATE INDEX idx_ref_add_temp ON reference_address_temp (refid)'
         );
 
-        //1) Add new addresses
-        $this->logger->info(self::LOG_PREFIX . 'upsert new addresses');
+        // 1) Add new addresses
+        $this->logger->info(self::LOG_PREFIX.'upsert new addresses');
         $affected = $this->defaultConnection->executeStatement("INSERT INTO chill_main_address_reference
             (id, postcode_id, refid, street, streetnumber, municipalitycode, source, point, createdat, deletedat, updatedat)
             SELECT
@@ -198,16 +193,16 @@ final class AddressReferenceBaseImporter
             ON CONFLICT (refid, source) DO UPDATE
             SET postcode_id = excluded.postcode_id, refid = excluded.refid, street = excluded.street, streetnumber = excluded.streetnumber, municipalitycode = excluded.municipalitycode, source = excluded.source, point = excluded.point, updatedat = NOW(), deletedAt = NULL
         ");
-        $this->logger->info(self::LOG_PREFIX . 'addresses upserted', ['upserted' => $affected]);
+        $this->logger->info(self::LOG_PREFIX.'addresses upserted', ['upserted' => $affected]);
 
-        //3) Delete addresses
-        $this->logger->info(self::LOG_PREFIX . 'soft delete adresses');
+        // 3) Delete addresses
+        $this->logger->info(self::LOG_PREFIX.'soft delete adresses');
         $affected = $this->defaultConnection->executeStatement('UPDATE chill_main_address_reference
             SET deletedat = NOW()
             WHERE
                 chill_main_address_reference.refid NOT IN (SELECT refid FROM reference_address_temp WHERE source LIKE ?)
                 AND chill_main_address_reference.source LIKE ?
         ', [$this->currentSource, $this->currentSource]);
-        $this->logger->info(self::LOG_PREFIX . 'addresses deleted', ['deleted' => $affected]);
+        $this->logger->info(self::LOG_PREFIX.'addresses deleted', ['deleted' => $affected]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
index ffc759e03..ade89c6ff 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
@@ -11,12 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Service\Import;
 
-use Exception;
 use League\Csv\Reader;
 use League\Csv\Statement;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use UnexpectedValueException;
-use function is_int;
 
 class AddressReferenceFromBano
 {
@@ -24,8 +21,8 @@ class AddressReferenceFromBano
 
     public function import(string $departementNo): void
     {
-        if (!is_numeric($departementNo) || !is_int((int) $departementNo)) {
-            throw new UnexpectedValueException('Could not parse this department number');
+        if (!is_numeric($departementNo) || !\is_int((int) $departementNo)) {
+            throw new \UnexpectedValueException('Could not parse this department number');
         }
 
         $url = "https://bano.openstreetmap.fr/data/bano-{$departementNo}.csv";
@@ -33,7 +30,7 @@ class AddressReferenceFromBano
         $response = $this->client->request('GET', $url);
 
         if (200 !== $response->getStatusCode()) {
-            throw new Exception('Could not download CSV: ' . $response->getStatusCode());
+            throw new \Exception('Could not download CSV: '.$response->getStatusCode());
         }
 
         $file = tmpfile();
@@ -65,7 +62,7 @@ class AddressReferenceFromBano
                 $record['postcode'],
                 $record['street'],
                 $record['streetNumber'],
-                'BANO.' . $departementNo,
+                'BANO.'.$departementNo,
                 (float) $record['lat'],
                 (float) $record['lon'],
                 4326
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressToReferenceMatcher.php b/src/Bundle/ChillMainBundle/Service/Import/AddressToReferenceMatcher.php
index d5d296187..6a7bff632 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressToReferenceMatcher.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressToReferenceMatcher.php
@@ -17,7 +17,7 @@ use Psr\Log\LoggerInterface;
 
 /**
  * Mark existing addresses as to be reviewed regarding the
- * address reference
+ * address reference.
  */
 final readonly class AddressToReferenceMatcher
 {
@@ -61,7 +61,7 @@ final readonly class AddressToReferenceMatcher
     private const SUBSTITUTES = [
         '{{ to_review }}' => Address::ADDR_REFERENCE_STATUS_TO_REVIEW,
         '{{ matching }}' => Address::ADDR_REFERENCE_STATUS_MATCH,
-        '{{ reviewed }}' => Address::ADDR_REFERENCE_STATUS_REVIEWED
+        '{{ reviewed }}' => Address::ADDR_REFERENCE_STATUS_REVIEWED,
     ];
 
     public function __construct(private Connection $connection, private LoggerInterface $logger) {}
diff --git a/src/Bundle/ChillMainBundle/Service/Import/GeographicalUnitBaseImporter.php b/src/Bundle/ChillMainBundle/Service/Import/GeographicalUnitBaseImporter.php
index ee408990f..b76d6f096 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/GeographicalUnitBaseImporter.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/GeographicalUnitBaseImporter.php
@@ -14,11 +14,7 @@ namespace Chill\MainBundle\Service\Import;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Statement;
 use Doctrine\DBAL\Types\Types;
-use Exception;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
-use function array_key_exists;
-use function count;
 
 final class GeographicalUnitBaseImporter
 {
@@ -68,7 +64,7 @@ final class GeographicalUnitBaseImporter
         string $unitName,
         string $unitKey,
         string $geomAsWKT,
-        ?int $srid = null
+        int $srid = null
     ): void {
         $this->initialize();
 
@@ -81,7 +77,7 @@ final class GeographicalUnitBaseImporter
             'srid' => $srid,
         ];
 
-        if (100 <= count($this->waitingForInsert)) {
+        if (100 <= \count($this->waitingForInsert)) {
             $this->doInsertPending();
         }
     }
@@ -106,13 +102,13 @@ final class GeographicalUnitBaseImporter
 
     private function doInsertPending(): void
     {
-        $forNumber = count($this->waitingForInsert);
+        $forNumber = \count($this->waitingForInsert);
 
         if (0 === $forNumber) {
             return;
         }
 
-        if (!array_key_exists($forNumber, $this->cachingStatements)) {
+        if (!\array_key_exists($forNumber, $this->cachingStatements)) {
             $sql = strtr(self::INSERT, [
                 '{{ values }}' => implode(
                     ', ',
@@ -120,7 +116,7 @@ final class GeographicalUnitBaseImporter
                 ),
             ]);
 
-            $this->logger->debug(self::LOG_PREFIX . ' generated sql for insert', [
+            $this->logger->debug(self::LOG_PREFIX.' generated sql for insert', [
                 'sql' => $sql,
                 'forNumber' => $forNumber,
             ]);
@@ -145,9 +141,9 @@ final class GeographicalUnitBaseImporter
             $affected = $statement->executeStatement();
 
             if (0 === $affected) {
-                throw new RuntimeException('no row affected');
+                throw new \RuntimeException('no row affected');
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             throw $e;
         } finally {
             $this->waitingForInsert = [];
@@ -193,8 +189,8 @@ final class GeographicalUnitBaseImporter
                 "
                 );
 
-                //1) Add new units
-                $this->logger->info(self::LOG_PREFIX . 'upsert new units');
+                // 1) Add new units
+                $this->logger->info(self::LOG_PREFIX.'upsert new units');
                 $affected = $this->defaultConnection->executeStatement("INSERT INTO chill_main_geographical_unit
             (id, geom, unitname, layer_id, unitrefid)
             SELECT
@@ -208,10 +204,10 @@ final class GeographicalUnitBaseImporter
             DO UPDATE
             SET geom = EXCLUDED.geom, unitname = EXCLUDED.unitname
         ");
-                $this->logger->info(self::LOG_PREFIX . 'units upserted', ['upserted' => $affected]);
+                $this->logger->info(self::LOG_PREFIX.'units upserted', ['upserted' => $affected]);
 
-                //3) Delete units
-                $this->logger->info(self::LOG_PREFIX . 'soft delete adresses');
+                // 3) Delete units
+                $this->logger->info(self::LOG_PREFIX.'soft delete adresses');
                 $affected = $this->defaultConnection->executeStatement('WITH to_delete AS (
                     SELECT cmgu.id
                     FROM chill_main_geographical_unit AS cmgu
@@ -221,7 +217,7 @@ final class GeographicalUnitBaseImporter
                 DELETE FROM chill_main_geographical_unit
                 WHERE id NOT IN (SELECT id FROM to_delete)
                 ');
-                $this->logger->info(self::LOG_PREFIX . 'addresses deleted', ['deleted' => $affected]);
+                $this->logger->info(self::LOG_PREFIX.'addresses deleted', ['deleted' => $affected]);
             }
         );
     }
diff --git a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
index 2df66e69c..a95ba1abc 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Service\Import;
 
 use League\Csv\Reader;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -33,7 +32,7 @@ class PostalCodeBEFromBestAddress
         $tmpfile = fopen($tmpname, 'r+b');
 
         if (false === $tmpfile) {
-            throw new RuntimeException('could not create temporary file');
+            throw new \RuntimeException('could not create temporary file');
         }
 
         foreach ($this->client->stream($response) as $chunk) {
@@ -55,11 +54,11 @@ class PostalCodeBEFromBestAddress
         gzclose($uncompressedStream);
         unlink($tmpname);
 
-        $this->logger->info(self::class . ' list of postal code downloaded');
+        $this->logger->info(self::class.' list of postal code downloaded');
 
         $this->baseImporter->finalize();
 
-        $this->logger->info(self::class . ' postal code fetched', ['offset' => $offset ?? 0]);
+        $this->logger->info(self::class.' postal code fetched', ['offset' => $offset ?? 0]);
     }
 
     private function getFileDownloadUrl(string $lang): string
@@ -68,10 +67,10 @@ class PostalCodeBEFromBestAddress
             $release = $this->client->request('GET', self::RELEASE)
                 ->toArray();
         } catch (TransportExceptionInterface $e) {
-            throw new RuntimeException('could not get the release definition', 0, $e);
+            throw new \RuntimeException('could not get the release definition', 0, $e);
         }
 
-        $postals = array_filter($release['assets'], static fn (array $item) => 'postals.' . $lang . '.csv.gz' === $item['name']);
+        $postals = array_filter($release['assets'], static fn (array $item) => 'postals.'.$lang.'.csv.gz' === $item['name']);
 
         return array_values($postals)[0]['browser_download_url'];
     }
diff --git a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBaseImporter.php b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBaseImporter.php
index 173253c30..a0fc5a5db 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBaseImporter.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBaseImporter.php
@@ -13,9 +13,6 @@ namespace Chill\MainBundle\Service\Import;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Statement;
-use Exception;
-use function array_key_exists;
-use function count;
 
 /**
  * Optimized way to load postal code into database.
@@ -85,14 +82,14 @@ class PostalCodeBaseImporter
             $centerSRID,
         ];
 
-        if (100 <= count($this->waitingForInsert)) {
+        if (100 <= \count($this->waitingForInsert)) {
             $this->doInsertPending();
         }
     }
 
     private function doInsertPending(): void
     {
-        if (!array_key_exists($forNumber = count($this->waitingForInsert), $this->cachingStatements)) {
+        if (!\array_key_exists($forNumber = \count($this->waitingForInsert), $this->cachingStatements)) {
             $sql = strtr(self::QUERY, [
                 '{{ values }}' => implode(
                     ', ',
@@ -107,9 +104,9 @@ class PostalCodeBaseImporter
 
         try {
             $statement->executeStatement(array_merge(...$this->waitingForInsert));
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // in some case, we can add debug code here
-            //dump($this->waitingForInsert);
+            // dump($this->waitingForInsert);
             throw $e;
         } finally {
             $this->waitingForInsert = [];
diff --git a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
index 4c664d56a..ee68e9d96 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Service\Import;
 
 use League\Csv\Reader;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
@@ -33,13 +32,13 @@ class PostalCodeFRFromOpenData
         $response = $this->client->request('GET', self::CSV);
 
         if (200 !== $response->getStatusCode()) {
-            throw new RuntimeException('could not download CSV');
+            throw new \RuntimeException('could not download CSV');
         }
 
         $tmpfile = tmpfile();
 
         if (false === $tmpfile) {
-            throw new RuntimeException('could not create temporary file');
+            throw new \RuntimeException('could not create temporary file');
         }
 
         foreach ($this->client->stream($response) as $chunk) {
@@ -59,7 +58,7 @@ class PostalCodeFRFromOpenData
         $this->baseImporter->finalize();
         fclose($tmpfile);
 
-        $this->logger->info(self::class . ' postal code fetched', ['offset' => $offset ?? 0]);
+        $this->logger->info(self::class.' postal code fetched', ['offset' => $offset ?? 0]);
     }
 
     private function handleRecord(array $record): void
@@ -74,7 +73,7 @@ class PostalCodeFRFromOpenData
 
         if (str_starts_with($ref, '987')) {
             // some differences in French Polynesia
-            $ref .= '.' . trim((string) $record['Libellé_d_acheminement']);
+            $ref .= '.'.trim((string) $record['Libellé_d_acheminement']);
         }
 
         $this->baseImporter->importCode(
diff --git a/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php b/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
index b38af88e8..4f2e88c08 100644
--- a/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
+++ b/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
@@ -24,10 +24,10 @@ class ChillMailer implements MailerInterface
 
     public function __construct(private readonly MailerInterface $initial, private readonly LoggerInterface $chillLogger) {}
 
-    public function send(RawMessage $message, ?Envelope $envelope = null): void
+    public function send(RawMessage $message, Envelope $envelope = null): void
     {
         if ($message instanceof Email) {
-            $message->subject($this->prefix . $message->getSubject());
+            $message->subject($this->prefix.$message->getSubject());
         }
 
         $this->chillLogger->info('chill email sent', [
diff --git a/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDate.php b/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDate.php
index 7a21ec231..445b35cb0 100644
--- a/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDate.php
+++ b/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDate.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Service\RollingDate;
 
-use DateTimeImmutable;
-
 class RollingDate
 {
     final public const ALL_T = [
@@ -64,21 +62,21 @@ class RollingDate
     final public const T_YEAR_PREVIOUS_START = 'year_previous_start';
 
     /**
-     * @param string|self::T_* $roll
-     * @param DateTimeImmutable|null $fixedDate Only to insert if $roll equals @see{self::T_FIXED_DATE}
+     * @param string|self::T_*        $roll
+     * @param \DateTimeImmutable|null $fixedDate Only to insert if $roll equals @see{self::T_FIXED_DATE}
      */
     public function __construct(
         private readonly string $roll,
         private readonly ?\DateTimeImmutable $fixedDate = null,
-        private readonly DateTimeImmutable $pivotDate = new DateTimeImmutable('now')
+        private readonly \DateTimeImmutable $pivotDate = new \DateTimeImmutable('now')
     ) {}
 
-    public function getFixedDate(): ?DateTimeImmutable
+    public function getFixedDate(): ?\DateTimeImmutable
     {
         return $this->fixedDate;
     }
 
-    public function getPivotDate(): DateTimeImmutable
+    public function getPivotDate(): \DateTimeImmutable
     {
         return $this->pivotDate;
     }
diff --git a/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverter.php b/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverter.php
index beb61bcb7..f569ebf18 100644
--- a/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverter.php
+++ b/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverter.php
@@ -11,14 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Service\RollingDate;
 
-use DateInterval;
-use DateTimeImmutable;
-use LogicException;
-use UnexpectedValueException;
-
 class RollingDateConverter implements RollingDateConverterInterface
 {
-    public function convert(?RollingDate $rollingDate): ?DateTimeImmutable
+    public function convert(?RollingDate $rollingDate): ?\DateTimeImmutable
     {
         if (null === $rollingDate) {
             return null;
@@ -29,62 +24,62 @@ class RollingDateConverter implements RollingDateConverterInterface
                 return $this->toBeginOfMonth($rollingDate->getPivotDate());
 
             case RollingDate::T_MONTH_NEXT_START:
-                return $this->toBeginOfMonth($rollingDate->getPivotDate()->add(new DateInterval('P1M')));
+                return $this->toBeginOfMonth($rollingDate->getPivotDate()->add(new \DateInterval('P1M')));
 
             case RollingDate::T_MONTH_PREVIOUS_START:
-                return $this->toBeginOfMonth($rollingDate->getPivotDate()->sub(new DateInterval('P1M')));
+                return $this->toBeginOfMonth($rollingDate->getPivotDate()->sub(new \DateInterval('P1M')));
 
             case RollingDate::T_QUARTER_CURRENT_START:
                 return $this->toBeginOfQuarter($rollingDate->getPivotDate());
 
             case RollingDate::T_QUARTER_NEXT_START:
-                return $this->toBeginOfQuarter($rollingDate->getPivotDate()->add(new DateInterval('P3M')));
+                return $this->toBeginOfQuarter($rollingDate->getPivotDate()->add(new \DateInterval('P3M')));
 
             case RollingDate::T_QUARTER_PREVIOUS_START:
-                return $this->toBeginOfQuarter($rollingDate->getPivotDate()->sub(new DateInterval('P3M')));
+                return $this->toBeginOfQuarter($rollingDate->getPivotDate()->sub(new \DateInterval('P3M')));
 
             case RollingDate::T_WEEK_CURRENT_START:
                 return $this->toBeginOfWeek($rollingDate->getPivotDate());
 
             case RollingDate::T_WEEK_NEXT_START:
-                return $this->toBeginOfWeek($rollingDate->getPivotDate()->add(new DateInterval('P1W')));
+                return $this->toBeginOfWeek($rollingDate->getPivotDate()->add(new \DateInterval('P1W')));
 
             case RollingDate::T_WEEK_PREVIOUS_START:
-                return $this->toBeginOfWeek($rollingDate->getPivotDate()->sub(new DateInterval('P1W')));
+                return $this->toBeginOfWeek($rollingDate->getPivotDate()->sub(new \DateInterval('P1W')));
 
             case RollingDate::T_YEAR_CURRENT_START:
                 return $this->toBeginOfYear($rollingDate->getPivotDate());
 
             case RollingDate::T_YEAR_PREVIOUS_START:
-                return $this->toBeginOfYear($rollingDate->getPivotDate()->sub(new DateInterval('P1Y')));
+                return $this->toBeginOfYear($rollingDate->getPivotDate()->sub(new \DateInterval('P1Y')));
 
             case RollingDate::T_YEAR_NEXT_START:
-                return $this->toBeginOfYear($rollingDate->getPivotDate()->add(new DateInterval('P1Y')));
+                return $this->toBeginOfYear($rollingDate->getPivotDate()->add(new \DateInterval('P1Y')));
 
             case RollingDate::T_TODAY:
                 return $rollingDate->getPivotDate();
 
             case RollingDate::T_FIXED_DATE:
                 if (null === $rollingDate->getFixedDate()) {
-                    throw new LogicException('You must provide a fixed date when selecting a fixed date');
+                    throw new \LogicException('You must provide a fixed date when selecting a fixed date');
                 }
 
                 return $rollingDate->getFixedDate();
 
             default:
-                throw new UnexpectedValueException(sprintf('%s rolling operation not supported', $rollingDate->getRoll()));
+                throw new \UnexpectedValueException(sprintf('%s rolling operation not supported', $rollingDate->getRoll()));
         }
     }
 
-    private function toBeginOfMonth(DateTimeImmutable $date): DateTimeImmutable
+    private function toBeginOfMonth(\DateTimeImmutable $date): \DateTimeImmutable
     {
-        return DateTimeImmutable::createFromFormat(
+        return \DateTimeImmutable::createFromFormat(
             'Y-m-d His',
             sprintf('%s-%s-01 000000', $date->format('Y'), $date->format('m'))
         );
     }
 
-    private function toBeginOfQuarter(DateTimeImmutable $date): DateTimeImmutable
+    private function toBeginOfQuarter(\DateTimeImmutable $date): \DateTimeImmutable
     {
         $month = match ((int) $date->format('n')) {
             1, 2, 3 => '01',
@@ -93,26 +88,26 @@ class RollingDateConverter implements RollingDateConverterInterface
             10, 11, 12 => '10',
         };
 
-        return DateTimeImmutable::createFromFormat(
+        return \DateTimeImmutable::createFromFormat(
             'Y-m-d His',
             sprintf('%s-%s-01 000000', $date->format('Y'), $month)
         );
     }
 
-    private function toBeginOfWeek(DateTimeImmutable $date): DateTimeImmutable
+    private function toBeginOfWeek(\DateTimeImmutable $date): \DateTimeImmutable
     {
         if (1 === $dayOfWeek = (int) $date->format('N')) {
             return $date->setTime(0, 0, 0);
         }
 
         return $date
-            ->sub(new DateInterval('P' . ($dayOfWeek - 1) . 'D'))
+            ->sub(new \DateInterval('P'.($dayOfWeek - 1).'D'))
             ->setTime(0, 0, 0);
     }
 
-    private function toBeginOfYear(DateTimeImmutable $date): DateTimeImmutable
+    private function toBeginOfYear(\DateTimeImmutable $date): \DateTimeImmutable
     {
-        return DateTimeImmutable::createFromFormat(
+        return \DateTimeImmutable::createFromFormat(
             'Y-m-d His',
             sprintf('%s-01-01 000000', $date->format('Y'))
         );
diff --git a/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverterInterface.php b/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverterInterface.php
index 6c7d9a5bd..309ae4c7b 100644
--- a/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverterInterface.php
+++ b/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverterInterface.php
@@ -11,13 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Service\RollingDate;
 
-use DateTimeImmutable;
-
 interface RollingDateConverterInterface
 {
     /**
-     * @param RollingDate|null $rollingDate
-     * @return ($rollingDate is null ? null : DateTimeImmutable)
+     * @return ($rollingDate is null ? null : \DateTimeImmutable)
      */
-    public function convert(?RollingDate $rollingDate): ?DateTimeImmutable;
+    public function convert(?RollingDate $rollingDate): ?\DateTimeImmutable;
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php b/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
index 7aaa33c7c..a3968231e 100644
--- a/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
+++ b/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
@@ -25,9 +25,9 @@ class CSVCellTwig extends AbstractExtension
     /**
      * Replace into a string the char " by "".
      *
-     * @param string $content The input string.
+     * @param string $content the input string
      *
-     * @return string The safe string.
+     * @return string the safe string
      */
     public function csvCellFilter($content)
     {
@@ -55,7 +55,7 @@ class CSVCellTwig extends AbstractExtension
     /**
      * Returns the name of the extension.
      *
-     * @return The name of the extension.
+     * @return The name of the extension
      */
     public function getName()
     {
diff --git a/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php b/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php
index 690188704..54c9c4f63 100644
--- a/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php
+++ b/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Templating;
 
-use Parsedown;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
@@ -21,13 +20,13 @@ use Twig\TwigFilter;
 final class ChillMarkdownRenderExtension extends AbstractExtension
 {
     /**
-     * @var Parsedown
+     * @var \Parsedown
      */
     protected $parsedown;
 
     public function __construct()
     {
-        $this->parsedown = new Parsedown();
+        $this->parsedown = new \Parsedown();
         $this->parsedown->setSafeMode(true);
     }
 
diff --git a/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php b/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
index 56a729071..da91fc6f8 100644
--- a/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
@@ -16,8 +16,6 @@ use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
-use function array_merge;
-
 class ChillTwigHelper extends AbstractExtension
 {
     public function getFilters()
@@ -46,7 +44,7 @@ class ChillTwigHelper extends AbstractExtension
      * - `date_format` (default to `'medium'`)
      * - `time_format` (default to `'none'`)
      *
-     * @param string $value Default to 'No value'. Fallback to default if null
+     * @param string $value    Default to 'No value'. Fallback to default if null
      * @param string $message
      * @param string $template
      *
@@ -59,24 +57,24 @@ class ChillTwigHelper extends AbstractExtension
         $template = 'default',
         array $options = []
     ) {
-        if ($value instanceof DateTimeInterface) {
-            $options = array_merge([
+        if ($value instanceof \DateTimeInterface) {
+            $options = \array_merge([
                 'date_format' => 'medium',
                 'time_format' => 'none',
             ], $options);
 
             $t = match ($template) {
-                'default', 'blockquote' => '@ChillMain/Extensions/PrintOrMessage/' . $template . '_date.html.twig',
+                'default', 'blockquote' => '@ChillMain/Extensions/PrintOrMessage/'.$template.'_date.html.twig',
                 default => $template,
             };
         } else {
             $t = match ($template) {
-                'default', 'blockquote' => '@ChillMain/Extensions/PrintOrMessage/' . $template . '.html.twig',
+                'default', 'blockquote' => '@ChillMain/Extensions/PrintOrMessage/'.$template.'.html.twig',
                 default => $template,
             };
         }
 
-        return $twig->render($t, array_merge([
+        return $twig->render($t, \array_merge([
             'value' => $value,
             'message' => $message,
         ], $options));
diff --git a/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php b/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
index 1e55a8d74..9a11a7ffc 100644
--- a/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
@@ -69,9 +69,9 @@ class ChillTwigRoutingHelper extends AbstractExtension
     /**
      * Build an url with a returnPath parameter to current page.
      *
-     * @param string $name
-     * @param array $parameters
-     * @param bool $relative
+     * @param string     $name
+     * @param array      $parameters
+     * @param bool       $relative
      * @param mixed|null $label
      *
      * @return string
@@ -93,8 +93,8 @@ class ChillTwigRoutingHelper extends AbstractExtension
      * Build an url with a returnPath parameter to current page.
      *
      * @param string $name
-     * @param array $parameters
-     * @param bool $relative
+     * @param array  $parameters
+     * @param bool   $relative
      *
      * @return string
      */
@@ -118,8 +118,8 @@ class ChillTwigRoutingHelper extends AbstractExtension
      * Return the return path if it exists, or generate the path if not.
      *
      * @param string $name
-     * @param array $parameters
-     * @param bool $relative
+     * @param array  $parameters
+     * @param bool   $relative
      *
      * @return string
      */
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
index 16977fb27..fcc07ebca 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
@@ -12,7 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Templating\Entity;
 
 /**
- * @deprecated load @link{BoxUtilsChillEntityRenderTrait} in the render
+ * @deprecated load @see{BoxUtilsChillEntityRenderTrait} in the render
  */
 abstract class AbstractChillEntityRender implements ChillEntityRenderInterface
 {
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
index 299987286..f59b1cd66 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
@@ -13,12 +13,6 @@ namespace Chill\MainBundle\Templating\Entity;
 
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\Templating\EngineInterface;
-
-use function array_merge;
-use function strtr;
 
 /**
  * @implements ChillEntityRenderInterface<Address>
@@ -40,7 +34,7 @@ class AddressRender implements ChillEntityRenderInterface
 
     public function renderBox($addr, array $options): string
     {
-        $options = array_merge(self::DEFAULT_OPTIONS, $options);
+        $options = \array_merge(self::DEFAULT_OPTIONS, $options);
 
         return $this->templating
             ->render('@ChillMain/Entity/address.html.twig', [
@@ -60,7 +54,7 @@ class AddressRender implements ChillEntityRenderInterface
         $lines = [];
 
         if (null !== $addr->getPostcode()) {
-            if ($addr->getPostcode()->getCountry()->getCountryCode() === 'FR') {
+            if ('FR' === $addr->getPostcode()->getCountry()->getCountryCode()) {
                 $lines[] = $this->renderIntraBuildingLine($addr);
                 $lines[] = $this->renderBuildingLine($addr);
                 $lines[] = $this->renderStreetLine($addr);
@@ -105,10 +99,10 @@ class AddressRender implements ChillEntityRenderInterface
             $streetNumber = '';
         }
 
-        $res = trim($street . ', ' . $streetNumber, ', ');
+        $res = trim($street.', '.$streetNumber, ', ');
 
-        if ($addr->getPostcode()->getCountry()->getCountryCode() === 'FR') {
-            $res = trim($streetNumber . ', ' . $street, ', ');
+        if ('FR' === $addr->getPostcode()->getCountry()->getCountryCode()) {
+            $res = trim($streetNumber.', '.$street, ', ');
         }
 
         if ((',' === $res) || ('' === $res)) {
@@ -130,7 +124,7 @@ class AddressRender implements ChillEntityRenderInterface
 
     private function renderBuildingLine(Address $addr): ?string
     {
-        if ($addr->getBuildingName() !== '') {
+        if ('' !== $addr->getBuildingName()) {
             $building = $addr->getBuildingName();
         } else {
             $building = '';
@@ -141,13 +135,13 @@ class AddressRender implements ChillEntityRenderInterface
             $intraBuilding = '';
         }
 
-        $res = trim($building . ' - ' . $intraBuilding, ' - ');
+        $res = trim($building.' - '.$intraBuilding, ' - ');
 
         if ('' === $res) {
             $res = null;
         }
 
-        if ($addr->getPostcode()->getCountry()->getCountryCode() === 'FR') {
+        if ('FR' === $addr->getPostcode()->getCountry()->getCountryCode()) {
             $res = $addr->getBuildingName();
         }
 
@@ -157,14 +151,14 @@ class AddressRender implements ChillEntityRenderInterface
     private function renderCityLine(Address $addr): string
     {
         if (null !== $addr->getPostcode()) {
-            $res = strtr('{postcode} {label}', [
+            $res = \strtr('{postcode} {label}', [
                 '{postcode}' => $addr->getPostcode()->getCode(),
                 '{label}' => $addr->getPostcode()->getName(),
             ]);
 
-            if ($addr->getPostcode()->getCountry()->getCountryCode() === 'FR') {
+            if ('FR' === $addr->getPostcode()->getCountry()->getCountryCode()) {
                 if ('' !== $addr->getDistribution()) {
-                    $res = $res . ' ' . $addr->getDistribution();
+                    $res = $res.' '.$addr->getDistribution();
                 }
             }
         }
@@ -189,19 +183,19 @@ class AddressRender implements ChillEntityRenderInterface
         $arr = [];
 
         if ('' !== $addr->getFlat()) {
-            $arr[] = 'appart ' . $addr->getFlat();
+            $arr[] = 'appart '.$addr->getFlat();
         }
 
         if ('' !== $addr->getFloor()) {
-            $arr[] = 'ét ' . $addr->getFloor();
+            $arr[] = 'ét '.$addr->getFloor();
         }
 
         if ('' !== $addr->getCorridor()) {
-            $arr[] = 'coul ' . $addr->getCorridor();
+            $arr[] = 'coul '.$addr->getCorridor();
         }
 
         if ('' !== $addr->getSteps()) {
-            $arr[] = 'esc ' . $addr->getSteps();
+            $arr[] = 'esc '.$addr->getSteps();
         }
 
         $res = implode(' - ', $arr);
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/BoxUtilsChillEntityRenderTrait.php b/src/Bundle/ChillMainBundle/Templating/Entity/BoxUtilsChillEntityRenderTrait.php
index 860313cbd..a0ce6355f 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/BoxUtilsChillEntityRenderTrait.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/BoxUtilsChillEntityRenderTrait.php
@@ -20,6 +20,6 @@ trait BoxUtilsChillEntityRenderTrait
 
     protected function getDefaultOpeningBox($classSuffix): string
     {
-        return '<section class="chill-entity entity-' . $classSuffix . '">';
+        return '<section class="chill-entity entity-'.$classSuffix.'">';
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php
index 6b1294d42..0e2743e8c 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php
@@ -20,8 +20,8 @@ class ChillEntityRender implements ChillEntityRenderInterface
 
     public function renderBox($entity, array $options): string
     {
-        return $this->getDefaultOpeningBox('default') . $entity
-            . $this->getDefaultClosingBox();
+        return $this->getDefaultOpeningBox('default').$entity
+            .$this->getDefaultClosingBox();
     }
 
     public function renderString($entity, array $options): string
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
index 2a1c91fa2..9c8d4599e 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
@@ -53,9 +53,6 @@ class ChillEntityRenderExtension extends AbstractExtension
         ];
     }
 
-    /**
-     * @param $entity
-     */
     public function renderBox($entity, array $options = []): string
     {
         if (null === $entity) {
@@ -66,9 +63,6 @@ class ChillEntityRenderExtension extends AbstractExtension
             ->renderBox($entity, $options);
     }
 
-    /**
-     * @param $entity
-     */
     public function renderString($entity, array $options = []): string
     {
         if (null === $entity) {
@@ -79,10 +73,6 @@ class ChillEntityRenderExtension extends AbstractExtension
             ->renderString($entity, $options);
     }
 
-    /**
-     * @param $entity
-     * @param $options
-     */
     protected function getRender($entity, $options): ?ChillEntityRenderInterface
     {
         foreach ($this->renders as $render) {
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
index 5d8bd372a..d628420c7 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
@@ -32,6 +32,7 @@ interface ChillEntityRenderInterface
      * ```
      *
      * @param T $entity
+     *
      * @phpstan-pure
      */
     public function renderBox($entity, array $options): string;
@@ -42,6 +43,7 @@ interface ChillEntityRenderInterface
      * Example: returning the name of a person.
      *
      * @param T $entity
+     *
      * @phpstan-pure
      */
     public function renderString($entity, array $options): string;
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
index c64c31c68..a4d0f48e6 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
@@ -12,11 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Templating\Entity;
 
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
-use Symfony\Component\Templating\EngineInterface;
-
-use function array_merge;
 
 /**
  * @implements ChillEntityRenderInterface<CommentEmbeddable>
@@ -30,7 +26,7 @@ class CommentRender implements ChillEntityRenderInterface
     public function renderBox($entity, array $options): string
     {
         // default options
-        $options = array_merge([
+        $options = \array_merge([
             'user' => [],
             'disable_markdown' => false,
             'limit_lines' => null,
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
index c26664bf1..790996847 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
@@ -13,11 +13,7 @@ namespace Chill\MainBundle\Templating\Entity;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use DateTimeImmutable;
-
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_merge;
 
 /**
  * @implements ChillEntityRenderInterface<User>
@@ -33,12 +29,9 @@ class UserRender implements ChillEntityRenderInterface
 
     public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly \Twig\Environment $engine, private readonly TranslatorInterface $translator) {}
 
-    /**
-     * @param mixed $entity
-     */
     public function renderBox($entity, array $options): string
     {
-        $opts = array_merge(self::DEFAULT_OPTIONS, $options);
+        $opts = \array_merge(self::DEFAULT_OPTIONS, $options);
 
         return $this->engine->render('@ChillMain/Entity/user.html.twig', [
             'user' => $entity,
@@ -46,27 +39,24 @@ class UserRender implements ChillEntityRenderInterface
         ]);
     }
 
-    /**
-     * @param mixed $entity
-     */
     public function renderString($entity, array $options): string
     {
-        $opts = array_merge(self::DEFAULT_OPTIONS, $options);
+        $opts = \array_merge(self::DEFAULT_OPTIONS, $options);
 
         $str = $entity->getLabel();
 
         if (null !== $entity->getUserJob($opts['at']) && $opts['user_job']) {
-            $str .= ' (' . $this->translatableStringHelper
-                ->localize($entity->getUserJob($opts['at'])->getLabel()) . ')';
+            $str .= ' ('.$this->translatableStringHelper
+                ->localize($entity->getUserJob($opts['at'])->getLabel()).')';
         }
 
         if (null !== $entity->getMainScope($opts['at']) && $opts['main_scope']) {
-            $str .= ' (' . $this->translatableStringHelper
-                ->localize($entity->getMainScope($opts['at'])->getName()) . ')';
+            $str .= ' ('.$this->translatableStringHelper
+                ->localize($entity->getMainScope($opts['at'])->getName()).')';
         }
 
         if ($entity->isAbsent() && $opts['absence']) {
-            $str .= ' (' . $this->translator->trans('absence.Absent') . ')';
+            $str .= ' ('.$this->translator->trans('absence.Absent').')';
         }
 
         return $str;
diff --git a/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php b/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
index a0ef79764..afdb32349 100644
--- a/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
+++ b/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Templating\Events;
 
-use ArrayAccess;
-use RuntimeException;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -30,7 +28,7 @@ use Symfony\Component\EventDispatcher\Event;
  * The keys are read-only: if you try to update the context using array access
  * (example, using `$event['context_key'] = $bar;`, an error will be thrown.
  */
-class DelegatedBlockRenderingEvent extends \Symfony\Contracts\EventDispatcher\Event implements ArrayAccess
+class DelegatedBlockRenderingEvent extends \Symfony\Contracts\EventDispatcher\Event implements \ArrayAccess
 {
     /**
      * The returned content of the event.
@@ -82,13 +80,11 @@ class DelegatedBlockRenderingEvent extends \Symfony\Contracts\EventDispatcher\Ev
 
     public function offsetSet($offset, $value): never
     {
-        throw new RuntimeException('The event context is read-only, you are not '
-                . 'allowed to update it.');
+        throw new \RuntimeException('The event context is read-only, you are not allowed to update it.');
     }
 
     public function offsetUnset($offset): never
     {
-        throw new RuntimeException('The event context is read-only, you are not '
-                . 'allowed to update it.');
+        throw new \RuntimeException('The event context is read-only, you are not allowed to update it.');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderGetActiveFilterHelper.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderGetActiveFilterHelper.php
index 0b15d511d..4ca9eda41 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderGetActiveFilterHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderGetActiveFilterHelper.php
@@ -25,7 +25,7 @@ final readonly class FilterOrderGetActiveFilterHelper
     ) {}
 
     /**
-     * Return all the data required to display the active filters
+     * Return all the data required to display the active filters.
      *
      * @return array<array{label: string, value: string, position: string, name: string}>
      */
@@ -38,7 +38,7 @@ final readonly class FilterOrderGetActiveFilterHelper
         }
 
         foreach ($filterOrderHelper->getDateRanges() as $name => ['label' => $label]) {
-            $base = ['position' => FilterOrderPositionEnum::DateRange->value, 'name' => $name, 'label' => (string)$label];
+            $base = ['position' => FilterOrderPositionEnum::DateRange->value, 'name' => $name, 'label' => (string) $label];
 
             if (null !== ($from = $filterOrderHelper->getDateRangeData($name)['from'] ?? null)) {
                 $result[] = ['value' => $this->translator->trans('filter_order.by_date.From', ['from_date' => $from]), ...$base];
@@ -66,7 +66,7 @@ final readonly class FilterOrderGetActiveFilterHelper
                         throw new \UnexpectedValueException(sprintf("we are not able to transform the value of %s to a string. Implements \\Stringable or add a 'choice_label' option to the filterFormBuilder", $selected::class));
                     }
 
-                    $value = (string)$selected;
+                    $value = (string) $selected;
                 }
 
                 $result[] = ['value' => $this->translator->trans($value), 'label' => $label, 'position' => FilterOrderPositionEnum::EntityChoice->value, 'name' => $name];
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
index 309db574c..9b6a42fe4 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
@@ -13,13 +13,10 @@ namespace Chill\MainBundle\Templating\Listing;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\Listing\FilterOrderType;
-use DateTimeImmutable;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
-use function array_merge;
-
 final class FilterOrderHelper
 {
     private array $checkboxes = [];
@@ -78,14 +75,13 @@ final class FilterOrderHelper
         return $this->entityChoices;
     }
 
-    public function addUserPicker(string $name, ?string $label = null, array $options = []): self
+    public function addUserPicker(string $name, string $label = null, array $options = []): self
     {
         $this->userPickers[$name] = ['label' => $label, 'options' => $options];
 
         return $this;
     }
 
-
     public function addCheckbox(string $name, array $choices, ?array $default = [], ?array $trans = [], array $options = []): self
     {
         if ([] === $trans) {
@@ -102,7 +98,7 @@ final class FilterOrderHelper
         return $this;
     }
 
-    public function addDateRange(string $name, ?string $label = null, ?DateTimeImmutable $from = null, ?DateTimeImmutable $to = null): self
+    public function addDateRange(string $name, string $label = null, \DateTimeImmutable $from = null, \DateTimeImmutable $to = null): self
     {
         $this->dateRanges[$name] = ['from' => $from, 'to' => $to, 'label' => $label];
 
@@ -112,7 +108,7 @@ final class FilterOrderHelper
     public function buildForm(): FormInterface
     {
         return $this->formFactory
-            ->createNamed(self::FORM_NAME, $this->formType, $this->getDefaultData(), array_merge([
+            ->createNamed(self::FORM_NAME, $this->formType, $this->getDefaultData(), \array_merge([
                 'helper' => $this,
                 'method' => 'GET',
                 'csrf_protection' => false,
@@ -187,7 +183,7 @@ final class FilterOrderHelper
     }
 
     /**
-     * @return array{to: ?DateTimeImmutable, from: ?DateTimeImmutable}
+     * @return array{to: ?\DateTimeImmutable, from: ?\DateTimeImmutable}
      */
     public function getDateRangeData(string $name): array
     {
@@ -223,7 +219,7 @@ final class FilterOrderHelper
             'dateRanges' => [],
             'single_checkboxes' => [],
             'entity_choices' => [],
-            'user_pickers' => []
+            'user_pickers' => [],
         ];
 
         if ($this->hasSearchBox()) {
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
index 522c930a0..d5df6d4f3 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
@@ -11,11 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Templating\Listing;
 
-use DateTimeImmutable;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class FilterOrderHelperBuilder
 {
@@ -66,7 +63,7 @@ class FilterOrderHelperBuilder
         return $this;
     }
 
-    public function addDateRange(string $name, ?string $label = null, ?DateTimeImmutable $from = null, ?DateTimeImmutable $to = null): self
+    public function addDateRange(string $name, string $label = null, \DateTimeImmutable $from = null, \DateTimeImmutable $to = null): self
     {
         $this->dateRanges[$name] = ['from' => $from, 'to' => $to, 'label' => $label];
 
@@ -80,7 +77,7 @@ class FilterOrderHelperBuilder
         return $this;
     }
 
-    public function addUserPicker(string $name, ?string $label = null, ?array $options = []): self
+    public function addUserPicker(string $name, string $label = null, ?array $options = []): self
     {
         $this->userPickers[$name] = ['label' => $label, 'options' => $options];
 
@@ -128,7 +125,6 @@ class FilterOrderHelperBuilder
             $helper->addDateRange($name, $label, $from, $to);
         }
 
-
         foreach (
             $this->userPickers as $name => [
                 'label' => $label,
@@ -138,7 +134,6 @@ class FilterOrderHelperBuilder
             $helper->addUserPicker($name, $label, $options);
         }
 
-
         return $helper;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
index a1d966f5e..0aff466dc 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
@@ -13,8 +13,6 @@ namespace Chill\MainBundle\Templating\Listing;
 
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class FilterOrderHelperFactory implements FilterOrderHelperFactoryInterface
 {
diff --git a/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
index 924e1a2be..b5fedeec0 100644
--- a/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
@@ -15,8 +15,6 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-
 final class TranslatableStringHelper implements TranslatableStringHelperInterface
 {
     private readonly string $defaultLocale;
@@ -36,12 +34,12 @@ final class TranslatableStringHelper implements TranslatableStringHelperInterfac
 
         $language = null === $request ? $this->defaultLocale : $request->getLocale();
 
-        if (array_key_exists($language, $translatableStrings)) {
+        if (\array_key_exists($language, $translatableStrings)) {
             return $translatableStrings[$language];
         }
 
         foreach ($this->translator->getFallbackLocales() as $locale) {
-            if (array_key_exists($locale, $translatableStrings)) {
+            if (\array_key_exists($locale, $translatableStrings)) {
                 return $translatableStrings[$locale];
             }
         }
diff --git a/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php b/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
index ab48a76b0..eceae8d9c 100644
--- a/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
+++ b/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
@@ -43,7 +43,7 @@ class TranslatableStringTwig extends AbstractExtension
     /**
      * Returns the name of the extension.
      *
-     * @return The name of the extension.
+     * @return The name of the extension
      */
     public function getName()
     {
diff --git a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
index a95f9831c..7245c62fb 100644
--- a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
+++ b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
@@ -17,9 +17,6 @@ use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
-use function array_key_exists;
-use function ksort;
-
 /**
  * Add the function `chill_delegated_block`.
  *
@@ -78,7 +75,7 @@ class WidgetRenderingTwig extends AbstractExtension
      * which add the widget to this class when it is created by from DI, according
      * to the given config under `chill_main`.
      *
-     * @param string $place
+     * @param string          $place
      * @param WidgetInterface $widget
      */
     public function addWidget($place, mixed $ordering, $widget, array $config = [])
@@ -127,9 +124,9 @@ class WidgetRenderingTwig extends AbstractExtension
         // for old rendering events (deprecated)
         $event = new DelegatedBlockRenderingEvent($context);
 
-        $this->eventDispatcher->dispatch($event, 'chill_block.' . $block);
+        $this->eventDispatcher->dispatch($event, 'chill_block.'.$block);
 
-        return $content . ' ' . $event->getContent();
+        return $content.' '.$event->getContent();
     }
 
     /**
@@ -139,11 +136,11 @@ class WidgetRenderingTwig extends AbstractExtension
      */
     protected function getWidgetsArraysOrdered($place)
     {
-        if (!array_key_exists($place, $this->widget)) {
+        if (!\array_key_exists($place, $this->widget)) {
             $this->widget[$place] = [];
         }
 
-        ksort($this->widget[$place]);
+        \ksort($this->widget[$place]);
 
         return $this->widget[$place];
     }
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
index 70df849cc..e66096c63 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
@@ -17,12 +17,6 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Traversable;
 
-use function call_user_func;
-use function count;
-use function is_array;
-use function is_callable;
-use function is_string;
-
 /**
  * Helper which creates a set of test for aggregators.
  */
@@ -45,7 +39,7 @@ abstract class AbstractAggregatorTest extends KernelTestCase
     {
         $datas = $this->getFormData();
 
-        if (!is_array($datas)) {
+        if (!\is_array($datas)) {
             $datas = iterator_to_array($datas);
         }
 
@@ -67,7 +61,7 @@ abstract class AbstractAggregatorTest extends KernelTestCase
     {
         $datas = $this->getFormData();
 
-        if (!is_array($datas)) {
+        if (!\is_array($datas)) {
             $datas = iterator_to_array($datas);
         }
 
@@ -86,7 +80,7 @@ abstract class AbstractAggregatorTest extends KernelTestCase
     {
         $datas = $this->getFormData();
 
-        if (!is_array($datas)) {
+        if (!\is_array($datas)) {
             $datas = iterator_to_array($datas);
         }
 
@@ -108,7 +102,7 @@ abstract class AbstractAggregatorTest extends KernelTestCase
     {
         $datas = $this->getFormData();
 
-        if (!is_array($datas)) {
+        if (!\is_array($datas)) {
             $datas = iterator_to_array($datas);
         }
 
@@ -124,7 +118,7 @@ abstract class AbstractAggregatorTest extends KernelTestCase
     {
         $datas = $this->getFormData();
 
-        if (!is_array($datas)) {
+        if (!\is_array($datas)) {
             $datas = iterator_to_array($datas);
         }
 
@@ -186,7 +180,7 @@ abstract class AbstractAggregatorTest extends KernelTestCase
 
         $alteredQuery = $qb->getAllAliases();
 
-        $this->assertGreaterThanOrEqual(count($aliases), count($alteredQuery));
+        $this->assertGreaterThanOrEqual(\count($aliases), \count($alteredQuery));
 
         foreach ($aliases as $alias) {
             $this->assertContains($alias, $alteredQuery);
@@ -194,8 +188,8 @@ abstract class AbstractAggregatorTest extends KernelTestCase
     }
 
     /**
-     * @return void
      * @dataProvider dataProviderQueryExecution
+     *
      * @group dbIntensive
      */
     public function testQueryExecution(QueryBuilder $qb, array $data): void
@@ -217,30 +211,30 @@ abstract class AbstractAggregatorTest extends KernelTestCase
     public function testAlterQuery(QueryBuilder $query, $data)
     {
         // retains informations about query
-        $nbOfFrom = $query->getDQLPart('from') !== null ?
-            count($query->getDQLPart('from')) : 0;
-        $nbOfWhere = $query->getDQLPart('where') !== null ?
+        $nbOfFrom = null !== $query->getDQLPart('from') ?
+            \count($query->getDQLPart('from')) : 0;
+        $nbOfWhere = null !== $query->getDQLPart('where') ?
             $query->getDQLPart('where')->count() : 0;
-        $nbOfSelect = $query->getDQLPart('select') !== null ?
-            count($query->getDQLPart('select')) : 0;
+        $nbOfSelect = null !== $query->getDQLPart('select') ?
+            \count($query->getDQLPart('select')) : 0;
 
         $this->getAggregator()->alterQuery($query, $data);
 
         $this->assertGreaterThanOrEqual(
             $nbOfFrom,
-            $query->getDQLPart('from') !== null ? count($query->getDQLPart('from')) : 0,
+            null !== $query->getDQLPart('from') ? \count($query->getDQLPart('from')) : 0,
             "Test that there are equal or more 'from' clause after that the filter has
                 altered the query"
         );
         $this->assertGreaterThanOrEqual(
             $nbOfWhere,
-            $query->getDQLPart('where') !== null ? $query->getDQLPart('where')->count() : 0,
+            null !== $query->getDQLPart('where') ? $query->getDQLPart('where')->count() : 0,
             "Test that there are equal or more 'where' clause after that the filter has"
-            . 'altered the query'
+            .'altered the query'
         );
         $this->assertGreaterThanOrEqual(
             $nbOfSelect,
-            $query->getDQLPart('select') !== null ? count($query->getDQLPart('select')) : 0,
+            null !== $query->getDQLPart('select') ? \count($query->getDQLPart('select')) : 0,
             "Test that the filter has no altered the 'select' part of the query"
         );
     }
@@ -283,7 +277,7 @@ abstract class AbstractAggregatorTest extends KernelTestCase
         );
         $this->assertGreaterThanOrEqual(
             1,
-            count($queryKeys),
+            \count($queryKeys),
             'test that there are at least one query key returned'
         );
     }
@@ -312,9 +306,9 @@ abstract class AbstractAggregatorTest extends KernelTestCase
 
         $results = $qb->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY);
 
-        if (count($results) === 0) {
+        if (0 === \count($results)) {
             $this->markTestIncomplete('The result is empty. We cannot process tests '
-                . 'on results');
+                .'on results');
         }
 
         // testing the result
@@ -335,23 +329,23 @@ abstract class AbstractAggregatorTest extends KernelTestCase
             $closure = $this->getAggregator()->getLabels($key, [$result[$key]], $data);
 
             $this->assertTrue(
-                is_callable($closure, false),
+                \is_callable($closure, false),
                 'test that the `getLabels` for key is a callable'
             );
             $this->assertTrue(
-                is_string((string) call_user_func($closure, $result[$key])),
+                \is_string((string) \call_user_func($closure, $result[$key])),
                 sprintf('test that the callable return by `getLabels` for key %s '
-                    . 'is a string or an be converted to a string', $key)
+                    .'is a string or an be converted to a string', $key)
             );
 
             $this->assertTrue(
                 // conditions
-                is_string((string) call_user_func($closure, '_header'))
-                && !empty(call_user_func($closure, '_header'))
-                && call_user_func($closure, '_header') !== '_header',
+                \is_string((string) \call_user_func($closure, '_header'))
+                && !empty(\call_user_func($closure, '_header'))
+                && '_header' !== \call_user_func($closure, '_header'),
                 // message
                 sprintf('Test that the callable return by `getLabels` for key %s '
-                . 'can provide an header', $key)
+                .'can provide an header', $key)
             );
         }
     }
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
index 38298490e..8d845b413 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
@@ -15,15 +15,7 @@ use Chill\MainBundle\Test\PrepareClientTrait;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NativeQuery;
 use Doctrine\ORM\QueryBuilder;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\BrowserKit\HttpBrowser;
-use Symfony\Component\HttpFoundation\Request;
-
-use function call_user_func;
-use function count;
-use function is_callable;
-use function is_string;
 
 /**
  * This class provide a set of tests for exports.
@@ -84,14 +76,12 @@ abstract class AbstractExportTest extends WebTestCase
         $circles = $em->getRepository(\Chill\MainBundle\Entity\Scope::class)
             ->findAll();
 
-        if (count($centers) === 0) {
-            throw new RuntimeException('No center found. Did you forget to '
-                . 'run `doctrine:fixtures:load` command before ?');
+        if (0 === \count($centers)) {
+            throw new \RuntimeException('No center found. Did you forget to run `doctrine:fixtures:load` command before ?');
         }
 
-        if (count($circles) === 0) {
-            throw new RuntimeException('No circle found. Did you forget to '
-                . 'run `doctrine:fixtures:load` command before ?');
+        if (0 === \count($circles)) {
+            throw new \RuntimeException('No circle found. Did you forget to run `doctrine:fixtures:load` command before ?');
         }
 
         return [[
@@ -155,7 +145,7 @@ abstract class AbstractExportTest extends WebTestCase
         $this->assertNotEmpty(
             $export->getDescription(),
             'Assert that the `getDescription` method does not return an empty '
-            . 'string.'
+            .'string.'
         );
     }
 
@@ -176,7 +166,7 @@ abstract class AbstractExportTest extends WebTestCase
         );
         $this->assertGreaterThanOrEqual(
             1,
-            count($queryKeys),
+            \count($queryKeys),
             'test that there are at least one query key returned'
         );
     }
@@ -191,7 +181,7 @@ abstract class AbstractExportTest extends WebTestCase
      * - each of this callable can provide a string for '_header'
      *
      * @param string[] $modifiers
-     * @param array $acl
+     * @param array    $acl
      *
      * @dataProvider dataProviderInitiateQuery
      */
@@ -216,9 +206,9 @@ abstract class AbstractExportTest extends WebTestCase
             'assert that the returned result is an array'
         );
 
-        if (count($results) === 0) {
+        if (0 === \count($results)) {
             $this->markTestIncomplete('The result is empty. We cannot process tests '
-                . 'on results');
+                .'on results');
         }
 
         // testing the result
@@ -239,18 +229,18 @@ abstract class AbstractExportTest extends WebTestCase
             $closure = $this->getExport()->getLabels($key, [$value], $data);
 
             $this->assertTrue(
-                is_callable($closure, false),
+                \is_callable($closure, false),
                 'test that the `getLabels` for key is a callable'
             );
 
             $this->assertTrue(
                 // conditions
-                is_string((string) call_user_func($closure, '_header'))
-                && !empty(call_user_func($closure, '_header'))
-                && call_user_func($closure, '_header') !== '_header',
+                \is_string((string) \call_user_func($closure, '_header'))
+                && !empty(\call_user_func($closure, '_header'))
+                && '_header' !== \call_user_func($closure, '_header'),
                 // message
                 sprintf('Test that the callable return by `getLabels` for key %s '
-                . 'can provide an header', $key)
+                .'can provide an header', $key)
             );
         }
     }
@@ -267,7 +257,7 @@ abstract class AbstractExportTest extends WebTestCase
             'Assert that the `getType` method return a string'
         );
         $this->assertNotEmpty($export->getType(), 'Assert that the `getType` method'
-            . ' does not return an empty string.');
+            .' does not return an empty string.');
     }
 
     /**
@@ -296,13 +286,13 @@ abstract class AbstractExportTest extends WebTestCase
         if ($query instanceof QueryBuilder) {
             $this->assertGreaterThanOrEqual(
                 1,
-                count($query->getDQLPart('select')),
+                \count($query->getDQLPart('select')),
                 "assert there is at least one 'select' part"
             );
 
             $this->assertGreaterThanOrEqual(
                 1,
-                count($query->getDQLPart('from')),
+                \count($query->getDQLPart('from')),
                 "assert there is at least one 'from' part"
             );
         } elseif ($query instanceof NativeQuery) {
@@ -345,8 +335,8 @@ abstract class AbstractExportTest extends WebTestCase
             );
         } elseif ($query instanceof NativeQuery) {
             $this->assertTrue(
-                $export->supportsModifiers() === null
-                || count($export->supportsModifiers()) === 0,
+                null === $export->supportsModifiers()
+                || 0 === \count($export->supportsModifiers()),
                 'Test that the `supportsModifier` methods returns null or an empty array'
             );
         }
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
index 14442212f..6f5d74de5 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
@@ -13,15 +13,9 @@ namespace Chill\MainBundle\Test\Export;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
-use Exception;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
-use function count;
-use function get_class;
-use function is_array;
-use function is_string;
-
 /**
  *  Helper to test filters.
  */
@@ -148,7 +142,7 @@ abstract class AbstractFilterTest extends KernelTestCase
 
         $alteredQuery = $qb->getAllAliases();
 
-        $this->assertGreaterThanOrEqual(count($aliases), count($alteredQuery));
+        $this->assertGreaterThanOrEqual(\count($aliases), \count($alteredQuery));
 
         foreach ($aliases as $alias) {
             $this->assertContains($alias, $alteredQuery);
@@ -159,35 +153,36 @@ abstract class AbstractFilterTest extends KernelTestCase
      * test the alteration of query by the filter.
      *
      * @dataProvider dataProviderAlterQuery
+     *
      * @group dbIntensive
      */
     public function testAlterQuery(QueryBuilder $query, array $data)
     {
         // retains informations about query
-        $nbOfFrom = $query->getDQLPart('from') !== null ?
-            count($query->getDQLPart('from')) : 0;
-        $nbOfWhere = $query->getDQLPart('where') !== null ?
+        $nbOfFrom = null !== $query->getDQLPart('from') ?
+            \count($query->getDQLPart('from')) : 0;
+        $nbOfWhere = null !== $query->getDQLPart('where') ?
             $query->getDQLPart('where')->count() : 0;
-        $nbOfSelect = $query->getDQLPart('select') !== null ?
-            count($query->getDQLPart('select')) : 0;
+        $nbOfSelect = null !== $query->getDQLPart('select') ?
+            \count($query->getDQLPart('select')) : 0;
 
         $this->getFilter()->alterQuery($query, $data);
 
         $this->assertGreaterThanOrEqual(
             $nbOfFrom,
-            $query->getDQLPart('from') !== null ? count($query->getDQLPart('from')) : 0,
+            null !== $query->getDQLPart('from') ? \count($query->getDQLPart('from')) : 0,
             "Test that there are equal or more 'from' clause after that the filter has
                 altered the query"
         );
         $this->assertGreaterThanOrEqual(
             $nbOfWhere,
-            $query->getDQLPart('where') !== null ? $query->getDQLPart('where')->count() : 0,
+            null !== $query->getDQLPart('where') ? $query->getDQLPart('where')->count() : 0,
             "Test that there are equal or more 'where' clause after that the filter has"
-            . 'altered the query'
+            .'altered the query'
         );
         $this->assertEquals(
             $nbOfSelect,
-            $query->getDQLPart('select') !== null ? count($query->getDQLPart('select')) : 0,
+            null !== $query->getDQLPart('select') ? \count($query->getDQLPart('select')) : 0,
             "Test that the filter has no altered the 'select' part of the query"
         );
     }
@@ -221,16 +216,16 @@ abstract class AbstractFilterTest extends KernelTestCase
         $description = $this->getFilter()->describeAction($data);
 
         $this->assertTrue(
-            is_string($description) || is_array($description),
+            \is_string($description) || \is_array($description),
             'test that the description is a string or an array'
         );
 
-        if (is_string($description)) {
+        if (\is_string($description)) {
             $this->assertNotEmpty(
                 $description,
                 'test that the description is not empty'
             );
-        } elseif (is_array($description)) {
+        } elseif (\is_array($description)) {
             $this->assertIsString(
                 $description[0],
                 'test that the first element in the description array is a string'
@@ -245,11 +240,11 @@ abstract class AbstractFilterTest extends KernelTestCase
                 $catalogue = static::$kernel->getContainer()
                     ->get('translator')
                     ->getCatalogue();
-            } catch (Exception $ex) {
+            } catch (\Exception $ex) {
                 $this->markTestIncomplete(
                     sprintf(
                         "This test is incomplete due to %s thrown by 'translator' : %s, "
-                        . 'complete stack : %s',
+                        .'complete stack : %s',
                         $ex::class,
                         $ex->getMessage(),
                         $ex->getTraceAsString()
@@ -262,8 +257,8 @@ abstract class AbstractFilterTest extends KernelTestCase
                     $description[2] ?? 'messages'
                 ),
                 sprintf('Test that the message returned by getDescriptionAction is '
-                . 'present in the catalogue of translations. HINT : check that "%s" '
-                . 'is correctly translated', $description[0])
+                .'present in the catalogue of translations. HINT : check that "%s" '
+                .'is correctly translated', $description[0])
             );
         }
     }
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
index c84ee4051..c4080e46f 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Test;
 
-use LogicException;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
@@ -26,15 +25,14 @@ trait PrepareClientTrait
      * @param string $username the username (default 'center a_social')
      * @param string $password the password (default 'password')
      *
-     * @throws LogicException
+     * @throws \LogicException
      */
     public function getClientAuthenticated(
         $username = 'center a_social',
         $password = 'password'
     ): KernelBrowser {
         if (!$this instanceof WebTestCase) {
-            throw new LogicException(sprintf('The current class does not '
-                . 'implements %s', WebTestCase::class));
+            throw new \LogicException(sprintf('The current class does not implements %s', WebTestCase::class));
         }
 
         return static::createClient([], [
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php
index b657052dc..044d17400 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Entity\PermissionsGroup;
 use Chill\MainBundle\Entity\RoleScope;
 use Chill\MainBundle\Entity\User;
-use LogicException;
 
 /**
  * A trait to prepare user with permission. May be used
@@ -47,9 +46,9 @@ trait PrepareUserTrait
      *
      * @param array $permissions an array of permissions, with key 'center' for the center and key 'attrs' for an array of  ['role' => (string), 'scope' => (int)]
      *
-     * @throws LogicException if the trait is not set up
-     *
      * @return User
+     *
+     * @throws \LogicException if the trait is not set up
      */
     protected function prepareUser(array $permissions)
     {
diff --git a/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php b/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
index 57768bf6e..d43aaf995 100644
--- a/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
@@ -18,6 +18,7 @@ namespace Chill\MainBundle\Test;
  * and use tearDownTrait after usage.
  *
  * @deprecated use @see{\Prophecy\PhpUnit\ProphecyTrait} instead
+ *
  * @codeCoverageIgnore
  *
  * @deprecated use @class{Prophecy\PhpUnit\ProphecyTrait} instead
diff --git a/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php
index a0de7c6ed..f5574ef2e 100644
--- a/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ParentRoleHelperTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
index cfe99c32c..a45cc7d29 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AddressControllerTest extends \Symfony\Bundle\FrameworkBundle\Test\WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/AddressReferenceApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/AddressReferenceApiControllerTest.php
index 3de13a54d..36796f47f 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/AddressReferenceApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/AddressReferenceApiControllerTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AddressReferenceApiControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/AddressToReferenceMatcherControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/AddressToReferenceMatcherControllerTest.php
index 87ae93e26..bd8c03860 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/AddressToReferenceMatcherControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/AddressToReferenceMatcherControllerTest.php
@@ -21,6 +21,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class AddressToReferenceMatcherControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
index 04717e3c1..2f0e11e60 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
@@ -16,6 +16,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CenterControllerTest extends WebTestCase
@@ -23,18 +24,18 @@ final class CenterControllerTest extends WebTestCase
     use PrepareClientTrait;
 
     /**
-     * This is a smoke test that ensure that the list page does show
+     * This is a smoke test that ensure that the list page does show.
      */
     public function testCenterAdminSmokeTest(): void
     {
         $client = $this->getClientAuthenticated('admin', 'password');
 
         $crawler = $client->request('GET', '/fr/admin/center');
-        self::assertResponseIsSuccessful("Test that /fr/admin/center does show");
+        self::assertResponseIsSuccessful('Test that /fr/admin/center does show');
 
         $btnEdit = $crawler->filter('.btn-edit')?->first();
 
-        self::assertNotNull($btnEdit, "check that there is at least one btn-edit on center page");
+        self::assertNotNull($btnEdit, 'check that there is at least one btn-edit on center page');
 
         $client->click($btnEdit->link());
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php
index 8eda45a74..10ad4060b 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  * Test the export.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ExportControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/GeographicalUnitByAddressApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/GeographicalUnitByAddressApiControllerTest.php
index 60273a8c9..cf8fabf66 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/GeographicalUnitByAddressApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/GeographicalUnitByAddressApiControllerTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class GeographicalUnitByAddressApiControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php
index e8b11bc12..9dd664f5d 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\HttpFoundation\Response;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LoginControllerTest extends WebTestCase
@@ -24,7 +25,7 @@ final class LoginControllerTest extends WebTestCase
     {
         $client = self::createClient();
 
-        //load login page and submit form
+        // load login page and submit form
         $crawler = $client->request('GET', '/login');
         $this->assertTrue($client->getResponse()->isSuccessful());
 
@@ -36,15 +37,15 @@ final class LoginControllerTest extends WebTestCase
             '_password' => 'password',
         ]);
 
-        //the response is a redirection
+        // the response is a redirection
         $this->assertTrue($client->getResponse()->isRedirect());
 
-        //the response is not a login page, but on a new page
+        // the response is not a login page, but on a new page
         $this->assertDoesNotMatchRegularExpression('/\/login$/', $client->getResponse()
             ->headers
             ->get('location'));
 
-        //on the home page, there must be a logout link
+        // on the home page, there must be a logout link
         $client->followRedirects(true);
         $crawler = $client->request('GET', '/');
 
@@ -52,17 +53,17 @@ final class LoginControllerTest extends WebTestCase
             ->getContent());
         $logoutLinkFilter = $crawler->filter('a:contains("Se déconnecter")');
 
-        //check there is > 0 logout link
+        // check there is > 0 logout link
         $this->assertGreaterThan(0, $logoutLinkFilter->count(), 'check that a logout link is present');
 
-        //click on logout link
+        // click on logout link
         $client->followRedirects(false);
         $client->click($crawler->selectLink('Se déconnecter')->link());
 
         $this->assertTrue($client->getResponse()->isRedirect());
-        $client->followRedirect(); //redirect to login page
+        $client->followRedirect(); // redirect to login page
 
-        //check we are back on login page
+        // check we are back on login page
         $this->assertMatchesRegularExpression('/\/login$/', $client->getResponse()
             ->headers
             ->get('location'));
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php
index e3839f140..f64451af9 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php
@@ -16,12 +16,12 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class NotificationApiControllerTest extends WebTestCase
@@ -57,7 +57,7 @@ final class NotificationApiControllerTest extends WebTestCase
             ->setRelatedEntityId(0)
             ->setSender($userB)
             ->addAddressee($userA)
-            ->setUpdatedAt(new DateTimeImmutable());
+            ->setUpdatedAt(new \DateTimeImmutable());
         $em->persist($notification);
         $em->refresh($notification);
         $em->flush();
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php
index 75fdbf2e6..a99871119 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php
@@ -12,11 +12,11 @@ declare(strict_types=1);
 namespace Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
-use DateTime;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PermissionApiControllerTest extends WebTestCase
@@ -44,7 +44,7 @@ final class PermissionApiControllerTest extends WebTestCase
                 'object' => [
                     'datetime' => '1969-07-09T00:00:00+0100',
                 ],
-                'class' => DateTime::class,
+                'class' => \DateTime::class,
                 'roles' => ['FOO_ROLE'],
             ])
         );
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php
index adec9119e..182ad444f 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PermissionsGroupControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php
index a777be44c..1cb8687f8 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php
@@ -13,10 +13,10 @@ namespace Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use function json_decode;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PostalCodeApiControllerTest extends WebTestCase
@@ -35,7 +35,7 @@ final class PostalCodeApiControllerTest extends WebTestCase
 
         $this->assertResponseIsSuccessful();
 
-        $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
         $this->assertEquals('Fontenay Le Comte', $data['results'][0]['name']);
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
index ee2b4fb1e..4a055f679 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php
index 436fc88d3..925fa1527 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SearchApiControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php
index 90d55df27..c1807904d 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  * Test the search controller.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class SearchControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php
index 3192a3edb..4b08884ca 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php
@@ -14,11 +14,10 @@ namespace Chill\MainBundle\Tests\Controller;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use function array_key_exists;
-use function json_decode;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class UserApiControllerTest extends WebTestCase
@@ -32,7 +31,7 @@ final class UserApiControllerTest extends WebTestCase
     {
         $client = $this->getClientAuthenticated();
 
-        $client->request(Request::METHOD_GET, '/api/1.0/main/user/' . $existingUser['id'] . '.json');
+        $client->request(Request::METHOD_GET, '/api/1.0/main/user/'.$existingUser['id'].'.json');
 
         $this->assertResponseIsSuccessful();
     }
@@ -45,10 +44,10 @@ final class UserApiControllerTest extends WebTestCase
 
         $this->assertResponseIsSuccessful();
 
-        $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
-        $this->assertTrue(array_key_exists('count', $data));
+        $data = \json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $this->assertTrue(\array_key_exists('count', $data));
         $this->assertGreaterThan(0, $data['count']);
-        $this->assertTrue(array_key_exists('results', $data));
+        $this->assertTrue(\array_key_exists('results', $data));
 
         return $data['results'][0];
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
index 64524d86d..b29f28478 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
@@ -19,6 +19,7 @@ use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class UserControllerTest extends WebTestCase
@@ -56,7 +57,7 @@ final class UserControllerTest extends WebTestCase
         $em = self::$container->get(EntityManagerInterface::class);
 
         $user = new User();
-        $user->setUsername('Test_user ' . uniqid());
+        $user->setUsername('Test_user '.uniqid());
         $user->setPassword(self::$container->get(UserPasswordEncoderInterface::class)->encodePassword(
             $user,
             'password'
@@ -87,7 +88,7 @@ final class UserControllerTest extends WebTestCase
     {
         $crawler = $this->client->request('GET', '/fr/admin/main/user/new');
 
-        $username = 'Test_user' . uniqid();
+        $username = 'Test_user'.uniqid();
         $password = 'Password1234!';
 
         // Fill in the form and submit it
@@ -95,7 +96,7 @@ final class UserControllerTest extends WebTestCase
             'chill_mainbundle_user[username]' => $username,
             'chill_mainbundle_user[plainPassword][first]' => $password,
             'chill_mainbundle_user[plainPassword][second]' => $password,
-            'chill_mainbundle_user[email]' => $username . '@gmail.com',
+            'chill_mainbundle_user[email]' => $username.'@gmail.com',
             'chill_mainbundle_user[label]' => $username,
         ]);
 
@@ -109,7 +110,7 @@ final class UserControllerTest extends WebTestCase
             'page contains the name of the user'
         );
 
-        //test the auth of the new client
+        // test the auth of the new client
         $this->isPasswordValid($username, $password);
     }
 
@@ -120,7 +121,7 @@ final class UserControllerTest extends WebTestCase
     {
         $crawler = $this->client->request('GET', "/fr/admin/main/user/{$userId}/edit");
 
-        $username = 'Foo bar ' . uniqid();
+        $username = 'Foo bar '.uniqid();
         $form = $crawler->selectButton('Enregistrer & fermer')->form([
             'chill_mainbundle_user[username]' => $username,
         ]);
diff --git a/src/Bundle/ChillMainBundle/Tests/Cron/CronJobDatabaseInteractionTest.php b/src/Bundle/ChillMainBundle/Tests/Cron/CronJobDatabaseInteractionTest.php
index 335292cc7..594bd6460 100644
--- a/src/Bundle/ChillMainBundle/Tests/Cron/CronJobDatabaseInteractionTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Cron/CronJobDatabaseInteractionTest.php
@@ -23,6 +23,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class CronJobDatabaseInteractionTest extends KernelTestCase
@@ -46,7 +47,7 @@ class CronJobDatabaseInteractionTest extends KernelTestCase
 
         $entityManager = self::$container->get(EntityManagerInterface::class);
 
-        $entityManager->createQuery("DELETE " . CronJobExecution::class . ' cje WHERE cje.key LIKE :key')
+        $entityManager->createQuery('DELETE '.CronJobExecution::class.' cje WHERE cje.key LIKE :key')
             ->setParameter('key', 'test-with-data')
             ->execute();
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Cron/CronManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Cron/CronManagerTest.php
index 63beb1482..cec60c7c9 100644
--- a/src/Bundle/ChillMainBundle/Tests/Cron/CronManagerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Cron/CronManagerTest.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Tests\Cron;
 
-use ArrayObject;
 use Chill\MainBundle\Cron\CronJobInterface;
 use Chill\MainBundle\Cron\CronManager;
 use Chill\MainBundle\Entity\CronJobExecution;
@@ -23,10 +22,10 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Log\NullLogger;
-use function array_key_exists;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CronManagerTest extends TestCase
@@ -43,16 +42,16 @@ final class CronManagerTest extends TestCase
         $jobToExecute->run([])->shouldBeCalled();
 
         $executions = [
-            ['key' => $jobOld1->getKey(), 'lastStart' => new DateTimeImmutable('yesterday'), 'lastEnd' => new DateTimeImmutable('1 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
-            ['key' => $jobOld2->getKey(), 'lastStart' => new DateTimeImmutable('3 days ago'), 'lastEnd' => new DateTimeImmutable('36 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
+            ['key' => $jobOld1->getKey(), 'lastStart' => new \DateTimeImmutable('yesterday'), 'lastEnd' => new \DateTimeImmutable('1 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
+            ['key' => $jobOld2->getKey(), 'lastStart' => new \DateTimeImmutable('3 days ago'), 'lastEnd' => new \DateTimeImmutable('36 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
             // this is the oldest one
-            ['key' => 'to-exec', 'lastStart' => new DateTimeImmutable('1 month ago'), 'lastEnd' => new DateTimeImmutable('10 days ago'), 'lastStatus' => CronJobExecution::SUCCESS],
+            ['key' => 'to-exec', 'lastStart' => new \DateTimeImmutable('1 month ago'), 'lastEnd' => new \DateTimeImmutable('10 days ago'), 'lastStatus' => CronJobExecution::SUCCESS],
         ];
 
         $cronManager = new CronManager(
             $this->buildCronJobExecutionRepository($executions),
             $this->buildEntityManager([]),
-            new ArrayObject([$jobOld1, $jobToExecute->reveal(), $jobOld2]),
+            new \ArrayObject([$jobOld1, $jobToExecute->reveal(), $jobOld2]),
             new NullLogger()
         );
 
@@ -68,13 +67,13 @@ final class CronManagerTest extends TestCase
         $jobNeverExecuted->canRun(null)->willReturn(true);
 
         $executions = [
-            ['key' => $jobAlreadyExecuted->getKey(), 'lastStart' => new DateTimeImmutable('yesterday'), 'lastEnd' => new DateTimeImmutable('1 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
+            ['key' => $jobAlreadyExecuted->getKey(), 'lastStart' => new \DateTimeImmutable('yesterday'), 'lastEnd' => new \DateTimeImmutable('1 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
         ];
 
         $cronManager = new CronManager(
             $this->buildCronJobExecutionRepository($executions),
             $this->buildEntityManager([Argument::type(CronJobExecution::class)]),
-            new ArrayObject([$jobNeverExecuted->reveal(), $jobAlreadyExecuted]),
+            new \ArrayObject([$jobNeverExecuted->reveal(), $jobAlreadyExecuted]),
             new NullLogger()
         );
 
@@ -90,13 +89,13 @@ final class CronManagerTest extends TestCase
         $jobNeverExecuted->canRun(null)->willReturn(true);
 
         $executions = [
-            ['key' => $jobAlreadyExecuted->getKey(), 'lastStart' => new DateTimeImmutable('yesterday'), 'lastEnd' => new DateTimeImmutable('1 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
+            ['key' => $jobAlreadyExecuted->getKey(), 'lastStart' => new \DateTimeImmutable('yesterday'), 'lastEnd' => new \DateTimeImmutable('1 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
         ];
 
         $cronManager = new CronManager(
             $this->buildCronJobExecutionRepository($executions),
             $this->buildEntityManager([Argument::type(CronJobExecution::class)]),
-            new ArrayObject([$jobAlreadyExecuted, $jobNeverExecuted->reveal()]),
+            new \ArrayObject([$jobAlreadyExecuted, $jobNeverExecuted->reveal()]),
             new NullLogger()
         );
 
@@ -116,11 +115,11 @@ final class CronManagerTest extends TestCase
                     $e = new CronJobExecution($exec['key']);
                     $e->setLastStart($exec['lastStart']);
 
-                    if (array_key_exists('lastEnd', $exec)) {
+                    if (\array_key_exists('lastEnd', $exec)) {
                         $e->setLastEnd($exec['lastEnd']);
                     }
 
-                    if (array_key_exists('lastStatus', $exec)) {
+                    if (\array_key_exists('lastStatus', $exec)) {
                         $e->setLastStatus($exec['lastStatus']);
                     }
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/AgeTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/AgeTest.php
index 90f6a24bf..212303274 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/AgeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/AgeTest.php
@@ -12,12 +12,12 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Doctrine\DQL;
 
 use Chill\MainBundle\Entity\Address;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AgeTest extends KernelTestCase
@@ -34,29 +34,29 @@ final class AgeTest extends KernelTestCase
     public function generateQueries(): iterable
     {
         yield [
-            'SELECT AGE(a.validFrom, a.validTo) FROM ' . Address::class . ' a',
+            'SELECT AGE(a.validFrom, a.validTo) FROM '.Address::class.' a',
             [],
         ];
 
         yield [
-            'SELECT AGE(:date0, :date1) FROM ' . Address::class . ' a',
+            'SELECT AGE(:date0, :date1) FROM '.Address::class.' a',
             [
-                'date0' => new DateTimeImmutable('now'),
-                'date1' => new DateTimeImmutable('2020-01-01'),
+                'date0' => new \DateTimeImmutable('now'),
+                'date1' => new \DateTimeImmutable('2020-01-01'),
             ],
         ];
 
         yield [
-            'SELECT AGE(a.validFrom, :date1) FROM ' . Address::class . ' a',
+            'SELECT AGE(a.validFrom, :date1) FROM '.Address::class.' a',
             [
-                'date1' => new DateTimeImmutable('now'),
+                'date1' => new \DateTimeImmutable('now'),
             ],
         ];
 
         yield [
-            'SELECT AGE(:date0, a.validFrom) FROM ' . Address::class . ' a',
+            'SELECT AGE(:date0, a.validFrom) FROM '.Address::class.' a',
             [
-                'date0' => new DateTimeImmutable('now'),
+                'date0' => new \DateTimeImmutable('now'),
             ],
         ];
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/GreatestTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/GreatestTest.php
index c11061287..bba3dccc0 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/GreatestTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/GreatestTest.php
@@ -12,13 +12,13 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Doctrine\DQL;
 
 use Chill\MainBundle\Entity\Address;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GreatestTest extends KernelTestCase
@@ -34,11 +34,11 @@ final class GreatestTest extends KernelTestCase
 
     public function testGreatestInDQL()
     {
-        $dql = 'SELECT GREATEST(a.validFrom, a.validTo, :now) AS g FROM ' . Address::class . ' a WHERE a.validTo < :now and a.validFrom < :now';
+        $dql = 'SELECT GREATEST(a.validFrom, a.validTo, :now) AS g FROM '.Address::class.' a WHERE a.validTo < :now and a.validFrom < :now';
 
         $actual = $this->entityManager
             ->createQuery($dql)
-            ->setParameter('now', $now = new DateTimeImmutable('now'), Types::DATE_IMMUTABLE)
+            ->setParameter('now', $now = new \DateTimeImmutable('now'), Types::DATE_IMMUTABLE)
             ->setMaxResults(3)
             ->getResult();
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonBuildObjectTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonBuildObjectTest.php
index d2897546c..8feb75617 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonBuildObjectTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonBuildObjectTest.php
@@ -19,6 +19,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class JsonBuildObjectTest extends KernelTestCase
@@ -52,10 +53,9 @@ class JsonBuildObjectTest extends KernelTestCase
 
     public function provideQueries(): iterable
     {
-        yield ["SELECT JSON_BUILD_OBJECT(1, 2, 3, 4) FROM " . Address::class . " a", [], []];
-        yield ["SELECT JSON_BUILD_OBJECT('st', a.street, 'sn', a.streetNumber) FROM " . Address::class . ' a', [], []];
+        yield ['SELECT JSON_BUILD_OBJECT(1, 2, 3, 4) FROM '.Address::class.' a', [], []];
+        yield ["SELECT JSON_BUILD_OBJECT('st', a.street, 'sn', a.streetNumber) FROM ".Address::class.' a', [], []];
         // next query make the test fails. But we do not need it for now.
-        //yield ["SELECT JSON_BUILD_OBJECT(a.street, :param), LOWER(:param) FROM " . Address::class . " a", ['param' => 1], ['param' => Types::INTEGER]];
+        // yield ["SELECT JSON_BUILD_OBJECT(a.street, :param), LOWER(:param) FROM " . Address::class . " a", ['param' => 1], ['param' => Types::INTEGER]];
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonExtractTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonExtractTest.php
index 3f2b3eb2f..286aa71c9 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonExtractTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonExtractTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class JsonExtractTest extends KernelTestCase
@@ -32,9 +33,9 @@ final class JsonExtractTest extends KernelTestCase
 
     public function dataGenerateDql(): iterable
     {
-        yield ['SELECT JSON_EXTRACT(c.name, \'fr\') FROM ' . Country::class . ' c', []];
+        yield ['SELECT JSON_EXTRACT(c.name, \'fr\') FROM '.Country::class.' c', []];
 
-        yield ['SELECT JSON_EXTRACT(c.name, :lang) FROM ' . Country::class . ' c', ['lang' => 'fr']];
+        yield ['SELECT JSON_EXTRACT(c.name, :lang) FROM '.Country::class.' c', ['lang' => 'fr']];
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonbExistsInArrayTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonbExistsInArrayTest.php
index 67c41d3d9..31f1714d1 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonbExistsInArrayTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonbExistsInArrayTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class JsonbExistsInArrayTest extends KernelTestCase
@@ -32,7 +33,7 @@ final class JsonbExistsInArrayTest extends KernelTestCase
     public function testDQLFunctionWorks()
     {
         $result = $this->em
-            ->createQuery('SELECT JSONB_EXISTS_IN_ARRAY(u.attributes, :param) FROM ' . User::class . ' u')
+            ->createQuery('SELECT JSONB_EXISTS_IN_ARRAY(u.attributes, :param) FROM '.User::class.' u')
             ->setParameter('param', 'fr')
             ->getResult();
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/LeastTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/LeastTest.php
index 1e5be8e24..e8bb0f5b1 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/LeastTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/LeastTest.php
@@ -12,13 +12,13 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Doctrine\DQL;
 
 use Chill\MainBundle\Entity\Address;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LeastTest extends KernelTestCase
@@ -34,11 +34,11 @@ final class LeastTest extends KernelTestCase
 
     public function testGreatestInDQL()
     {
-        $dql = 'SELECT LEAST(a.validFrom, a.validTo, :now) AS g FROM ' . Address::class . ' a WHERE a.validTo < :now and a.validFrom < :now';
+        $dql = 'SELECT LEAST(a.validFrom, a.validTo, :now) AS g FROM '.Address::class.' a WHERE a.validTo < :now and a.validFrom < :now';
 
         $actual = $this->entityManager
             ->createQuery($dql)
-            ->setParameter('now', $now = new DateTimeImmutable('now'), Types::DATE_IMMUTABLE)
+            ->setParameter('now', $now = new \DateTimeImmutable('now'), Types::DATE_IMMUTABLE)
             ->setMaxResults(3)
             ->getResult();
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php
index 01160604a..f4a9451c2 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  * Test the point model methods.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PointTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
index d641b94a8..c5118479a 100644
--- a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
@@ -15,13 +15,12 @@ use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class NotificationTest extends KernelTestCase
@@ -117,7 +116,7 @@ final class NotificationTest extends KernelTestCase
             ->setSender($em->find(User::class, $senderId))
             ->setRelatedEntityId(0)
             ->setRelatedEntityClass(AccompanyingPeriod::class)
-            ->setUpdatedAt(new DateTimeImmutable())
+            ->setUpdatedAt(new \DateTimeImmutable())
             ->setMessage('Fake message');
 
         foreach ($addressesIds as $addresseeId) {
@@ -132,7 +131,7 @@ final class NotificationTest extends KernelTestCase
         $this->toDelete[] = [Notification::class, $notification->getId()];
 
         $this->assertEquals($senderId, $notification->getSender()->getId());
-        $this->assertCount(count($addressesIds), $notification->getUnreadBy());
+        $this->assertCount(\count($addressesIds), $notification->getUnreadBy());
 
         $unreadIds = $notification->getUnreadBy()->map(static fn (User $u) => $u->getId());
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php
index 2aeadc574..b9dc56ea5 100644
--- a/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php
@@ -19,6 +19,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class UserTest extends TestCase
@@ -44,7 +45,6 @@ class UserTest extends TestCase
                 ->filter(fn (User\UserScopeHistory $userScopeHistory) => $userScopeHistory->getScope() === $scopeA)
                 ->first()->getEndDate()
         );
-
     }
 
     public function testUserJobHistory()
@@ -67,5 +67,4 @@ class UserTest extends TestCase
                 ->first()->getEndDate()
         );
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php
index 72b301328..f515490b8 100644
--- a/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php
@@ -16,6 +16,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EntityWorkflowTest extends TestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Export/AccompanyingCourseExportHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Export/AccompanyingCourseExportHelperTest.php
index 7fbebbe9d..f726553e9 100644
--- a/src/Bundle/ChillMainBundle/Tests/Export/AccompanyingCourseExportHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Export/AccompanyingCourseExportHelperTest.php
@@ -14,14 +14,12 @@ namespace Export;
 use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
-use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class AccompanyingCourseExportHelperTest extends KernelTestCase
@@ -114,5 +112,4 @@ class AccompanyingCourseExportHelperTest extends KernelTestCase
 
         return [$periodA, $periodB, $periodC];
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
index 4052d618d..b9e597ec0 100644
--- a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
@@ -28,22 +28,20 @@ use Doctrine\ORM\QueryBuilder;
 use Prophecy\Argument;
 use Prophecy\Prophet;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 
 /**
  * Test the export manager.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ExportManagerTest extends KernelTestCase
@@ -111,23 +109,22 @@ final class ExportManagerTest extends KernelTestCase
             $filters
         );
 
-
         $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportFoo, $centers));
-        $this->assertEquals(1, count($obtained));
+        $this->assertEquals(1, \count($obtained));
         $this->assertContains('foo', array_keys($obtained));
 
         $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportBar, $centers));
-        $this->assertEquals(1, count($obtained));
+        $this->assertEquals(1, \count($obtained));
         $this->assertContains('bar', array_keys($obtained));
 
         $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportFooBar, $centers));
-        $this->assertEquals(2, count($obtained));
+        $this->assertEquals(2, \count($obtained));
         $this->assertContains('bar', array_keys($obtained));
         $this->assertContains('foo', array_keys($obtained));
 
         // test with empty centers
         $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportFooBar, []));
-        $this->assertEquals(0, count($obtained));
+        $this->assertEquals(0, \count($obtained));
     }
 
     public function testFiltersApplyingOn()
@@ -161,27 +158,27 @@ final class ExportManagerTest extends KernelTestCase
         );
 
         $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportFoo, $centers));
-        $this->assertEquals(1, count($obtained));
+        $this->assertEquals(1, \count($obtained));
         $this->assertContains('foo', array_keys($obtained));
 
         $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportBar, $centers));
-        $this->assertEquals(1, count($obtained));
+        $this->assertEquals(1, \count($obtained));
         $this->assertContains('bar', array_keys($obtained));
 
         $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportFooBar, $centers));
-        $this->assertEquals(2, count($obtained));
+        $this->assertEquals(2, \count($obtained));
         $this->assertContains('bar', array_keys($obtained));
         $this->assertContains('foo', array_keys($obtained));
 
         $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportFooBar, []));
-        $this->assertEquals(0, count($obtained));
+        $this->assertEquals(0, \count($obtained));
     }
 
     public function testFormattersByTypes()
     {
         $exportManager = $this->createExportManager();
 
-        //create a formatter
+        // create a formatter
         $formatterFoo = $this->prophet->prophesize();
         $formatterFoo->willImplement(\Chill\MainBundle\Export\FormatterInterface::class);
         $formatterFoo->getType()->willReturn('foo');
@@ -259,7 +256,7 @@ final class ExportManagerTest extends KernelTestCase
                     case '_header':
                         return 'export';
 
-                    default: throw new RuntimeException(sprintf('The value %s is not valid', $value));
+                    default: throw new \RuntimeException(sprintf('The value %s is not valid', $value));
                 }
             });
 
@@ -297,7 +294,7 @@ final class ExportManagerTest extends KernelTestCase
                 '_header' => 'foo_header',
                 'cat a' => 'label cat a',
                 'cat b' => 'label cat b',
-                default => throw new RuntimeException(sprintf('This value (%s) is not valid', $value)),
+                default => throw new \RuntimeException(sprintf('This value (%s) is not valid', $value)),
             });
         $aggregator->addRole()->willReturn(null);
         $aggregator->addRole()->shouldBeCalled();
@@ -314,7 +311,7 @@ final class ExportManagerTest extends KernelTestCase
             $filters
         );
 
-        //add formatter interface
+        // add formatter interface
         $formatter = new \Chill\MainBundle\Export\Formatter\SpreadSheetFormatter(
             self::$container->get(TranslatorInterface::class),
             $exportManager
@@ -486,7 +483,7 @@ final class ExportManagerTest extends KernelTestCase
 
     public function testNonExistingFormatter()
     {
-        $this->expectException(RuntimeException::class);
+        $this->expectException(\RuntimeException::class);
 
         $exportManager = $this->createExportManager();
 
@@ -501,11 +498,11 @@ final class ExportManagerTest extends KernelTestCase
      * user 'center a_social' from database.
      */
     protected function createExportManager(
-        ?LoggerInterface $logger = null,
-        ?EntityManagerInterface $em = null,
-        ?AuthorizationCheckerInterface $authorizationChecker = null,
-        ?AuthorizationHelper $authorizationHelper = null,
-        ?UserInterface $user = null,
+        LoggerInterface $logger = null,
+        EntityManagerInterface $em = null,
+        AuthorizationCheckerInterface $authorizationChecker = null,
+        AuthorizationHelper $authorizationHelper = null,
+        UserInterface $user = null,
         array $exports = [],
         array $aggregators = [],
         array $filters = [],
@@ -541,20 +538,26 @@ class DummyFilterWithApplying implements FilterInterface
     {
         return 'dummy';
     }
+
     public function buildForm(FormBuilderInterface $builder) {}
+
     public function getFormDefaultData(): array
     {
         return [];
     }
+
     public function describeAction($data, $format = 'string')
     {
         return ['dummy filter', []];
     }
+
     public function addRole(): ?string
     {
         return $this->role;
     }
+
     public function alterQuery(QueryBuilder $qb, $data) {}
+
     public function applyOn()
     {
         return $this->applyOn;
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php b/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php
index 99815d130..37024f947 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php
@@ -23,10 +23,10 @@ use Doctrine\Persistence\ObjectRepository;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use stdClass;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class IdToEntityDataTransformerTest extends TestCase
@@ -35,8 +35,8 @@ final class IdToEntityDataTransformerTest extends TestCase
 
     public function testReverseTransformMulti()
     {
-        $o1 = new stdClass();
-        $o2 = new stdClass();
+        $o1 = new \stdClass();
+        $o2 = new \stdClass();
 
         $repository = $this->prophesize(ObjectRepository::class);
         $repository->findOneBy(Argument::exact(['id' => 1]))->willReturn($o1);
@@ -58,7 +58,7 @@ final class IdToEntityDataTransformerTest extends TestCase
 
     public function testReverseTransformSingle()
     {
-        $o = new stdClass();
+        $o = new \stdClass();
 
         $repository = $this->prophesize(ObjectRepository::class);
         $repository->findOneBy(Argument::exact(['id' => 1]))->willReturn($o);
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php
index db1d701f6..4e0da5f86 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PickCenterTypeTest extends TypeTestCase
@@ -31,7 +32,7 @@ final class PickCenterTypeTest extends TypeTestCase
     public function testUserCanReachMultipleCenters(): never
     {
         $this->markTestSkipped();
-        //prepare user
+        // prepare user
         $centerA = $this->prepareCenter(1, 'centerA');
         $centerB = $this->prepareCenter(2, 'centerB');
         $groupCenterA = (new GroupCenter())
@@ -54,7 +55,7 @@ final class PickCenterTypeTest extends TypeTestCase
     public function testUserCanReachMultipleSameCenter(): never
     {
         $this->markTestSkipped();
-        //prepare user
+        // prepare user
         $center = $this->prepareCenter(1, 'center');
         $groupCenterA = (new GroupCenter())
             ->setCenter($center);
@@ -76,7 +77,7 @@ final class PickCenterTypeTest extends TypeTestCase
     public function testUserCanReachSingleCenter(): never
     {
         $this->markTestSkipped();
-        //prepare user
+        // prepare user
         $center = $this->prepareCenter(1, 'center');
         $groupCenter = (new GroupCenter())
             ->setCenter($center);
@@ -91,7 +92,7 @@ final class PickCenterTypeTest extends TypeTestCase
     /**
      * prepare a mocked center, with and id and name given.
      *
-     * @param int $id
+     * @param int    $id
      * @param string $name
      *
      * @return \Chill\MainBundle\Entity\Center
@@ -101,7 +102,7 @@ final class PickCenterTypeTest extends TypeTestCase
         $prophet = new \Prophecy\Prophet();
 
         $prophecyCenter = $prophet->prophesize();
-        $prophecyCenter->willExtend('\\' . \Chill\MainBundle\Entity\Center::class);
+        $prophecyCenter->willExtend('\\'.\Chill\MainBundle\Entity\Center::class);
         $prophecyCenter->getId()->willReturn($id);
         $prophecyCenter->getName()->willReturn($name);
 
@@ -119,7 +120,7 @@ final class PickCenterTypeTest extends TypeTestCase
     {
         $prophet = new \Prophecy\Prophet();
 
-        //create a center transformer
+        // create a center transformer
         $centerTransformerProphecy = $prophet->prophesize();
         $centerTransformerProphecy
             ->willExtend(\Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer::class);
@@ -127,7 +128,7 @@ final class PickCenterTypeTest extends TypeTestCase
 
         $tokenProphecy = $prophet->prophesize();
         $tokenProphecy
-            ->willImplement('\\' . \Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
+            ->willImplement('\\'.\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
         $tokenProphecy->getUser()->willReturn($user);
         $token = $tokenProphecy->reveal();
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickPostalCodeTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickPostalCodeTypeTest.php
index 126130275..19788bea7 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickPostalCodeTypeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickPostalCodeTypeTest.php
@@ -17,13 +17,13 @@ use Chill\MainBundle\Form\Type\PickPostalCodeType;
 use Chill\MainBundle\Repository\PostalCodeRepositoryInterface;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use ReflectionClass;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\PreloadedExtension;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PickPostalCodeTypeTest extends TypeTestCase
@@ -49,7 +49,7 @@ final class PickPostalCodeTypeTest extends TypeTestCase
         $postalCodeRepository->find(Argument::any())
             ->will(static function ($args) {
                 $postalCode = new PostalCode();
-                $reflectionClass = new ReflectionClass($postalCode);
+                $reflectionClass = new \ReflectionClass($postalCode);
                 $id = $reflectionClass->getProperty('id');
                 $id->setAccessible(true);
                 $id->setValue($postalCode, (int) $args[0]);
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickRollingDateTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickRollingDateTypeTest.php
index 771dd0310..fca789541 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickRollingDateTypeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickRollingDateTypeTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PickRollingDateTypeTest extends TypeTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
index 0e37f0fde..c42595049 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
@@ -31,6 +31,7 @@ use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopePickerTypeTest extends TypeTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationMailerTest.php b/src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationMailerTest.php
index c00804e0b..2bd7708b8 100644
--- a/src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationMailerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationMailerTest.php
@@ -27,14 +27,13 @@ use Symfony\Component\Translation\Translator;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class NotificationMailerTest extends TestCase
 {
     use ProphecyTrait;
 
-    /**
-     */
     public function testPostPersistComment(): void
     {
         $user1 = (new User())->setEmail('user1@foo.com');
@@ -50,7 +49,7 @@ class NotificationMailerTest extends TestCase
         ;
 
         $comment = (new NotificationComment())
-            ->setContent("foo bar baz")
+            ->setContent('foo bar baz')
             ->setCreatedBy($user2)
         ;
         $notification->addComment($comment);
@@ -60,7 +59,7 @@ class NotificationMailerTest extends TestCase
         // a mail only to user1 and user3 should have been sent
         $mailer->send(Argument::that(function (Email $email) {
             foreach ($email->getTo() as $address) {
-                if ($address->getAddress() === 'user1@foo.com' || $address->getAddress() === 'user3@foo.com') {
+                if ('user1@foo.com' === $address->getAddress() || 'user3@foo.com' === $address->getAddress()) {
                     return true;
                 }
             }
@@ -89,7 +88,7 @@ class NotificationMailerTest extends TestCase
         ;
 
         $comment = (new NotificationComment())
-            ->setContent("foo bar baz")
+            ->setContent('foo bar baz')
             ->setCreatedBy($user2)
         ;
         $notification->addComment($comment);
@@ -99,7 +98,7 @@ class NotificationMailerTest extends TestCase
         // a mail only to user1 and user3 should have been sent
         $mailer->send(Argument::that(function (Email $email) {
             foreach ($email->getTo() as $address) {
-                if ($address->getAddress() === 'user1@foo.com') {
+                if ('user1@foo.com' === $address->getAddress()) {
                     return true;
                 }
             }
@@ -122,7 +121,4 @@ class NotificationMailerTest extends TestCase
             new Translator('fr')
         );
     }
-
-
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php b/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
index 3939accc7..4fd07643c 100644
--- a/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
@@ -22,6 +22,7 @@ use Symfony\Component\HttpKernel\Event\TerminateEvent;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersistNotificationOnTerminateEventSubscriberTest extends TestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php b/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php
index b2b2c2960..9b0866024 100644
--- a/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php
@@ -19,6 +19,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
  * Test the Page class.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PageTest extends KernelTestCase
@@ -72,6 +73,7 @@ final class PageTest extends KernelTestCase
      * @param int $number
      * @param int $itemPerPage
      * @param int $expectedItemPerPage
+     *
      * @dataProvider generateGetFirstItemNumber
      */
     public function testGetFirstItemNumber(
@@ -88,6 +90,7 @@ final class PageTest extends KernelTestCase
      * @param int $number
      * @param int $itemPerPage
      * @param int $expectedItemPerPage
+     *
      * @dataProvider generateGetLastItemNumber
      */
     public function testGetLastItemNumber(
@@ -108,7 +111,7 @@ final class PageTest extends KernelTestCase
     }
 
     /**
-     * @param int $itemPerPage
+     * @param int    $itemPerPage
      * @param string $route
      *
      * @return Page
diff --git a/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php b/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php
index e10c48adb..8ba207aa6 100644
--- a/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php
@@ -20,6 +20,7 @@ use function count;
  * Test the paginator class.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PaginatorTest extends KernelTestCase
@@ -108,10 +109,11 @@ final class PaginatorTest extends KernelTestCase
     }
 
     /**
-     * @param int $totalItems
-     * @param int $itemPerPage
-     * @param int $currentPage
+     * @param int  $totalItems
+     * @param int  $itemPerPage
+     * @param int  $currentPage
      * @param bool $expectedHasNextPage
+     *
      * @dataProvider generateHasNextPage
      */
     public function testHasNextPage(
@@ -128,10 +130,11 @@ final class PaginatorTest extends KernelTestCase
     /**
      * test the HasPage function.
      *
-     * @param int $totalItems
-     * @param int $itemPerpage
-     * @param int $pageNumber
+     * @param int  $totalItems
+     * @param int  $itemPerpage
+     * @param int  $pageNumber
      * @param bool $expectedHasPage
+     *
      * @dataProvider generateHasPage
      */
     public function testHasPage(
@@ -149,6 +152,7 @@ final class PaginatorTest extends KernelTestCase
      * @param int $totalItems
      * @param int $itemPerPage
      * @param int $currentPage
+     *
      * @dataProvider generateHasPreviousPage
      */
     public function testHasPreviousPage(
@@ -169,6 +173,7 @@ final class PaginatorTest extends KernelTestCase
      * @param int $totalItems
      * @param int $itemPerPage
      * @param int $expectedPageNumber
+     *
      * @dataProvider generatePageNumber
      */
     public function testPageNumber($totalItems, $itemPerPage, $expectedPageNumber)
@@ -176,7 +181,7 @@ final class PaginatorTest extends KernelTestCase
         $paginator = $this->generatePaginator($totalItems, $itemPerPage);
 
         $this->assertEquals($expectedPageNumber, $paginator->countPages());
-        $this->assertEquals($expectedPageNumber, count($paginator));
+        $this->assertEquals($expectedPageNumber, \count($paginator));
     }
 
     public function testPagesGenerator()
@@ -212,7 +217,7 @@ final class PaginatorTest extends KernelTestCase
     }
 
     /**
-     * @param int $itemPerPage
+     * @param int    $itemPerPage
      * @param string $route
      *
      * @return Paginator
diff --git a/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
index 4c2d47f38..184c994e4 100644
--- a/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PhonenumberHelperTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php b/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
index eae7a15e2..bcbf609df 100644
--- a/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  * Test the route loader.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class RouteLoaderTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php b/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
index c80571aea..d783cc22c 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
@@ -15,6 +15,7 @@ namespace Chill\MainBundle\Tests\Search;
  * Description of AbstractSearch.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class AbstractSearchTest extends \PHPUnit\Framework\TestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php b/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php
index e6e434d5b..7f4e4c533 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php
@@ -13,10 +13,10 @@ namespace Search;
 
 use Chill\MainBundle\Search\SearchApiQuery;
 use PHPUnit\Framework\TestCase;
-use function is_string;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SearchApiQueryTest extends TestCase
@@ -65,7 +65,7 @@ final class SearchApiQueryTest extends TestCase
             ->setSelectPertinence('1')
             ->setFromClause('badaboum');
 
-        $this->assertTrue(is_string($q->buildQuery()));
+        $this->assertTrue(\is_string($q->buildQuery()));
         $this->assertEquals([], $q->buildParameters());
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php b/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
index c3d15db23..b8ce37fff 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
@@ -20,6 +20,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SearchProviderTest extends TestCase
@@ -30,12 +31,12 @@ final class SearchProviderTest extends TestCase
     {
         $this->search = new SearchProvider();
 
-        //add a default service
+        // add a default service
         $this->addSearchService(
             $this->createDefaultSearchService('I am default', 10),
             'default'
         );
-        //add a domain service
+        // add a domain service
         $this->addSearchService(
             $this->createNonDefaultDomainSearchService('I am domain bar', 20, false),
             'bar'
@@ -44,7 +45,7 @@ final class SearchProviderTest extends TestCase
 
     public function testAccentued()
     {
-        //$this->markTestSkipped('accentued characters must be implemented');
+        // $this->markTestSkipped('accentued characters must be implemented');
 
         $terms = $this->p('manço bélier aztèque à saloù ê');
 
@@ -56,7 +57,7 @@ final class SearchProviderTest extends TestCase
 
     public function testAccentuedCapitals()
     {
-        //$this->markTestSkipped('accentued characters must be implemented');
+        // $this->markTestSkipped('accentued characters must be implemented');
 
         $terms = $this->p('MANÉÀ oÛ lÎ À');
 
@@ -122,7 +123,7 @@ final class SearchProviderTest extends TestCase
     {
         $response = $this->search->getSearchResults('default search');
 
-        //$this->markTestSkipped();
+        // $this->markTestSkipped();
 
         $this->assertEquals([
             'I am default',
@@ -131,7 +132,7 @@ final class SearchProviderTest extends TestCase
 
     public function testSearchResultDomainSearch()
     {
-        //add a search service which will be supported
+        // add a search service which will be supported
         $this->addSearchService(
             $this->createNonDefaultDomainSearchService('I am domain foo', 100, true),
             'foo'
@@ -153,7 +154,7 @@ final class SearchProviderTest extends TestCase
 
     public function testSearchWithinSpecificSearchName()
     {
-        //add a search service which will be supported
+        // add a search service which will be supported
         $this->addSearchService(
             $this->createNonDefaultDomainSearchService('I am domain foo', 100, true),
             'foo'
@@ -244,7 +245,7 @@ final class SearchProviderTest extends TestCase
         $mock = $this
             ->getMockForAbstractClass(\Chill\MainBundle\Search\AbstractSearch::class);
 
-        //set the mock as default
+        // set the mock as default
         $mock->expects($this->any())
             ->method('isActiveByDefault')
             ->will($this->returnValue(true));
@@ -253,7 +254,7 @@ final class SearchProviderTest extends TestCase
             ->method('getOrder')
             ->will($this->returnValue($order));
 
-        //set the return value
+        // set the return value
         $mock->expects($this->any())
             ->method('renderResult')
             ->will($this->returnValue($result));
@@ -266,7 +267,7 @@ final class SearchProviderTest extends TestCase
         $mock = $this
             ->getMockForAbstractClass(\Chill\MainBundle\Search\AbstractSearch::class);
 
-        //set the mock as default
+        // set the mock as default
         $mock->expects($this->any())
             ->method('isActiveByDefault')
             ->will($this->returnValue(false));
@@ -279,7 +280,7 @@ final class SearchProviderTest extends TestCase
             ->method('supports')
             ->will($this->returnValue($domain));
 
-        //set the return value
+        // set the return value
         $mock->expects($this->any())
             ->method('renderResult')
             ->will($this->returnValue($result));
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
index 49419f261..f592b0e1a 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
@@ -12,12 +12,11 @@ declare(strict_types=1);
 namespace Search\Utils;
 
 use Chill\MainBundle\Search\Utils\ExtractDateFromPattern;
-use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
-use function array_map;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ExtractDateFromPatternTest extends TestCase
@@ -49,10 +48,10 @@ final class ExtractDateFromPatternTest extends TestCase
 
         $this->assertCount($count, $result->getFound());
         $this->assertEquals($filtered, $result->getFilteredSubject());
-        $this->assertContainsOnlyInstancesOf(DateTimeImmutable::class, $result->getFound());
+        $this->assertContainsOnlyInstancesOf(\DateTimeImmutable::class, $result->getFound());
 
-        $dates = array_map(
-            static fn (DateTimeImmutable $d) => $d->format('Y-m-d'),
+        $dates = \array_map(
+            static fn (\DateTimeImmutable $d) => $d->format('Y-m-d'),
             $result->getFound()
         );
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
index aa2e1bf30..68b1ba9a8 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ExtractPhonenumberFromPatternTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
index 5f6bf09c8..e74888b83 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
@@ -24,10 +24,10 @@ use Chill\MainBundle\Test\PrepareScopeTrait;
 use Chill\MainBundle\Test\PrepareUserTrait;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use function in_array;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AuthorizationHelperTest extends KernelTestCase
@@ -78,7 +78,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             // without scopes
             [
                 true,
-                in_array($centerA, $ah->getReachableCenters(
+                \in_array($centerA, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_1',
                     null
@@ -87,7 +87,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
             [
                 true,
-                in_array($centerA, $ah->getReachableCenters(
+                \in_array($centerA, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_2',
                     null
@@ -96,7 +96,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
             [
                 true,
-                in_array($centerB, $ah->getReachableCenters(
+                \in_array($centerB, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_2',
                     null
@@ -105,7 +105,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
             [
                 false,
-                in_array($centerB, $ah->getReachableCenters(
+                \in_array($centerB, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_1',
                     null
@@ -115,7 +115,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             // with scope
             [
                 true,
-                in_array($centerA, $ah->getReachableCenters(
+                \in_array($centerA, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_1',
                     $scopeB
@@ -124,7 +124,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
             [
                 false,
-                in_array($centerA, $ah->getReachableCenters(
+                \in_array($centerA, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_2',
                     $scopeC
@@ -133,7 +133,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
             [
                 true,
-                in_array($centerB, $ah->getReachableCenters(
+                \in_array($centerB, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_2',
                     $scopeA
@@ -193,7 +193,7 @@ final class AuthorizationHelperTest extends KernelTestCase
                 'CHILL_ROLE_1',
                 $centerB,
                 'Assert that a scope not reachable is not found within accessible scopes.'
-                . ' Trying on filter centering',
+                .' Trying on filter centering',
             ],
         ];
     }
@@ -224,7 +224,7 @@ final class AuthorizationHelperTest extends KernelTestCase
     /**
      * @dataProvider dataProvider_getReachableScopes
      *
-     * @param bool $expectedResult
+     * @param bool   $expectedResult
      * @param string $message
      */
     public function testGetReachableScopes(
@@ -240,7 +240,7 @@ final class AuthorizationHelperTest extends KernelTestCase
 
         $this->assertEquals(
             $expectedResult,
-            in_array($testedScope, $reachableScopes, true),
+            \in_array($testedScope, $reachableScopes, true),
             $message
         );
     }
@@ -258,8 +258,8 @@ final class AuthorizationHelperTest extends KernelTestCase
         ]);
         $helper = $this->getAuthorizationHelper();
         $entity = $this->prophesize();
-        $entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
-        $entity->willImplement('\\' . \Chill\MainBundle\Entity\HasScopeInterface::class);
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasScopeInterface::class);
         $entity->getCenter()->willReturn($center);
         $entity->getScope()->willReturn($scope);
 
@@ -313,8 +313,8 @@ final class AuthorizationHelperTest extends KernelTestCase
     {
         $centerA = $this->prepareCenter(1, 'center');
         $centerB = $this->prepareCenter(2, 'centerB');
-        $scopeA = $this->prepareScope(3, 'other'); //the user will be granted this scope
-        $scopeB = $this->prepareScope(4, 'other'); //the user will be granted this scope
+        $scopeA = $this->prepareScope(3, 'other'); // the user will be granted this scope
+        $scopeB = $this->prepareScope(4, 'other'); // the user will be granted this scope
         $user = $this->prepareUser([
             [
                 'center' => $centerA, 'permissionsGroup' => [
@@ -354,7 +354,7 @@ final class AuthorizationHelperTest extends KernelTestCase
     {
         $center = $this->prepareCenter(1, 'center');
         $centerB = $this->prepareCenter(1, 'centerB');
-        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $scopeB = $this->prepareScope(2, 'other'); // the user will be granted this scope
         $user = $this->prepareUser([
             [
                 'center' => $center, 'permissionsGroup' => [
@@ -383,7 +383,7 @@ final class AuthorizationHelperTest extends KernelTestCase
         ]);
         $helper = $this->getAuthorizationHelper();
         $entity = $this->prophesize();
-        $entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
         $entity->getCenter()->willReturn($center);
 
         $this->assertTrue($helper->userHasAccess(
@@ -407,7 +407,7 @@ final class AuthorizationHelperTest extends KernelTestCase
 
         $helper = $this->getAuthorizationHelper();
         $entity = $this->prophesize();
-        $entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
         $entity->getCenter()->willReturn($center);
 
         $this->assertTrue($helper->userHasAccess(
@@ -419,8 +419,8 @@ final class AuthorizationHelperTest extends KernelTestCase
 
     public function testUserHasAccessUserHasNoCenterEntityWithScope()
     {
-        $centerA = $this->prepareCenter(1, 'center'); //the user will have this center
-        $centerB = $this->prepareCenter(2, 'centerB'); //the entity will have another center
+        $centerA = $this->prepareCenter(1, 'center'); // the user will have this center
+        $centerB = $this->prepareCenter(2, 'centerB'); // the entity will have another center
         $scope = $this->prepareScope(1, 'default');
         $user = $this->prepareUser([
             [
@@ -431,8 +431,8 @@ final class AuthorizationHelperTest extends KernelTestCase
         ]);
         $helper = $this->getAuthorizationHelper();
         $entity = $this->prophesize();
-        $entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
-        $entity->willImplement('\\' . \Chill\MainBundle\Entity\HasScopeInterface::class);
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasScopeInterface::class);
         $entity->getCenter()->willReturn($centerB);
         $entity->getScope()->willReturn($scope);
 
@@ -452,7 +452,7 @@ final class AuthorizationHelperTest extends KernelTestCase
         ]);
         $helper = $this->getAuthorizationHelper();
         $entity = $this->prophesize();
-        $entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
         $entity->getCenter()->willReturn($center);
 
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
@@ -471,8 +471,8 @@ final class AuthorizationHelperTest extends KernelTestCase
         ]);
         $helper = $this->getAuthorizationHelper();
         $entity = $this->prophesize();
-        $entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
-        $entity->willImplement('\\' . \Chill\MainBundle\Entity\HasScopeInterface::class);
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasScopeInterface::class);
         $entity->getCenter()->willReturn($center);
         $entity->getScope()->willReturn($scope);
 
@@ -503,7 +503,7 @@ final class AuthorizationHelperTest extends KernelTestCase
         ]);
         $helper = $this->getAuthorizationHelper();
         $entity = $this->prophesize();
-        $entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
         $entity->getCenter()->willReturn($centerA);
 
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
@@ -512,8 +512,8 @@ final class AuthorizationHelperTest extends KernelTestCase
     public function testUserHasAccessUserHasNoScopeEntityWithScope()
     {
         $center = $this->prepareCenter(1, 'center');
-        $scopeA = $this->prepareScope(1, 'default'); //the entity will have this scope
-        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $scopeA = $this->prepareScope(1, 'default'); // the entity will have this scope
+        $scopeB = $this->prepareScope(2, 'other'); // the user will be granted this scope
         $user = $this->prepareUser([
             [
                 'center' => $center, 'permissionsGroup' => [
@@ -535,9 +535,9 @@ final class AuthorizationHelperTest extends KernelTestCase
     {
         $centerA = $this->prepareCenter(1, 'center');
         $centerB = $this->prepareCenter(2, 'centerB');
-        $scopeA = $this->prepareScope(3, 'other'); //the user will be granted this scope
-        $scopeB = $this->prepareScope(4, 'other'); //the user will be granted this scope
-        $scopeC = $this->prepareScope(5, 'other'); //the user will be granted this scope
+        $scopeA = $this->prepareScope(3, 'other'); // the user will be granted this scope
+        $scopeB = $this->prepareScope(4, 'other'); // the user will be granted this scope
+        $scopeC = $this->prepareScope(5, 'other'); // the user will be granted this scope
         $user = $this->prepareUser([
             [
                 'center' => $centerA, 'permissionsGroup' => [
@@ -560,7 +560,7 @@ final class AuthorizationHelperTest extends KernelTestCase
         $center = $this->prepareCenter(1, 'center');
         $centerB = $this->prepareCenter(2, 'centerB');
         $centerC = $this->prepareCenter(3, 'centerC');
-        $scopeB = $this->prepareScope(4, 'other'); //the user will be granted this scope
+        $scopeB = $this->prepareScope(4, 'other'); // the user will be granted this scope
         $user = $this->prepareUser([
             [
                 'center' => $center, 'permissionsGroup' => [
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php
index e3d2b1f07..78956a1d9 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php
@@ -13,13 +13,11 @@ namespace Chill\MainBundle\Tests\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\PasswordRecover\TokenManager;
-use DateInterval;
-use DateTimeImmutable;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use UnexpectedValueException;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class TokenManagerTest extends KernelTestCase
@@ -42,7 +40,7 @@ final class TokenManagerTest extends KernelTestCase
     {
         $tokenManager = $this->tokenManager;
         $user = (new User())->setUsernameCanonical('test');
-        $expiration = new DateTimeImmutable('tomorrow');
+        $expiration = new \DateTimeImmutable('tomorrow');
 
         $tokens = $tokenManager->generate($user, $expiration);
 
@@ -56,12 +54,12 @@ final class TokenManagerTest extends KernelTestCase
 
     public function testGenerateEmptyUsernameCanonical()
     {
-        $this->expectException(UnexpectedValueException::class);
+        $this->expectException(\UnexpectedValueException::class);
 
         $tokenManager = $this->tokenManager;
         // set a username, but not a username canonical
         $user = (new User())->setUsername('test');
-        $expiration = new DateTimeImmutable('tomorrow');
+        $expiration = new \DateTimeImmutable('tomorrow');
 
         $tokenManager->generate($user, $expiration);
     }
@@ -70,7 +68,7 @@ final class TokenManagerTest extends KernelTestCase
     {
         $tokenManager = $this->tokenManager;
         $user = (new User())->setUsernameCanonical('test');
-        $expiration = new DateTimeImmutable('tomorrow');
+        $expiration = new \DateTimeImmutable('tomorrow');
 
         $tokens = $tokenManager->generate($user, $expiration);
 
@@ -83,8 +81,8 @@ final class TokenManagerTest extends KernelTestCase
         $this->assertTrue($verification);
 
         // test with altering token
-        $this->assertFalse($tokenManager->verify($hash . '5', $token, $user, $timestamp));
-        $this->assertFalse($tokenManager->verify($hash, $token . '25', $user, $timestamp));
+        $this->assertFalse($tokenManager->verify($hash.'5', $token, $user, $timestamp));
+        $this->assertFalse($tokenManager->verify($hash, $token.'25', $user, $timestamp));
         $this->assertFalse($tokenManager->verify($hash, $token, $user->setUsernameCanonical('test2'), $timestamp));
         $this->assertFalse($tokenManager->verify($hash, $token, $user, (string) ($timestamp + 1)));
     }
@@ -93,7 +91,7 @@ final class TokenManagerTest extends KernelTestCase
     {
         $tokenManager = $this->tokenManager;
         $user = (new User())->setUsernameCanonical('test');
-        $expiration = (new DateTimeImmutable('now'))->sub(new DateInterval('PT1S'));
+        $expiration = (new \DateTimeImmutable('now'))->sub(new \DateInterval('PT1S'));
 
         $tokens = $tokenManager->generate($user, $expiration);
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
index e7668a897..ff4af29d4 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CenterResolverDispatcherTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
index 215c0e825..733e17fec 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
@@ -19,6 +19,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DefaultScopeResolverTest extends TestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
index 690463f39..35245174c 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
@@ -20,6 +20,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeResolverDispatcherTest extends TestCase
@@ -54,6 +55,7 @@ final class ScopeResolverDispatcherTest extends TestCase
              * @var Scope[]
              */
             private array $scopes = [];
+
             public function __construct(Scope $scopeA, Scope $scopeB)
             {
                 $this->scopes = [$scopeA, $scopeB];
diff --git a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php
index 6de3a2e8d..c820b615d 100644
--- a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php
@@ -12,11 +12,7 @@ declare(strict_types=1);
 namespace Serializer\Normalizer;
 
 use Chill\MainBundle\Serializer\Normalizer\DateNormalizer;
-use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Prophecy\Prophet;
-use stdClass;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
@@ -24,6 +20,7 @@ use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DateNormalizerTest extends KernelTestCase
@@ -37,8 +34,8 @@ final class DateNormalizerTest extends KernelTestCase
 
     public function generateDataNormalize()
     {
-        $datetime = DateTime::createFromFormat('Y-m-d H:i:sO', '2021-06-05 15:05:01+02:00');
-        $date = DateTime::createFromFormat('Y-m-d H:i:sO', '2021-06-05 00:00:00+02:00');
+        $datetime = \DateTime::createFromFormat('Y-m-d H:i:sO', '2021-06-05 15:05:01+02:00');
+        $date = \DateTime::createFromFormat('Y-m-d H:i:sO', '2021-06-05 00:00:00+02:00');
 
         yield [
             ['datetime' => '2021-06-05T15:05:01+0200', 'datetime8601' => '2021-06-05T15:05:01+02:00'],
@@ -76,18 +73,18 @@ final class DateNormalizerTest extends KernelTestCase
 
     public function testSupports()
     {
-        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new DateTime(), 'json'));
-        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new DateTimeImmutable(), 'json'));
-        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new DateTime(), 'docgen'));
-        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new DateTimeImmutable(), 'docgen'));
-        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(null, 'docgen', ['docgen:expects' => DateTimeImmutable::class]));
-        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(null, 'docgen', ['docgen:expects' => DateTimeInterface::class]));
-        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(null, 'docgen', ['docgen:expects' => DateTime::class]));
-        $this->assertFalse($this->buildDateNormalizer()->supportsNormalization(new stdClass(), 'docgen'));
-        $this->assertFalse($this->buildDateNormalizer()->supportsNormalization(new DateTime(), 'xml'));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new \DateTime(), 'json'));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new \DateTimeImmutable(), 'json'));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new \DateTime(), 'docgen'));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new \DateTimeImmutable(), 'docgen'));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(null, 'docgen', ['docgen:expects' => \DateTimeImmutable::class]));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(null, 'docgen', ['docgen:expects' => \DateTimeInterface::class]));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(null, 'docgen', ['docgen:expects' => \DateTime::class]));
+        $this->assertFalse($this->buildDateNormalizer()->supportsNormalization(new \stdClass(), 'docgen'));
+        $this->assertFalse($this->buildDateNormalizer()->supportsNormalization(new \DateTime(), 'xml'));
     }
 
-    private function buildDateNormalizer(?string $locale = null): DateNormalizer
+    private function buildDateNormalizer(string $locale = null): DateNormalizer
     {
         $requestStack = $this->prophet->prophesize(RequestStack::class);
         $parameterBag = new ParameterBag();
diff --git a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php
index b0363c1c6..225f67b3b 100644
--- a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php
@@ -19,6 +19,7 @@ use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DoctrineExistingEntityNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php
index 450eac2b5..eda761dc1 100644
--- a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php
@@ -21,6 +21,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PhonenumberNormalizerTest extends TestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJobTest.php b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJobTest.php
index 9e83f2e7e..e3a29e285 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJobTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJobTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\Clock\MockClock;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class CollateAddressWithReferenceOrPostalCodeCronJobTest extends TestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeTest.php b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeTest.php
index 61b36e669..9d6af705a 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class CollateAddressWithReferenceOrPostalCodeTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJobTest.php b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJobTest.php
index 833178622..827dc7e47 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJobTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJobTest.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Services\AddressGeographicalUnit;
 
 use Chill\MainBundle\Entity\CronJobExecution;
-use DateTimeImmutable;
 use Doctrine\DBAL\Connection;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -20,6 +19,7 @@ use Symfony\Component\Clock\MockClock;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RefreshAddressToGeographicalUnitMaterializedViewCronJobTest extends KernelTestCase
@@ -32,13 +32,13 @@ final class RefreshAddressToGeographicalUnitMaterializedViewCronJobTest extends
         // 10 + 5 executions
         $job = new \Chill\MainBundle\Service\AddressGeographicalUnit\RefreshAddressToGeographicalUnitMaterializedViewCronJob(
             $this->prophesize(Connection::class)->reveal(),
-            new MockClock(new DateTimeImmutable('2023-07-01T00:00:00'))
+            new MockClock(new \DateTimeImmutable('2023-07-01T00:00:00'))
         );
 
         $hoursAgo23 = new CronJobExecution($job->getKey());
-        $hoursAgo23->setLastStart(new DateTimeImmutable('2023-06-30T01:00:00'));
+        $hoursAgo23->setLastStart(new \DateTimeImmutable('2023-06-30T01:00:00'));
         $hoursAgo25 = new CronJobExecution($job->getKey());
-        $hoursAgo25->setLastStart(new DateTimeImmutable('2023-06-29T23:00:00'));
+        $hoursAgo25->setLastStart(new \DateTimeImmutable('2023-06-29T23:00:00'));
 
         $executedForFirstTime = $executedAfter23 = $executedAfter25 = 0;
 
@@ -71,7 +71,7 @@ final class RefreshAddressToGeographicalUnitMaterializedViewCronJobTest extends
         );
 
         $lastExecution = new CronJobExecution($job->getKey());
-        $lastExecution->setLastStart(new DateTimeImmutable('2 days ago'));
+        $lastExecution->setLastStart(new \DateTimeImmutable('2 days ago'));
 
         $this->assertIsBool($job->canRun($lastExecution));
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressReferenceBaseImporterTest.php b/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressReferenceBaseImporterTest.php
index 2ef7f0143..84f0c9fc0 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressReferenceBaseImporterTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressReferenceBaseImporterTest.php
@@ -20,6 +20,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AddressReferenceBaseImporterTest extends KernelTestCase
@@ -46,7 +47,7 @@ final class AddressReferenceBaseImporterTest extends KernelTestCase
     public function testImportAddress(): void
     {
         $postalCode = (new PostalCode())
-            ->setRefPostalCodeId($postalCodeId = '1234' . uniqid())
+            ->setRefPostalCodeId($postalCodeId = '1234'.uniqid())
             ->setPostalCodeSource('testing')
             ->setCode('TEST456')
             ->setName('testing');
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressToReferenceMatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressToReferenceMatcherTest.php
index c07e9c978..1bc888d59 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressToReferenceMatcherTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressToReferenceMatcherTest.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Services\Import;
 
-use Chill\MainBundle\Doctrine\Model\Point;
 use Chill\MainBundle\Entity\Address;
-use Chill\MainBundle\Entity\AddressReference;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Repository\AddressReferenceRepository;
 use Chill\MainBundle\Repository\CountryRepository;
@@ -24,6 +22,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class AddressToReferenceMatcherTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/Import/GeographicalUnitBaseImporterTest.php b/src/Bundle/ChillMainBundle/Tests/Services/Import/GeographicalUnitBaseImporterTest.php
index 757e13c2f..de72492a9 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/Import/GeographicalUnitBaseImporterTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/Import/GeographicalUnitBaseImporterTest.php
@@ -19,6 +19,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GeographicalUnitBaseImporterTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/Import/PostalCodeBaseImporterTest.php b/src/Bundle/ChillMainBundle/Tests/Services/Import/PostalCodeBaseImporterTest.php
index ce9a7a432..19c824eff 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/Import/PostalCodeBaseImporterTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/Import/PostalCodeBaseImporterTest.php
@@ -19,6 +19,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PostalCodeBaseImporterTest extends KernelTestCase
@@ -47,9 +48,9 @@ final class PostalCodeBaseImporterTest extends KernelTestCase
     {
         $this->importer->importCode(
             'BE',
-            'tested with pattern ' . ($uniqid = uniqid()),
+            'tested with pattern '.($uniqid = uniqid()),
             '12345',
-            $refPostalCodeId = 'test' . uniqid(),
+            $refPostalCodeId = 'test'.uniqid(),
             'test',
             50.0,
             5.0,
@@ -59,7 +60,7 @@ final class PostalCodeBaseImporterTest extends KernelTestCase
         $this->importer->finalize();
 
         $postalCodes = $this->postalCodeRepository->findByPattern(
-            'with pattern ' . $uniqid,
+            'with pattern '.$uniqid,
             $this->countryRepository->findOneBy(['countryCode' => 'BE'])
         );
 
@@ -72,7 +73,7 @@ final class PostalCodeBaseImporterTest extends KernelTestCase
 
         $this->importer->importCode(
             'BE',
-            'tested with adapted pattern ' . ($uniqid = uniqid()),
+            'tested with adapted pattern '.($uniqid = uniqid()),
             '12345',
             $refPostalCodeId,
             'test',
@@ -84,7 +85,7 @@ final class PostalCodeBaseImporterTest extends KernelTestCase
         $this->importer->finalize();
 
         $postalCodes = $this->postalCodeRepository->findByPattern(
-            'with pattern ' . $uniqid,
+            'with pattern '.$uniqid,
             $this->countryRepository->findOneBy(['countryCode' => 'BE'])
         );
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php b/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
index 2df11c4f9..d365d3567 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Routing\RouteCollection;
  * This class provide functional test for MenuComposer.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class MenuComposerTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/RollingDate/RollingDateConverterTest.php b/src/Bundle/ChillMainBundle/Tests/Services/RollingDate/RollingDateConverterTest.php
index 6df2c889b..25f3d03e6 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/RollingDate/RollingDateConverterTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/RollingDate/RollingDateConverterTest.php
@@ -13,12 +13,11 @@ namespace Services\RollingDate;
 
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverter;
-use DateTime;
-use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RollingDateConverterTest extends TestCase
@@ -63,7 +62,7 @@ final class RollingDateConverterTest extends TestCase
 
     public function testConversionFixedDate()
     {
-        $rollingDate = new RollingDate(RollingDate::T_FIXED_DATE, new DateTimeImmutable('2022-01-01'));
+        $rollingDate = new RollingDate(RollingDate::T_FIXED_DATE, new \DateTimeImmutable('2022-01-01'));
 
         $this->assertEquals(
             '2022-01-01',
@@ -78,7 +77,7 @@ final class RollingDateConverterTest extends TestCase
         $actual = $this->converter->convert($rollingDate);
 
         $this->assertEquals(
-            (int) (new DateTimeImmutable('now'))->format('Y') - 1,
+            (int) (new \DateTimeImmutable('now'))->format('Y') - 1,
             (int) $actual->format('Y')
         );
         $this->assertEquals(1, (int) $actual->format('m'));
@@ -90,11 +89,11 @@ final class RollingDateConverterTest extends TestCase
      */
     public function testConvertOnPivotDate(string $roll, string $expectedDateTime, string $format)
     {
-        $pivot = DateTimeImmutable::createFromFormat('Y-m-d His', '2022-11-07 000000');
+        $pivot = \DateTimeImmutable::createFromFormat('Y-m-d His', '2022-11-07 000000');
         $rollingDate = new RollingDate($roll, null, $pivot);
 
         $this->assertEquals(
-            DateTime::createFromFormat($format, $expectedDateTime),
+            \DateTime::createFromFormat($format, $expectedDateTime),
             $this->converter->convert($rollingDate)
         );
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php b/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php
index e79e7cfc3..d4eb8afa8 100644
--- a/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php
@@ -20,6 +20,7 @@ use PHPUnit\Framework\TestCase;
  * @internal we do not want to test the markdown transformation. We just want to
  * test that the markdown is correctly transformed into html, and that the html
  * is safe.
+ *
  * @coversNothing
  */
 final class ChillMarkdownRenderExtensionTest extends TestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php b/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
index c8f062301..0fb6ff68c 100644
--- a/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
@@ -16,13 +16,11 @@ use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Templating\Entity\AddressRender;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Iterator;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\Templating\EngineInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AddressRenderTest extends KernelTestCase
@@ -32,7 +30,7 @@ final class AddressRenderTest extends KernelTestCase
         self::bootKernel();
     }
 
-    public function addressDataProviderBEWithBuilding(): Iterator
+    public function addressDataProviderBEWithBuilding(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -52,7 +50,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'Résidence "Les Bleuets" — Rue ABC, 5 — 012345 Locality — Belgium'];
     }
 
-    public function addressDataProviderBEWithSteps(): Iterator
+    public function addressDataProviderBEWithSteps(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -72,7 +70,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'esc 4 — Rue ABC, 5 — 012345 Locality — Belgium'];
     }
 
-    public function addressDataProviderFRWithBuilding(): Iterator
+    public function addressDataProviderFRWithBuilding(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -92,7 +90,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'Résidence "Les Bleuets" — 5, Rue ABC — 012345 Locality — France'];
     }
 
-    public function addressDataProviderFRWithSteps(): Iterator
+    public function addressDataProviderFRWithSteps(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -112,7 +110,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'esc 4 — 5, Rue ABC — 012345 Locality — France'];
     }
 
-    public function complexAddressDataProviderBE(): Iterator
+    public function complexAddressDataProviderBE(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -136,7 +134,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'Résidence "Les Bleuets" - appart 1 - ét 2 - coul 3 - esc 4 — Rue ABC, 5 — 012345 Locality — Belgium'];
     }
 
-    public function complexAddressDataProviderFR(): Iterator
+    public function complexAddressDataProviderFR(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -162,7 +160,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'appart 1 - ét 2 - coul 3 - esc 4 — Résidence "Les Bleuets" — 5, Rue ABC — A droite de la porte — 012345 Locality CEDEX — France'];
     }
 
-    public function noFullAddressDataProviderBE(): Iterator
+    public function noFullAddressDataProviderBE(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -179,7 +177,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, '012345 Locality — Belgium'];
     }
 
-    public function simpleAddressDataProviderBE(): Iterator
+    public function simpleAddressDataProviderBE(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -197,7 +195,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'Rue ABC, 5 — 012345 Locality — Belgium'];
     }
 
-    public function simpleAddressDataProviderFR(): Iterator
+    public function simpleAddressDataProviderFR(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
diff --git a/src/Bundle/ChillMainBundle/Tests/TestHelper.php b/src/Bundle/ChillMainBundle/Tests/TestHelper.php
index bdc089de3..6c144a5fa 100644
--- a/src/Bundle/ChillMainBundle/Tests/TestHelper.php
+++ b/src/Bundle/ChillMainBundle/Tests/TestHelper.php
@@ -21,7 +21,6 @@ class TestHelper
     /**
      * create a client authenticated with an user.
      *
-     *
      * @return \Symfony\Component\BrowserKit\AbstractBrowser authenticated client
      */
     public static function getAuthenticatedClientOptions(
diff --git a/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php b/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php
index b44e51f2e..9150c8ea1 100644
--- a/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php
@@ -18,6 +18,7 @@ use PHPUnit\Framework\TestCase;
  * tests for CountriesInfos.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CountriesInfoTest extends TestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php b/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php
index d38870f85..e8d95233c 100644
--- a/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php
@@ -12,36 +12,34 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Util;
 
 use Chill\MainBundle\Util\DateRangeCovering;
-use DateTime;
-use DateTimeZone;
 use PHPUnit\Framework\TestCase;
-use function usort;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DateRangeCoveringTest extends TestCase
 {
     public function testCoveringWithMinCover1()
     {
-        $cover = new DateRangeCovering(1, new DateTimeZone('Europe/Brussels'));
+        $cover = new DateRangeCovering(1, new \DateTimeZone('Europe/Brussels'));
         $cover
-            ->add(new DateTime('2010-01-01'), new DateTime('2010-12-01'), 1)
-            ->add(new DateTime('2010-06-01'), new DateTime('2011-06-01'), 2)
-            ->add(new DateTime('2019-06-01'), new DateTime('2019-06-01'), 3)
+            ->add(new \DateTime('2010-01-01'), new \DateTime('2010-12-01'), 1)
+            ->add(new \DateTime('2010-06-01'), new \DateTime('2011-06-01'), 2)
+            ->add(new \DateTime('2019-06-01'), new \DateTime('2019-06-01'), 3)
             ->compute();
 
         $this->assertTrue($cover->hasIntersections());
         $this->assertIsArray($cover->getIntersections());
         $this->assertCount(1, $cover->getIntersections());
         $this->assertEquals(
-            new DateTime('2010-06-01'),
+            new \DateTime('2010-06-01'),
             $cover->getIntersections()[0][0],
             'assert date start are the intersection'
         );
         $this->assertEquals(
-            new DateTime('2010-12-01'),
+            new \DateTime('2010-12-01'),
             $cover->getIntersections()[0][1],
             'assert date end are the intersection'
         );
@@ -53,10 +51,10 @@ final class DateRangeCoveringTest extends TestCase
 
     public function testCoveringWithMinCover1NoCoveringWithNullDates()
     {
-        $cover = new DateRangeCovering(1, new DateTimeZone('Europe/Brussels'));
+        $cover = new DateRangeCovering(1, new \DateTimeZone('Europe/Brussels'));
         $cover
-            ->add(new DateTime('2021-10-05'), new DateTime('2021-10-18'), 521)
-            ->add(new DateTime('2021-10-26'), null, 663)
+            ->add(new \DateTime('2021-10-05'), new \DateTime('2021-10-18'), 521)
+            ->add(new \DateTime('2021-10-26'), null, 663)
             ->compute();
 
         $this->assertFalse($cover->hasIntersections());
@@ -64,12 +62,12 @@ final class DateRangeCoveringTest extends TestCase
 
     public function testCoveringWithMinCover1WithTwoIntersections()
     {
-        $cover = new DateRangeCovering(1, new DateTimeZone('Europe/Brussels'));
+        $cover = new DateRangeCovering(1, new \DateTimeZone('Europe/Brussels'));
         $cover
-            ->add(new DateTime('2010-01-01'), new DateTime('2010-12-01'), 1)
-            ->add(new DateTime('2010-06-01'), new DateTime('2011-06-01'), 2)
-            ->add(new DateTime('2019-01-01'), new DateTime('2019-12-01'), 3)
-            ->add(new DateTime('2019-06-01'), new DateTime('2020-06-01'), 4)
+            ->add(new \DateTime('2010-01-01'), new \DateTime('2010-12-01'), 1)
+            ->add(new \DateTime('2010-06-01'), new \DateTime('2011-06-01'), 2)
+            ->add(new \DateTime('2019-01-01'), new \DateTime('2019-12-01'), 3)
+            ->add(new \DateTime('2019-06-01'), new \DateTime('2020-06-01'), 4)
             ->compute();
 
         $this->assertTrue($cover->hasIntersections());
@@ -79,7 +77,7 @@ final class DateRangeCoveringTest extends TestCase
         $intersections = $cover->getIntersections();
 
         // sort the intersections to compare them in expected order
-        usort($intersections, static function ($a, $b) {
+        \usort($intersections, static function ($a, $b) {
             if ($a[0] === $b[0]) {
                 return $a[1] <=> $b[1];
             }
@@ -89,12 +87,12 @@ final class DateRangeCoveringTest extends TestCase
 
         // first intersection
         $this->assertEquals(
-            new DateTime('2010-06-01'),
+            new \DateTime('2010-06-01'),
             $intersections[0][0],
             'assert date start are the intersection'
         );
         $this->assertEquals(
-            new DateTime('2010-12-01'),
+            new \DateTime('2010-12-01'),
             $intersections[0][1],
             'assert date end are the intersection'
         );
@@ -106,12 +104,12 @@ final class DateRangeCoveringTest extends TestCase
 
         // second intersection
         $this->assertEquals(
-            new DateTime('2019-06-01'),
+            new \DateTime('2019-06-01'),
             $intersections[1][0],
             'assert date start are the intersection'
         );
         $this->assertEquals(
-            new DateTime('2019-12-01'),
+            new \DateTime('2019-12-01'),
             $intersections[1][1],
             'assert date end are the intersection'
         );
@@ -124,25 +122,25 @@ final class DateRangeCoveringTest extends TestCase
 
     public function testCoveringWithMinCover2()
     {
-        $cover = new DateRangeCovering(2, new DateTimeZone('Europe/Brussels'));
+        $cover = new DateRangeCovering(2, new \DateTimeZone('Europe/Brussels'));
         $cover
-            ->add(new DateTime('2010-01-01'), new DateTime('2010-10-01'), 1)
-            ->add(new DateTime('2010-06-01'), new DateTime('2010-09-01'), 2)
-            ->add(new DateTime('2010-04-01'), new DateTime('2010-12-01'), 3)
-            ->add(new DateTime('2019-01-01'), new DateTime('2019-10-01'), 4)
-            ->add(new DateTime('2019-06-01'), new DateTime('2019-09-01'), 5)
+            ->add(new \DateTime('2010-01-01'), new \DateTime('2010-10-01'), 1)
+            ->add(new \DateTime('2010-06-01'), new \DateTime('2010-09-01'), 2)
+            ->add(new \DateTime('2010-04-01'), new \DateTime('2010-12-01'), 3)
+            ->add(new \DateTime('2019-01-01'), new \DateTime('2019-10-01'), 4)
+            ->add(new \DateTime('2019-06-01'), new \DateTime('2019-09-01'), 5)
             ->compute();
         $this->assertTrue($cover->hasIntersections());
         $this->assertIsArray($cover->getIntersections());
         $this->assertCount(1, $cover->getIntersections());
 
         $this->assertEquals(
-            new DateTime('2010-06-01'),
+            new \DateTime('2010-06-01'),
             $cover->getIntersections()[0][0],
             'assert date start are the intersection'
         );
         $this->assertEquals(
-            new DateTime('2010-09-01'),
+            new \DateTime('2010-09-01'),
             $cover->getIntersections()[0][1],
             'assert date end are the intersection'
         );
@@ -156,14 +154,14 @@ final class DateRangeCoveringTest extends TestCase
 
     public function testCoveringWithMinCover2AndThreePeriodsCovering()
     {
-        $cover = new DateRangeCovering(2, new DateTimeZone('Europe/Brussels'));
+        $cover = new DateRangeCovering(2, new \DateTimeZone('Europe/Brussels'));
         $cover
-            ->add(new DateTime('2010-01-01'), new DateTime('2010-10-01'), 1)
-            ->add(new DateTime('2010-06-01'), new DateTime('2010-09-01'), 2)
-            ->add(new DateTime('2010-04-01'), new DateTime('2010-12-01'), 3)
-            ->add(new DateTime('2009-01-01'), new DateTime('2010-09-15'), 4)
-            ->add(new DateTime('2019-01-01'), new DateTime('2019-10-01'), 5)
-            ->add(new DateTime('2019-06-01'), new DateTime('2019-09-01'), 6)
+            ->add(new \DateTime('2010-01-01'), new \DateTime('2010-10-01'), 1)
+            ->add(new \DateTime('2010-06-01'), new \DateTime('2010-09-01'), 2)
+            ->add(new \DateTime('2010-04-01'), new \DateTime('2010-12-01'), 3)
+            ->add(new \DateTime('2009-01-01'), new \DateTime('2010-09-15'), 4)
+            ->add(new \DateTime('2019-01-01'), new \DateTime('2019-10-01'), 5)
+            ->add(new \DateTime('2019-06-01'), new \DateTime('2019-09-01'), 6)
             ->compute();
 
         $this->assertTrue($cover->hasIntersections());
@@ -171,12 +169,12 @@ final class DateRangeCoveringTest extends TestCase
         $this->assertCount(1, $cover->getIntersections());
 
         $this->assertEquals(
-            new DateTime('2010-04-01'),
+            new \DateTime('2010-04-01'),
             $cover->getIntersections()[0][0],
             'assert date start are the intersection'
         );
         $this->assertEquals(
-            new DateTime('2010-09-15'),
+            new \DateTime('2010-09-15'),
             $cover->getIntersections()[0][1],
             'assert date end are the intersection'
         );
@@ -191,14 +189,14 @@ final class DateRangeCoveringTest extends TestCase
 
     public function testCoveringWithMinCover2AndThreePeriodsCoveringWithNullMetadata()
     {
-        $cover = new DateRangeCovering(2, new DateTimeZone('Europe/Brussels'));
+        $cover = new DateRangeCovering(2, new \DateTimeZone('Europe/Brussels'));
         $cover
-            ->add(new DateTime('2010-01-01'), new DateTime('2010-10-01'), null)
-            ->add(new DateTime('2010-06-01'), new DateTime('2010-09-01'), null)
-            ->add(new DateTime('2010-04-01'), new DateTime('2010-12-01'), null)
-            ->add(new DateTime('2009-01-01'), new DateTime('2010-09-15'), null)
-            ->add(new DateTime('2019-01-01'), new DateTime('2019-10-01'), null)
-            ->add(new DateTime('2019-06-01'), new DateTime('2019-09-01'), null)
+            ->add(new \DateTime('2010-01-01'), new \DateTime('2010-10-01'), null)
+            ->add(new \DateTime('2010-06-01'), new \DateTime('2010-09-01'), null)
+            ->add(new \DateTime('2010-04-01'), new \DateTime('2010-12-01'), null)
+            ->add(new \DateTime('2009-01-01'), new \DateTime('2010-09-15'), null)
+            ->add(new \DateTime('2019-01-01'), new \DateTime('2019-10-01'), null)
+            ->add(new \DateTime('2019-06-01'), new \DateTime('2019-09-01'), null)
             ->compute();
 
         $this->assertTrue($cover->hasIntersections());
@@ -206,12 +204,12 @@ final class DateRangeCoveringTest extends TestCase
         $this->assertCount(1, $cover->getIntersections());
 
         $this->assertEquals(
-            new DateTime('2010-04-01'),
+            new \DateTime('2010-04-01'),
             $cover->getIntersections()[0][0],
             'assert date start are the intersection'
         );
         $this->assertEquals(
-            new DateTime('2010-09-15'),
+            new \DateTime('2010-09-15'),
             $cover->getIntersections()[0][1],
             'assert date end are the intersection'
         );
@@ -220,13 +218,13 @@ final class DateRangeCoveringTest extends TestCase
 
     public function testCoveringWithMinCover3Absent()
     {
-        $cover = new DateRangeCovering(3, new DateTimeZone('Europe/Brussels'));
+        $cover = new DateRangeCovering(3, new \DateTimeZone('Europe/Brussels'));
         $cover
-            ->add(new DateTime('2010-01-01'), new DateTime('2010-10-01'), 1)
-            ->add(new DateTime('2010-06-01'), new DateTime('2010-09-01'), 2)
-            ->add(new DateTime('2010-04-01'), new DateTime('2010-12-01'), 3)
-            ->add(new DateTime('2019-01-01'), new DateTime('2019-10-01'), 4)
-            ->add(new DateTime('2019-06-01'), new DateTime('2019-09-01'), 5)
+            ->add(new \DateTime('2010-01-01'), new \DateTime('2010-10-01'), 1)
+            ->add(new \DateTime('2010-06-01'), new \DateTime('2010-09-01'), 2)
+            ->add(new \DateTime('2010-04-01'), new \DateTime('2010-12-01'), 3)
+            ->add(new \DateTime('2019-01-01'), new \DateTime('2019-10-01'), 4)
+            ->add(new \DateTime('2019-06-01'), new \DateTime('2019-09-01'), 5)
             ->compute();
         $this->assertFalse($cover->hasIntersections());
         $this->assertIsArray($cover->getIntersections());
diff --git a/src/Bundle/ChillMainBundle/Tests/Workflow/EventSubscriber/NotificationOnTransitionTest.php b/src/Bundle/ChillMainBundle/Tests/Workflow/EventSubscriber/NotificationOnTransitionTest.php
index c85ff3c05..fed7f2dce 100644
--- a/src/Bundle/ChillMainBundle/Tests/Workflow/EventSubscriber/NotificationOnTransitionTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Workflow/EventSubscriber/NotificationOnTransitionTest.php
@@ -23,19 +23,16 @@ use Prophecy\Argument;
 use Prophecy\Call\Call;
 use Prophecy\Exception\Prediction\FailedPredictionException;
 use Prophecy\PhpUnit\ProphecyTrait;
-use ReflectionClass;
-use stdClass;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Component\Workflow\Event\Event;
 use Symfony\Component\Workflow\Marking;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Transition;
 use Symfony\Component\Workflow\WorkflowInterface;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class NotificationOnTransitionTest extends TestCase
@@ -51,10 +48,10 @@ final class NotificationOnTransitionTest extends TestCase
         $entityWorkflow = new EntityWorkflow();
         $entityWorkflow
             ->setWorkflowName('workflow_name')
-            ->setRelatedEntityClass(stdClass::class)
+            ->setRelatedEntityClass(\stdClass::class)
             ->setRelatedEntityId(1);
         // force an id to entityWorkflow:
-        $reflection = new ReflectionClass($entityWorkflow);
+        $reflection = new \ReflectionClass($entityWorkflow);
         $id = $reflection->getProperty('id');
         $id->setAccessible(true);
         $id->setValue($entityWorkflow, 1);
@@ -68,7 +65,7 @@ final class NotificationOnTransitionTest extends TestCase
         $em->persist(Argument::type(Notification::class))->should(
             static function ($args) use ($dest) {
                 /** @var Call[] $args */
-                if (1 !== count($args)) {
+                if (1 !== \count($args)) {
                     throw new FailedPredictionException('no notification sent');
                 }
 
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php b/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
index 467409c21..53d8faa16 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
@@ -11,16 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Timeline;
 
-use DateTime;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\ResultSetMapping;
-use LogicException;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-
 use Twig\Environment;
-use function array_key_exists;
-use function is_string;
 
 /**
  * Build timeline.
@@ -51,7 +45,7 @@ class TimelineBuilder
      * @internal This function is called by the TimelineCompilerClass
      *
      * @param string $context the context of the service
-     * @param string $id the
+     * @param string $id      the
      */
     public function addProvider($context, $id, TimelineProviderInterface $provider)
     {
@@ -91,10 +85,9 @@ class TimelineBuilder
      */
     public function getProvidersByContext($context)
     {
-        //throw an exception if no provider have been defined for this context
-        if (!array_key_exists($context, $this->providersByContext)) {
-            throw new LogicException(sprintf('No builders have been defined for "%s"'
-                    . ' context', $context));
+        // throw an exception if no provider have been defined for this context
+        if (!\array_key_exists($context, $this->providersByContext)) {
+            throw new \LogicException(sprintf('No builders have been defined for "%s" context', $context));
         }
 
         $providers = [];
@@ -114,9 +107,9 @@ class TimelineBuilder
      * @example https://redmine.champs-libres.coop/projects/chillperson/repository/revisions/bd2e1b1808f73e39532e9538413025df5487cad0/entry/Controller/TimelinePersonController.php#L47 the implementation in person bundle
      *
      * @param string $context
-     * @param array $args arguments defined by the bundle which create the context
-     * @param int $firstItem first item number
-     * @param int $number number of items by page
+     * @param array  $args      arguments defined by the bundle which create the context
+     * @param int    $firstItem first item number
+     * @param int    $number    number of items by page
      *
      * @return string an HTML representation, must be included using `|raw` filter
      */
@@ -124,8 +117,8 @@ class TimelineBuilder
     {
         [$union, $parameters] = $this->buildUnionQuery($context, $args);
 
-        //add ORDER BY clause and LIMIT
-        $query = $union . sprintf(
+        // add ORDER BY clause and LIMIT
+        $query = $union.sprintf(
             ' ORDER BY date DESC LIMIT %d OFFSET %d',
             $number,
             $firstItem
@@ -156,8 +149,6 @@ class TimelineBuilder
      *
      * return $s;
      * }
-     *
-     * @param mixed $data
      */
 
     /**
@@ -173,15 +164,15 @@ class TimelineBuilder
 
         $sql = sprintf(
             'SELECT %s AS id, '
-                . '%s AS "date", '
-                . "'%s' AS type "
-                . 'FROM %s '
-                . 'WHERE %s',
+                .'%s AS "date", '
+                ."'%s' AS type "
+                .'FROM %s '
+                .'WHERE %s',
             $data['id'],
             $data['date'],
             $data['type'],
             $data['FROM'],
-            is_string($data['WHERE']) ? $data['WHERE'] : $data['WHERE'][0]
+            \is_string($data['WHERE']) ? $data['WHERE'] : $data['WHERE'][0]
         );
 
         return [$sql, $data['WHERE'][1]];
@@ -192,20 +183,20 @@ class TimelineBuilder
      *
      * @uses self::buildSelectQuery to build individual SELECT queries
      *
-     * @throws LogicException if no builder have been defined for this context
-     *
      * @return array, where first element is the query, the second one an array with the parameters
+     *
+     * @throws \LogicException if no builder have been defined for this context
      */
     private function buildUnionQuery(string $context, array $args): array
     {
-        //append SELECT queries with UNION keyword between them
+        // append SELECT queries with UNION keyword between them
         $union = '';
         $parameters = [];
 
         foreach ($this->getProvidersByContext($context) as $provider) {
             $data = $provider->fetchQuery($context, $args);
             [$select, $selectParameters] = $this->buildSelectQuery($data);
-            $append = empty($union) ? $select : ' UNION ' . $select;
+            $append = empty($union) ? $select : ' UNION '.$select;
             $union .= $append;
             $parameters = array_merge($parameters, $selectParameters);
         }
@@ -220,23 +211,23 @@ class TimelineBuilder
      */
     private function getEntities(array $queriedIds, $context)
     {
-        //gather entities by type to pass all id with same type to the TimelineProvider.
+        // gather entities by type to pass all id with same type to the TimelineProvider.
         $idsByType = [];
 
         foreach ($queriedIds as $result) {
             $idsByType[$result['type']][] = $result['id'];
         }
 
-        //fetch entities from providers
+        // fetch entities from providers
         $entitiesByType = [];
 
         foreach ($idsByType as $type => $ids) {
-            //iterate providers for current context
+            // iterate providers for current context
             foreach ($this->getProvidersByContext($context) as $provider) {
                 if ($provider->supportsType($type)) {
                     $entitiesByType[$type] = $provider->getEntities($ids);
 
-                    break; //we assume that providers have unique keys => we break the loop
+                    break; // we assume that providers have unique keys => we break the loop
                 }
             }
         }
@@ -247,9 +238,10 @@ class TimelineBuilder
     /**
      * get the template data from the provider for the given entity, by type.
      *
-     * @param string $type
-     * @param string $context
+     * @param string  $type
+     * @param string  $context
      * @param mixed[] $args
+     *
      * @return array the template data fetched from the provider
      */
     private function getTemplateData($type, mixed $entity, $context, array $args)
@@ -264,26 +256,26 @@ class TimelineBuilder
     /**
      * render the timeline as HTML.
      *
-     * @param string $context
+     * @param string  $context
      * @param mixed[] $args
      *
      * @return string the HTML representation of the timeline
      */
     private function render(array $fetched, array $entitiesByType, $context, array $args)
     {
-        //add results to a pretty array
+        // add results to a pretty array
         $timelineEntries = [];
 
         foreach ($fetched as $result) {
             $data = $this->getTemplateData(
                 $result['type'],
-                $entitiesByType[$result['type']][$result['id']], //the entity
+                $entitiesByType[$result['type']][$result['id']], // the entity
                 $context,
                 $args
             );
 
             $timelineEntries[] = [
-                'date' => new DateTime($result['date']),
+                'date' => new \DateTime($result['date']),
                 'template' => $data['template'],
                 'template_data' => $data['template_data'],
             ];
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php b/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
index ca61d814f..3f9f2889e 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Timeline;
 
-use LogicException;
-
 /**
  * Interface for service providing info to timeline.
  *
@@ -55,10 +53,11 @@ interface TimelineProviderInterface
      * `$context` and `$args` are defined by the bundle which will call the timeline
      * rendering.
      *
-     * @param string $context
-     * @param mixed[] $args the argument to the context.
+     * @param string  $context
+     * @param mixed[] $args    the argument to the context
      *
      * @return string[]
+     *
      * @throw  \LogicException if the context is not supported
      */
     public function fetchQuery($context, array $args);
@@ -106,9 +105,9 @@ interface TimelineProviderInterface
      * @param type $entity
      * @param type $context
      *
-     * @throws LogicException if the context is not supported
-     *
      * @return mixed[]
+     *
+     * @throws \LogicException if the context is not supported
      */
     public function getEntityTemplate($entity, $context, array $args);
 
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php b/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php
index c66366cf1..584e634ea 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Timeline;
 
-use function strtr;
-
 class TimelineSingleQuery
 {
     private bool $distinct = false;
@@ -23,12 +21,12 @@ class TimelineSingleQuery
     {
         $parameters = [];
 
-        return strtr(
+        return \strtr(
             'SELECT {distinct} {id} AS id, '
-                . '{date} AS "date", '
-                . "'{key}' AS type "
-                . 'FROM {from} '
-                . 'WHERE {where}',
+                .'{date} AS "date", '
+                ."'{key}' AS type "
+                .'FROM {from} '
+                .'WHERE {where}',
             [
                 '{distinct}' => $this->distinct ? 'DISTINCT' : '',
                 '{id}' => $this->getId(),
diff --git a/src/Bundle/ChillMainBundle/Util/CountriesInfo.php b/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
index 29eb3b041..e368913e5 100644
--- a/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
+++ b/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
@@ -11,10 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Util;
 
-use UnexpectedValueException;
-
-use function array_key_exists;
-
 /**
  * Get information about countries.
  *
@@ -69,12 +65,11 @@ class CountriesInfo
     {
         self::prepareCacheCountriesByContinent();
 
-        if (array_key_exists($continent, self::$cacheCountriesCodeByContinent)) {
+        if (\array_key_exists($continent, self::$cacheCountriesCodeByContinent)) {
             return self::$cacheCountriesCodeByContinent[$continent];
         }
 
-        throw new UnexpectedValueException(sprintf('The continent with prefix '
-                    . '%s is unknown.', $continent));
+        throw new \UnexpectedValueException(sprintf('The continent with prefix %s is unknown.', $continent));
     }
 
     public static function getCountriesData()
diff --git a/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php b/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
index e5d3de41a..821c66e4e 100644
--- a/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
+++ b/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
@@ -11,23 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Util;
 
-use DateTimeImmutable;
-use DateTimeInterface;
-use DateTimeZone;
-use LogicException;
-
-use function array_diff;
-use function array_flip;
-use function array_intersect_key;
-use function array_key_exists;
-use function array_merge;
-use function array_unique;
-use function array_values;
-use function count;
-use function ksort;
-
-use const PHP_INT_MAX;
-
 /**
  * Utilities to compare date periods.
  *
@@ -74,19 +57,19 @@ class DateRangeCovering
     /**
      * @param int $minCover the minimum of covering required
      */
-    public function __construct(int $minCover, private readonly DateTimeZone $tz)
+    public function __construct(int $minCover, private readonly \DateTimeZone $tz)
     {
         if (0 > $minCover) {
-            throw new LogicException('argument minCover cannot be lower than 0');
+            throw new \LogicException('argument minCover cannot be lower than 0');
         }
 
         $this->minCover = $minCover;
     }
 
-    public function add(DateTimeInterface $start, ?DateTimeInterface $end = null, $metadata = null): self
+    public function add(\DateTimeInterface $start, \DateTimeInterface $end = null, $metadata = null): self
     {
         if ($this->computed) {
-            throw new LogicException('You cannot add intervals to a computed instance');
+            throw new \LogicException('You cannot add intervals to a computed instance');
         }
 
         $k = $this->uniqueKeyCounter++;
@@ -95,7 +78,7 @@ class DateRangeCovering
 
         $this->addToSequence($start->getTimestamp(), $k, null);
         $this->addToSequence(
-            null === $end ? PHP_INT_MAX : $end->getTimestamp(),
+            null === $end ? \PHP_INT_MAX : $end->getTimestamp(),
             null,
             $k
         );
@@ -105,7 +88,7 @@ class DateRangeCovering
 
     public function compute(): self
     {
-        ksort($this->sequence);
+        \ksort($this->sequence);
 
         $currentPeriod = [];
         $currents = [];
@@ -113,34 +96,34 @@ class DateRangeCovering
         $overs = [];
 
         foreach ($this->sequence as $ts => $moves) {
-            $currents = array_merge($currents, $moves['s']);
-            $currents = array_diff($currents, $moves['e']);
+            $currents = \array_merge($currents, $moves['s']);
+            $currents = \array_diff($currents, $moves['e']);
 
-            if (count($currents) > $this->minCover && !$isOpen) {
+            if (\count($currents) > $this->minCover && !$isOpen) {
                 $currentPeriod[0] = $ts;
                 $currentPeriod[2] = $currents;
                 $isOpen = true;
-            } elseif ($isOpen && count($currents) <= $this->minCover) {
+            } elseif ($isOpen && \count($currents) <= $this->minCover) {
                 $currentPeriod[1] = $ts;
                 $overs[] = $currentPeriod;
                 $currentPeriod = [];
                 $isOpen = false;
             } elseif ($isOpen) {
-                $currentPeriod[2] = array_merge($currentPeriod[2], $currents);
+                $currentPeriod[2] = \array_merge($currentPeriod[2], $currents);
             }
         }
 
         // process metadata
         foreach ($overs as [$start, $end, $metadata]) {
             $this->intersections[] = [
-                (new DateTimeImmutable('@' . $start))
+                (new \DateTimeImmutable('@'.$start))
                     ->setTimezone($this->tz),
-                PHP_INT_MAX === $end ? null : (new DateTimeImmutable('@' . $end))
+                \PHP_INT_MAX === $end ? null : (new \DateTimeImmutable('@'.$end))
                     ->setTimezone($this->tz),
-                array_values(
-                    array_intersect_key(
+                \array_values(
+                    \array_intersect_key(
                         $this->metadatas,
-                        array_flip(array_unique($metadata))
+                        \array_flip(\array_unique($metadata))
                     )
                 ),
             ];
@@ -154,8 +137,7 @@ class DateRangeCovering
     public function getIntersections(): array
     {
         if (!$this->computed) {
-            throw new LogicException(sprintf('You cannot call the method %s before ' .
-                "'process'", __METHOD__));
+            throw new \LogicException(sprintf('You cannot call the method %s before '."'process'", __METHOD__));
         }
 
         return $this->intersections;
@@ -164,16 +146,15 @@ class DateRangeCovering
     public function hasIntersections(): bool
     {
         if (!$this->computed) {
-            throw new LogicException(sprintf('You cannot call the method %s before ' .
-                "'process'", __METHOD__));
+            throw new \LogicException(sprintf('You cannot call the method %s before '."'process'", __METHOD__));
         }
 
-        return count($this->intersections) > 0;
+        return \count($this->intersections) > 0;
     }
 
-    private function addToSequence($timestamp, ?int $start = null, ?int $end = null)
+    private function addToSequence($timestamp, int $start = null, int $end = null)
     {
-        if (!array_key_exists($timestamp, $this->sequence)) {
+        if (!\array_key_exists($timestamp, $this->sequence)) {
             $this->sequence[$timestamp] = ['s' => [], 'e' => []];
         }
 
diff --git a/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php b/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php
index 2acc4a619..a379b9539 100644
--- a/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php
+++ b/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php
@@ -21,7 +21,7 @@ class RoleScopeScopePresenceConstraint extends Constraint
     public $messageNullRequired = 'The role "%role%" should not be associated with a scope.';
 
     public $messagePresenceRequired = 'The role "%role%" require to be associated with '
-            . 'a scope.';
+            .'a scope.';
 
     public function getTargets()
     {
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php b/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
index 1c41070e7..0bbf1d373 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
@@ -15,13 +15,10 @@ use Chill\MainBundle\Entity\RoleScope;
 use Chill\MainBundle\Security\RoleProvider;
 use Chill\MainBundle\Validation\Constraint\RoleScopeScopePresenceConstraint;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function in_array;
-
 class RoleScopeScopePresence extends ConstraintValidator
 {
     public function __construct(private readonly RoleProvider $roleProvider, private readonly LoggerInterface $logger, private readonly TranslatorInterface $translator) {}
@@ -29,19 +26,19 @@ class RoleScopeScopePresence extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$value instanceof RoleScope) {
-            throw new RuntimeException('The validated object is not an instance of roleScope');
+            throw new \RuntimeException('The validated object is not an instance of roleScope');
         }
 
         if (!$constraint instanceof RoleScopeScopePresenceConstraint) {
-            throw new RuntimeException('This validator should be used with RoleScopScopePresenceConstraint');
+            throw new \RuntimeException('This validator should be used with RoleScopScopePresenceConstraint');
         }
 
         $this->logger->debug('begin validation of a role scope instance');
 
-        //if the role scope should have a scope
+        // if the role scope should have a scope
         if (
-            !in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true)
-            && $value->getScope() === null
+            !\in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true)
+            && null === $value->getScope()
         ) {
             $this->context->buildViolation($constraint->messagePresenceRequired)
                 ->setParameter('%role%', $this->translator->trans($value->getRole()))
@@ -49,7 +46,7 @@ class RoleScopeScopePresence extends ConstraintValidator
             $this->logger->debug('the role scope should have a scope, but scope is null. Violation build.');
         } elseif // if the scope should be null
         (
-            in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true)
+            \in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true)
             && null !== $value->getScope()
         ) {
             $this->context->buildViolation($constraint->messageNullRequired)
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php b/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
index 203f21703..a5a16cee0 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use UnexpectedValueException;
 
 class UserUniqueEmailAndUsername extends ConstraintValidator
 {
@@ -32,16 +31,15 @@ class UserUniqueEmailAndUsername extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (!$value instanceof User) {
-            throw new UnexpectedValueException('This validation should happens '
-                . 'only on class ' . User::class);
+            throw new \UnexpectedValueException('This validation should happens only on class '.User::class);
         }
 
-        if ($value->getId() !== null) {
+        if (null !== $value->getId()) {
             $countUsersByUsername = $this->em->createQuery(
                 sprintf(
                     'SELECT COUNT(u) FROM %s u '
-                    . 'WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) '
-                    . 'AND u != :user',
+                    .'WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) '
+                    .'AND u != :user',
                     User::class
                 )
             )
@@ -52,7 +50,7 @@ class UserUniqueEmailAndUsername extends ConstraintValidator
             $countUsersByUsername = $this->em->createQuery(
                 sprintf(
                     'SELECT COUNT(u) FROM %s u '
-                    . 'WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) ',
+                    .'WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) ',
                     User::class
                 )
             )
@@ -70,12 +68,12 @@ class UserUniqueEmailAndUsername extends ConstraintValidator
                 ->addViolation();
         }
 
-        if ($value->getId() !== null) {
+        if (null !== $value->getId()) {
             $countUsersByEmail = $this->em->createQuery(
                 sprintf(
                     'SELECT COUNT(u) FROM %s u '
-                    . 'WHERE u.emailCanonical = LOWER(UNACCENT(:email)) '
-                    . 'AND u != :user',
+                    .'WHERE u.emailCanonical = LOWER(UNACCENT(:email)) '
+                    .'AND u != :user',
                     User::class
                 )
             )
@@ -86,7 +84,7 @@ class UserUniqueEmailAndUsername extends ConstraintValidator
             $countUsersByEmail = $this->em->createQuery(
                 sprintf(
                     'SELECT COUNT(u) FROM %s u '
-                    . 'WHERE u.emailCanonical = LOWER(UNACCENT(:email))',
+                    .'WHERE u.emailCanonical = LOWER(UNACCENT(:email))',
                     User::class
                 )
             )
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php b/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
index 9604358ed..0c02885ad 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Validation\Validator;
 
 use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
-use LogicException;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
@@ -22,7 +21,7 @@ final class ValidPhonenumber extends ConstraintValidator
     public function __construct(private readonly LoggerInterface $logger, private readonly PhoneNumberHelperInterface $phonenumberHelper) {}
 
     /**
-     * @param string $value
+     * @param string                                                        $value
      * @param \Chill\MainBundle\Validation\Constraint\PhonenumberConstraint $constraint
      */
     public function validate($value, Constraint $constraint)
@@ -57,8 +56,7 @@ final class ValidPhonenumber extends ConstraintValidator
                 break;
 
             default:
-                throw new LogicException(sprintf("This type '%s' is not implemented. "
-                    . "Possible values are 'mobile', 'landline' or 'any'", $constraint->type));
+                throw new \LogicException(sprintf("This type '%s' is not implemented. Possible values are 'mobile', 'landline' or 'any'", $constraint->type));
         }
 
         if (false === $isValid) {
diff --git a/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php b/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
index 6955132d7..a18af30d4 100644
--- a/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
+++ b/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
@@ -15,8 +15,6 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
-use function call_user_func;
-
 class UserCircleConsistencyValidator extends ConstraintValidator
 {
     /**
@@ -30,13 +28,13 @@ class UserCircleConsistencyValidator extends ConstraintValidator
     }
 
     /**
-     * @param object $value
+     * @param object                $value
      * @param UserCircleConsistency $constraint
      */
     public function validate($value, Constraint $constraint)
     {
         /** @var \Chill\MainBundle\Entity\User $user */
-        $user = call_user_func([$value, $constraint->getUserFunction]);
+        $user = \call_user_func([$value, $constraint->getUserFunction]);
 
         if (null === $user) {
             return;
diff --git a/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php b/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php
index a23613112..a1b631265 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php
@@ -48,7 +48,7 @@ final readonly class WorkflowByUserCounter implements NotificationCounterInterfa
 
     public static function generateCacheKeyWorkflowByUser(User $user): string
     {
-        return 'chill_main_workflow_by_u_' . $user->getId();
+        return 'chill_main_workflow_by_u_'.$user->getId();
     }
 
     public function getCountUnreadByUser(User $user): int
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
index 71612434a..b1fa80458 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
@@ -14,14 +14,12 @@ namespace Chill\MainBundle\Workflow\EventSubscriber;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Templating\Entity\UserRender;
-use DateTimeImmutable;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Workflow\Event\Event;
 use Symfony\Component\Workflow\Event\GuardEvent;
 use Symfony\Component\Workflow\TransitionBlocker;
-use function array_key_exists;
 
 class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterface
 {
@@ -112,7 +110,7 @@ class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterfac
         $placeMetadata = $event->getWorkflow()->getMetadataStore()
             ->getPlaceMetadata($step->getCurrentStep());
 
-        if (array_key_exists('isFinal', $placeMetadata) && true === $placeMetadata['isFinal']) {
+        if (\array_key_exists('isFinal', $placeMetadata) && true === $placeMetadata['isFinal']) {
             $step->setIsFinal(true);
         }
     }
@@ -129,7 +127,7 @@ class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterfac
 
         $step
             ->setTransitionAfter($event->getTransition()->getName())
-            ->setTransitionAt(new DateTimeImmutable('now'))
+            ->setTransitionAt(new \DateTimeImmutable('now'))
             ->setTransitionBy($this->security->getUser());
 
         $this->chillLogger->info('[workflow] apply transition on entityWorkflow', [
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
index 41a42693c..e290a567e 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
@@ -18,10 +18,8 @@ use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Component\Workflow\Event\Event;
 use Symfony\Component\Workflow\Registry;
-use function in_array;
 
 class NotificationOnTransition implements EventSubscriberInterface
 {
@@ -87,7 +85,7 @@ class NotificationOnTransition implements EventSubscriberInterface
                 'dest' => $subscriber,
                 'place' => $place,
                 'workflow' => $workflow,
-                'is_dest' => in_array($subscriber->getId(), array_map(static fn (User $u) => $u->getId(), $entityWorkflow->futureDestUsers), true),
+                'is_dest' => \in_array($subscriber->getId(), array_map(static fn (User $u) => $u->getId(), $entityWorkflow->futureDestUsers), true),
             ];
 
             $notification = new Notification();
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/SendAccessKeyEventSubscriber.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/SendAccessKeyEventSubscriber.php
index db31d796c..90a6e19db 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/SendAccessKeyEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/SendAccessKeyEventSubscriber.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Workflow\EntityWorkflowManager;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Mime\Email;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Component\Workflow\Registry;
 
 class SendAccessKeyEventSubscriber
diff --git a/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php b/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php
index d6b5c0c8f..9d91b3357 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php
@@ -11,6 +11,4 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Workflow\Exception;
 
-use RuntimeException;
-
-class HandlerNotFoundException extends RuntimeException {}
+class HandlerNotFoundException extends \RuntimeException {}
diff --git a/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php b/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
index b1a572358..dabe0cf8e 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\WorkflowInterface;
-use function array_key_exists;
 
 class MetadataExtractor
 {
@@ -35,7 +34,7 @@ class MetadataExtractor
 
         foreach ($workflows as $workflow) {
             $metadata = $workflow->getMetadataStore()->getWorkflowMetadata();
-            $text = array_key_exists('label', $metadata) ?
+            $text = \array_key_exists('label', $metadata) ?
                 $this->translatableStringHelper->localize($metadata['label']) : $workflow->getName();
 
             $workflowsList[] = ['name' => $workflow->getName(), 'text' => $text];
@@ -44,14 +43,14 @@ class MetadataExtractor
         return $workflowsList;
     }
 
-    public function buildArrayPresentationForPlace(EntityWorkflow $entityWorkflow, ?EntityWorkflowStep $step = null): array
+    public function buildArrayPresentationForPlace(EntityWorkflow $entityWorkflow, EntityWorkflowStep $step = null): array
     {
         $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
         $step ??= $entityWorkflow->getCurrentStep();
 
         $markingMetadata = $workflow->getMetadataStore()->getPlaceMetadata($step->getCurrentStep());
 
-        $text = array_key_exists('label', $markingMetadata) ?
+        $text = \array_key_exists('label', $markingMetadata) ?
             $this->translatableStringHelper->localize($markingMetadata['label']) : $step->getCurrentStep();
 
         return ['name' => $step->getCurrentStep(), 'text' => $text];
@@ -68,7 +67,7 @@ class MetadataExtractor
 
                 return [
                     'name' => $transition->getName(),
-                    'text' => array_key_exists('label', $metadata) ?
+                    'text' => \array_key_exists('label', $metadata) ?
                         $this->translatableStringHelper->localize($metadata['label']) : $transition->getName(),
                     'isForward' => $metadata['isForward'] ?? null,
                 ];
@@ -81,7 +80,7 @@ class MetadataExtractor
     public function buildArrayPresentationForWorkflow(WorkflowInterface $workflow): array
     {
         $metadata = $workflow->getMetadataStore()->getWorkflowMetadata();
-        $text = array_key_exists('label', $metadata) ?
+        $text = \array_key_exists('label', $metadata) ?
             $this->translatableStringHelper->localize($metadata['label']) : $workflow->getName();
 
         return ['name' => $workflow->getName(), 'text' => $text];
diff --git a/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php b/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php
index 78a7d91da..c9ba7cf79 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php
@@ -30,6 +30,7 @@ class WorkflowNotificationHandler implements NotificationHandlerInterface
     public function getTemplateData(Notification $notification, array $options = []): array
     {
         $entityWorkflow = $this->entityWorkflowRepository->find($notification->getRelatedEntityId());
+
         return [
             'entity_workflow' => $entityWorkflow,
             'handler' => $this->entityWorkflowManager->getHandler($entityWorkflow),
@@ -41,7 +42,7 @@ class WorkflowNotificationHandler implements NotificationHandlerInterface
     {
         $notificationCc = false;
 
-        if ($notification->getRelatedEntityClass() === EntityWorkflow::class) {
+        if (EntityWorkflow::class === $notification->getRelatedEntityClass()) {
             $relatedEntity = $this->entityWorkflowRepository->findOneBy(['id' => $notification->getRelatedEntityId()]);
 
             if ($relatedEntity->getCurrentStepCreatedBy() !== $this->security->getUser()) {
@@ -54,6 +55,6 @@ class WorkflowNotificationHandler implements NotificationHandlerInterface
 
     public function supports(Notification $notification, array $options = []): bool
     {
-        return $notification->getRelatedEntityClass() === EntityWorkflow::class;
+        return EntityWorkflow::class === $notification->getRelatedEntityClass();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php b/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php
index 700f06a4d..966b3317a 100644
--- a/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php
+++ b/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php
@@ -23,8 +23,7 @@ class RelatedEntityWorkflowSupportsStrategy implements WorkflowSupportStrategyIn
             return false;
         }
 
-        foreach ($workflow->getMetadataStore()->getWorkflowMetadata()['related_entity']
-                 as $relatedEntityClass) {
+        foreach ($workflow->getMetadataStore()->getWorkflowMetadata()['related_entity'] as $relatedEntityClass) {
             if ($subject->getRelatedEntityClass() === $relatedEntityClass) {
                 return true;
             }
diff --git a/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php b/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
index 1c4f84a26..2020c7b52 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
@@ -18,7 +18,6 @@ use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 use Symfony\Component\Workflow\WorkflowInterface;
-use function count;
 
 class EntityWorkflowCreationValidator extends \Symfony\Component\Validator\ConstraintValidator
 {
@@ -55,7 +54,7 @@ class EntityWorkflowCreationValidator extends \Symfony\Component\Validator\Const
 
         $matched = array_filter($workflows, static fn (WorkflowInterface $workflow) => $workflow->getName() === $value->getWorkflowName());
 
-        if (0 === count($matched)) {
+        if (0 === \count($matched)) {
             $this->context->buildViolation($constraint->messageWorkflowNotAvailable)
                 ->addViolation();
         }
diff --git a/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php b/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
index 1e0b6868c..37543aa6e 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
@@ -16,7 +16,6 @@ use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
-use function count;
 
 class StepDestValidValidator extends ConstraintValidator
 {
@@ -35,12 +34,12 @@ class StepDestValidValidator extends ConstraintValidator
             throw new UnexpectedValueException($value, EntityWorkflowStep::class);
         }
 
-        if ($value->isFinal() && 0 < count($value->getDestUser())) {
+        if ($value->isFinal() && 0 < \count($value->getDestUser())) {
             $this->context->buildViolation($constraint->messageDestNotAllowed)
                 ->addViolation();
         }
 
-        if (!$value->isFinal() && 0 === count($value->getDestUser())) {
+        if (!$value->isFinal() && 0 === \count($value->getDestUser())) {
             $this->context->buildViolation($constraint->messageRequireDest)
                 ->addViolation();
         }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php b/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
index a94f8bc6f..e7672a7e1 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
@@ -13,11 +13,6 @@ namespace Chill\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
-use Doctrine\ORM\Query\ResultSetMapping;
-use RuntimeException;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-use function count;
 
 /**
  * Migrate association from
@@ -29,7 +24,7 @@ class Version20150821105642 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE group_centers DROP CONSTRAINT FK_A14D8F3D447BBB3B');
         $this->addSql('DROP INDEX IDX_A14D8F3D447BBB3B');
@@ -38,7 +33,7 @@ class Version20150821105642 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE group_centers ADD permissionsGroup_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE group_centers ADD CONSTRAINT FK_A14D8F3D447BBB3B FOREIGN KEY (permissionsGroup_id) REFERENCES permission_groups (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php b/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php
index 3593a4a52..dade8044a 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php
@@ -21,10 +21,10 @@ class Version20160310122322 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_main_address '
-              . 'DROP CONSTRAINT FK_165051F6EECBFDF1');
+              .'DROP CONSTRAINT FK_165051F6EECBFDF1');
         $this->addSql('DROP SEQUENCE chill_main_address_id_seq CASCADE');
         $this->addSql('DROP SEQUENCE chill_main_postal_code_id_seq CASCADE');
         $this->addSql('DROP TABLE chill_main_address');
@@ -33,36 +33,36 @@ class Version20160310122322 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE chill_main_address_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE chill_main_postal_code_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_main_address ('
-              . 'id INT NOT NULL, '
-              . 'postcode_id INT DEFAULT NULL, '
-              . 'streetAddress1 VARCHAR(255) NOT NULL, '
-              . 'streetAddress2 VARCHAR(255) NOT NULL, '
-              . 'validFrom DATE NOT NULL, '
-              . 'PRIMARY KEY(id))');
+              .'id INT NOT NULL, '
+              .'postcode_id INT DEFAULT NULL, '
+              .'streetAddress1 VARCHAR(255) NOT NULL, '
+              .'streetAddress2 VARCHAR(255) NOT NULL, '
+              .'validFrom DATE NOT NULL, '
+              .'PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_165051F6EECBFDF1 ON chill_main_address '
-              . '(postcode_id)');
+              .'(postcode_id)');
         $this->addSql('CREATE TABLE chill_main_postal_code ('
-              . 'id INT NOT NULL, '
-              . 'country_id INT DEFAULT NULL, '
-              . 'label VARCHAR(255) NOT NULL, '
-              . 'code VARCHAR(100) NOT NULL, '
-              . 'PRIMARY KEY(id))');
+              .'id INT NOT NULL, '
+              .'country_id INT DEFAULT NULL, '
+              .'label VARCHAR(255) NOT NULL, '
+              .'code VARCHAR(100) NOT NULL, '
+              .'PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_6CA145FAF92F3E70 ON chill_main_postal_code '
-              . '(country_id)');
+              .'(country_id)');
         $this->addSql('ALTER TABLE chill_main_address ADD CONSTRAINT '
-              . 'FK_165051F6EECBFDF1 '
-              . 'FOREIGN KEY (postcode_id) '
-              . 'REFERENCES chill_main_postal_code (id) '
-              . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'FK_165051F6EECBFDF1 '
+              .'FOREIGN KEY (postcode_id) '
+              .'REFERENCES chill_main_postal_code (id) '
+              .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_main_postal_code ADD CONSTRAINT '
-              . 'FK_6CA145FAF92F3E70 '
-              . 'FOREIGN KEY (country_id) '
-              . 'REFERENCES Country (id) '
-              . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'FK_6CA145FAF92F3E70 '
+              .'FOREIGN KEY (country_id) '
+              .'REFERENCES Country (id) '
+              .'NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php b/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php
index b73ee5362..e9cdb4a31 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php
@@ -13,7 +13,6 @@ namespace Chill\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
-use Exception;
 
 /**
  * Add index to postal code.
@@ -22,19 +21,19 @@ final class Version20180703191509 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP INDEX search_name_code');
     }
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         try {
             $this->addSql('CREATE EXTENSION IF NOT EXISTS pg_trgm');
             $this->addSql('CREATE INDEX search_name_code ON chill_main_postal_code USING GIN (LOWER(code) gin_trgm_ops, LOWER(label) gin_trgm_ops)');
-        } catch (Exception) {
+        } catch (\Exception) {
             $this->skipIf(true, 'Could not create extension pg_trgm');
         }
     }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php b/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php
index 1c410970b..a608b07bb 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php
@@ -22,7 +22,7 @@ final class Version20180709181423 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP INDEX UNIQ_1483A5E9F5A5DC32');
         $this->addSql('DROP INDEX UNIQ_1483A5E9885281E');
@@ -37,7 +37,7 @@ final class Version20180709181423 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE users ADD usernameCanonical VARCHAR(80) DEFAULT NULL');
         $this->addSql('UPDATE users SET usernameCanonical=LOWER(UNACCENT(username))');
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php b/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php
index 293ea7585..43ea86749 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php
@@ -21,7 +21,7 @@ final class Version20210308111926 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_main_address DROP customs');
     }
@@ -33,7 +33,7 @@ final class Version20210308111926 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_main_address ADD customs JSONB DEFAULT \'[]\'');
     }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php b/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php
index d2f3bd206..c3c400c3c 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php
@@ -21,7 +21,7 @@ final class Version20210414091001 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP EXTENSION IF NOT EXISTS postgis;');
     }
@@ -33,7 +33,7 @@ final class Version20210414091001 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE EXTENSION IF NOT EXISTS postgis;');
     }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php b/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php
index fc9957ee7..040aadf38 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php
@@ -14,7 +14,6 @@ namespace Chill\Migrations\Main;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 use libphonenumber\PhoneNumberUtil;
-use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
@@ -43,7 +42,7 @@ final class Version20220302132728 extends AbstractMigration implements Container
             ->getParameter('chill_main')['phone_helper']['default_carrier_code'];
 
         if (null === $carrier_code) {
-            throw new RuntimeException('no carrier code');
+            throw new \RuntimeException('no carrier code');
         }
 
         $this->addSql('ALTER TABLE chill_main_location ALTER phonenumber1 TYPE VARCHAR(35)');
@@ -56,9 +55,9 @@ final class Version20220302132728 extends AbstractMigration implements Container
         $this->addSql('COMMENT ON COLUMN chill_main_location.phonenumber2 IS \'(DC2Type:phone_number)\'');
 
         $this->addSql(
-            'UPDATE chill_main_location SET ' .
-            $this->buildMigrationPhonenumberClause($carrier_code, 'phonenumber1') .
-            ', ' .
+            'UPDATE chill_main_location SET '.
+            $this->buildMigrationPhonenumberClause($carrier_code, 'phonenumber1').
+            ', '.
             $this->buildMigrationPhoneNumberClause($carrier_code, 'phonenumber2')
         );
     }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220729205416.php b/src/Bundle/ChillMainBundle/migrations/Version20220729205416.php
index af76225d3..4fed9eb25 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220729205416.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220729205416.php
@@ -47,7 +47,7 @@ final class Version20220729205416 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_6CA145FA65FF1AEC ON chill_main_postal_code (updatedBy_id)');
         $this->addSql('CREATE INDEX IDX_6CA145FA3174800F ON chill_main_postal_code (createdBy_id)');
         $this->addSql('CREATE UNIQUE INDEX postal_code_import_unicity ON chill_main_postal_code (code, refpostalcodeid, postalcodesource) WHERE refpostalcodeid is not null');
-        //$this->addSql('ALTER TABLE chill_main_postal_code ADD CONSTRAINT chill_internal_postal_code_import_unicity '.
+        // $this->addSql('ALTER TABLE chill_main_postal_code ADD CONSTRAINT chill_internal_postal_code_import_unicity '.
         //    'EXCLUDE (code WITH =, refpostalcodeid WITH =, postalcodesource WITH =) WHERE (refpostalcodeid IS NOT NULL)');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20230906134410.php b/src/Bundle/ChillMainBundle/migrations/Version20230906134410.php
index ac18c9c29..6a4888801 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20230906134410.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20230906134410.php
@@ -15,7 +15,7 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add property to center
+ * Add property to center.
  */
 final class Version20230906134410 extends AbstractMigration
 {
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php b/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php
index 3e79412bb..fa7b0458a 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php
@@ -41,7 +41,6 @@ final class Version20230913114115 extends AbstractMigration
         $this->addSql('ALTER TABLE users ADD mainscope_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE users ADD CONSTRAINT fk_1483a5e9115e73f3 FOREIGN KEY (mainscope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX idx_1483a5e9115e73f3 ON users (mainscope_id)');
-
     }
 
     public function getDescription(): string
@@ -54,12 +53,12 @@ final class Version20230913114115 extends AbstractMigration
         // create scope_history
         $this->addSql('CREATE SEQUENCE chill_main_user_scope_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_main_user_scope_history ('
-            . 'id INT NOT NULL,'
-            . 'scope_id INT DEFAULT NULL,'
-            . 'user_id INT DEFAULT NULL,'
-            . 'endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,'
-            . 'startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,'
-            . 'PRIMARY KEY(id))');
+            .'id INT NOT NULL,'
+            .'scope_id INT DEFAULT NULL,'
+            .'user_id INT DEFAULT NULL,'
+            .'endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,'
+            .'startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,'
+            .'PRIMARY KEY(id))');
 
         $this->addSql('CREATE INDEX IDX_48B969D7682B5931 ON chill_main_user_scope_history (scope_id)');
         $this->addSql('CREATE INDEX IDX_48B969D7A76ED395 ON chill_main_user_scope_history (user_id)');
@@ -68,39 +67,38 @@ final class Version20230913114115 extends AbstractMigration
         $this->addSql('COMMENT ON COLUMN chill_main_user_scope_history.startDate IS \'(DC2Type:datetime_immutable)\'');
 
         $this->addSql('ALTER TABLE chill_main_user_scope_history ADD CONSTRAINT FK_48B969D7682B5931 '
-            . 'FOREIGN KEY (scope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+            .'FOREIGN KEY (scope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
 
         $this->addSql('ALTER TABLE chill_main_user_scope_history ADD CONSTRAINT FK_48B969D7A76ED395 '
-            . 'FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+            .'FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
 
         $this->addSql('ALTER TABLE chill_main_user_scope_history '
-            . 'ADD CONSTRAINT user_scope_history_not_overlaps '
-            . 'EXCLUDE USING GIST (user_id with =, tsrange(startDate, endDate) with &&) '
-            . 'DEFERRABLE INITIALLY DEFERRED');
+            .'ADD CONSTRAINT user_scope_history_not_overlaps '
+            .'EXCLUDE USING GIST (user_id with =, tsrange(startDate, endDate) with &&) '
+            .'DEFERRABLE INITIALLY DEFERRED');
 
         $this->addSql('ALTER TABLE chill_main_user_scope_history '
-            . 'ADD CONSTRAINT user_scope_history_endate_null_or_after_startdate '
-            . 'CHECK (startDate <= endDate OR endDate IS NULL)');
+            .'ADD CONSTRAINT user_scope_history_endate_null_or_after_startdate '
+            .'CHECK (startDate <= endDate OR endDate IS NULL)');
 
         // insert user scope_history datas
         $this->addSql('INSERT INTO chill_main_user_scope_history (id, startDate, endDate, user_id, scope_id) '
-            . 'SELECT nextval(\'chill_main_user_scope_history_id_seq\'), \'1970-01-01\'::date, NULL, users.id, mainscope_id '
-            . 'FROM users');
+            .'SELECT nextval(\'chill_main_user_scope_history_id_seq\'), \'1970-01-01\'::date, NULL, users.id, mainscope_id '
+            .'FROM users');
 
         // remove mainscope
         $this->addSql('ALTER TABLE users DROP CONSTRAINT fk_1483a5e9115e73f3');
         $this->addSql('ALTER TABLE users DROP mainscope_id');
 
-
         // create job_history
         $this->addSql('CREATE SEQUENCE chill_main_user_job_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_main_user_job_history ('
-            . 'id INT NOT NULL,'
-            . 'job_id INT DEFAULT NULL,'
-            . 'user_id INT DEFAULT NULL,'
-            . 'endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,'
-            . 'startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,'
-            . 'PRIMARY KEY(id))');
+            .'id INT NOT NULL,'
+            .'job_id INT DEFAULT NULL,'
+            .'user_id INT DEFAULT NULL,'
+            .'endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,'
+            .'startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,'
+            .'PRIMARY KEY(id))');
 
         $this->addSql('CREATE INDEX IDX_4E3BF4DDBE04EA9 ON chill_main_user_job_history (job_id)');
         $this->addSql('CREATE INDEX IDX_4E3BF4DDA76ED395 ON chill_main_user_job_history (user_id)');
@@ -109,28 +107,27 @@ final class Version20230913114115 extends AbstractMigration
         $this->addSql('COMMENT ON COLUMN chill_main_user_job_history.startDate IS \'(DC2Type:datetime_immutable)\'');
 
         $this->addSql('ALTER TABLE chill_main_user_job_history ADD CONSTRAINT FK_4E3BF4DDBE04EA9 '
-            . 'FOREIGN KEY (job_id) REFERENCES chill_main_user_job (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+            .'FOREIGN KEY (job_id) REFERENCES chill_main_user_job (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
 
         $this->addSql('ALTER TABLE chill_main_user_job_history ADD CONSTRAINT FK_4E3BF4DDA76ED395 '
-            . 'FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+            .'FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
 
         $this->addSql('ALTER TABLE chill_main_user_job_history '
-            . 'ADD CONSTRAINT user_job_history_not_overlaps '
-            . 'EXCLUDE USING GIST (user_id with =, tsrange(startDate, endDate) with &&) '
-            . 'DEFERRABLE INITIALLY DEFERRED');
+            .'ADD CONSTRAINT user_job_history_not_overlaps '
+            .'EXCLUDE USING GIST (user_id with =, tsrange(startDate, endDate) with &&) '
+            .'DEFERRABLE INITIALLY DEFERRED');
 
         $this->addSql('ALTER TABLE chill_main_user_job_history '
-            . 'ADD CONSTRAINT user_job_history_endate_null_or_after_startdate '
-            . 'CHECK (startDate <= endDate OR endDate IS NULL)');
+            .'ADD CONSTRAINT user_job_history_endate_null_or_after_startdate '
+            .'CHECK (startDate <= endDate OR endDate IS NULL)');
 
         // insert user job_history datas
         $this->addSql('INSERT INTO chill_main_user_job_history (id, startDate, endDate, user_id, job_id) '
-            . 'SELECT nextval(\'chill_main_user_job_history_id_seq\'), \'1970-01-01\'::date, NULL, users.id, userjob_id '
-            . 'FROM users');
+            .'SELECT nextval(\'chill_main_user_job_history_id_seq\'), \'1970-01-01\'::date, NULL, users.id, userjob_id '
+            .'FROM users');
 
         // remove userjob
         $this->addSql('ALTER TABLE users DROP CONSTRAINT fk_1483a5e964b65c5b');
         $this->addSql('ALTER TABLE users DROP userjob_id');
-
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php
index b82c44eb4..64d2b8f12 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php
@@ -16,10 +16,8 @@ use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Notification\NotificationPersisterInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
-use DateTimeImmutable;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class PersonAddressMoveEventSubscriber implements EventSubscriberInterface
@@ -41,7 +39,7 @@ class PersonAddressMoveEventSubscriber implements EventSubscriberInterface
             $person = $event->getPerson();
 
             foreach ($person->getCurrentAccompanyingPeriods() as $period) {
-                if ($period->getStep() === AccompanyingPeriod::STEP_DRAFT) {
+                if (AccompanyingPeriod::STEP_DRAFT === $period->getStep()) {
                     continue;
                 }
 
@@ -49,7 +47,7 @@ class PersonAddressMoveEventSubscriber implements EventSubscriberInterface
                     $period->getPersonLocation() === $person
                         && (
                             $event->getMoveDate() >= $period->getLastLocationHistory()->getStartDate()
-                            || $event->willChangeBeActiveAt(new DateTimeImmutable('now'))
+                            || $event->willChangeBeActiveAt(new \DateTimeImmutable('now'))
                         )
                     && null !== $period->getUser()
                     && $period->getUser() !== $this->security->getUser()
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
index 73e96e449..084fe8ff5 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
@@ -18,7 +18,6 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\Persistence\Event\LifecycleEventArgs;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Component\Workflow\Event\EnteredEvent;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -39,7 +38,7 @@ class UserRefEventSubscriber implements EventSubscriberInterface
     {
         if (
             $enteredEvent->getMarking()->has(AccompanyingPeriod::STEP_CONFIRMED)
-            and $enteredEvent->getTransition()->getName() === 'confirm'
+            and 'confirm' === $enteredEvent->getTransition()->getName()
         ) {
             $this->onPeriodConfirmed($enteredEvent->getSubject());
         }
@@ -50,7 +49,7 @@ class UserRefEventSubscriber implements EventSubscriberInterface
         if ($period->isChangedUser()
             && $period->getUser() !== $this->security->getUser()
             && null !== $period->getUser()
-            && $period->getStep() !== AccompanyingPeriod::STEP_DRAFT
+            && AccompanyingPeriod::STEP_DRAFT !== $period->getStep()
             && !$period->isPreventUserIsChangedNotification()
         ) {
             $this->generateNotificationToUser($period);
@@ -62,12 +61,12 @@ class UserRefEventSubscriber implements EventSubscriberInterface
         $notification = new Notification();
 
         $urgentStatement =
-            $period->isEmergency() ? strtoupper($this->translator->trans('accompanying_period.emergency')) . ' ' : '';
+            $period->isEmergency() ? strtoupper($this->translator->trans('accompanying_period.emergency')).' ' : '';
 
         $notification
             ->setRelatedEntityId($period->getId())
             ->setRelatedEntityClass(AccompanyingPeriod::class)
-            ->setTitle($urgentStatement . $this->translator->trans('period_notification.period_designated_subject'))
+            ->setTitle($urgentStatement.$this->translator->trans('period_notification.period_designated_subject'))
             ->setMessage($this->engine->render(
                 '@ChillPerson/Notification/accompanying_course_designation.md.twig',
                 [
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeMessageHandler.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeMessageHandler.php
index 90f48f1f1..534672efc 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeMessageHandler.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeMessageHandler.php
@@ -28,7 +28,7 @@ class AccompanyingPeriodStepChangeMessageHandler implements MessageHandlerInterf
     public function __invoke(AccompanyingPeriodStepChangeRequestMessage $message): void
     {
         if (null === $period = $this->accompanyingPeriodRepository->find($message->getPeriodId())) {
-            throw new \RuntimeException(self::LOG_PREFIX . 'Could not find period with this id: '. $message->getPeriodId());
+            throw new \RuntimeException(self::LOG_PREFIX.'Could not find period with this id: '.$message->getPeriodId());
         }
 
         ($this->changer)($period, $message->getTransition());
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestMessage.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestMessage.php
index 10d517957..1d6a33614 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestMessage.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestMessage.php
@@ -14,7 +14,7 @@ namespace Chill\PersonBundle\AccompanyingPeriod\Lifecycle;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 /**
- * Message which will request a change in the step of accompanying period
+ * Message which will request a change in the step of accompanying period.
  */
 class AccompanyingPeriodStepChangeRequestMessage
 {
@@ -31,7 +31,7 @@ class AccompanyingPeriodStepChangeRequestMessage
                 $this->periodId = $id;
             }
 
-            throw new \LogicException("This AccompanyingPeriod does not have and id yet");
+            throw new \LogicException('This AccompanyingPeriod does not have and id yet');
         }
     }
 
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestor.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestor.php
index 01a6ebe3f..8cfb7b174 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestor.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestor.php
@@ -13,13 +13,12 @@ namespace Chill\PersonBundle\AccompanyingPeriod\Lifecycle;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodInfoRepositoryInterface;
-use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 /**
- * Gather all the accompanying period which needs a change in step
+ * Gather all the accompanying period which needs a change in step.
  */
 class AccompanyingPeriodStepChangeRequestor
 {
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChanger.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChanger.php
index c7f8017f6..25a739ce0 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChanger.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChanger.php
@@ -17,7 +17,7 @@ use Psr\Log\LoggerInterface;
 use Symfony\Component\Workflow\Registry;
 
 /**
- * Change the step of an accompanying period
+ * Change the step of an accompanying period.
  *
  * This should be invoked through scripts (not in the in context of an http request, or an
  * action from a user).
@@ -32,14 +32,14 @@ class AccompanyingPeriodStepChanger
         private readonly Registry $workflowRegistry,
     ) {}
 
-    public function __invoke(AccompanyingPeriod $period, string $transition, ?string $workflowName = null): void
+    public function __invoke(AccompanyingPeriod $period, string $transition, string $workflowName = null): void
     {
         $workflow = $this->workflowRegistry->get($period, $workflowName);
 
         if (!$workflow->can($period, $transition)) {
-            $this->logger->info(self::LOG_PREFIX . 'not able to apply the transition on period', [
+            $this->logger->info(self::LOG_PREFIX.'not able to apply the transition on period', [
                 'period_id' => $period->getId(),
-                'transition' => $transition
+                'transition' => $transition,
             ]);
 
             return;
@@ -49,9 +49,9 @@ class AccompanyingPeriodStepChanger
 
         $this->entityManager->flush();
 
-        $this->logger->info(self::LOG_PREFIX . 'could apply a transition', [
+        $this->logger->info(self::LOG_PREFIX.'could apply a transition', [
             'period_id' => $period->getId(),
-            'transition' => $transition
+            'transition' => $transition,
         ]);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php
index 37f309929..6e6ea5ef8 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PrePersistEventArgs;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 
diff --git a/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php b/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
index 5fc97e4e0..ac3363db0 100644
--- a/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
+++ b/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
@@ -33,10 +33,10 @@ class ActionEvent extends \Symfony\Contracts\EventDispatcher\Event
     protected $preSql = [];
 
     /**
-     * @param string $entity
+     * @param string  $entity
      * @param mixed[] $metadata
-     * @param int $personId
-     * @param string $sqlStatement
+     * @param int     $personId
+     * @param string  $sqlStatement
      */
     public function __construct(
         protected $personId,
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveAccompanyingPeriodParticipationHandler.php b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveAccompanyingPeriodParticipationHandler.php
index 1b4c07469..2c342a9a5 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveAccompanyingPeriodParticipationHandler.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveAccompanyingPeriodParticipationHandler.php
@@ -19,7 +19,7 @@ class PersonMoveAccompanyingPeriodParticipationHandler implements PersonMoveSqlH
 {
     public function supports(string $className, string $field): bool
     {
-        return $className === AccompanyingPeriodParticipation::class;
+        return AccompanyingPeriodParticipation::class === $className;
     }
 
     public function getSqls(string $className, string $field, Person $from, Person $to): array
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveCenterHistoryHandler.php b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveCenterHistoryHandler.php
index 358a5ea9a..f08bd7dff 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveCenterHistoryHandler.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveCenterHistoryHandler.php
@@ -23,7 +23,7 @@ class PersonMoveCenterHistoryHandler implements PersonMoveSqlHandlerInterface
 
     public function supports(string $className, string $field): bool
     {
-        return $className === Person\PersonCenterHistory::class;
+        return Person\PersonCenterHistory::class === $className;
     }
 
     public function getSqls(string $className, string $field, Person $from, Person $to): array
@@ -37,7 +37,7 @@ class PersonMoveCenterHistoryHandler implements PersonMoveSqlHandlerInterface
 
         $centerHistoriesA = $this->centerHistoryRepository->findBy(['person' => $from]);
         foreach ($centerHistoriesA as $ch) {
-            if ($oldestDateA === null || ($ch->getStartDate() < $oldestDateA)) {
+            if (null === $oldestDateA || ($ch->getStartDate() < $oldestDateA)) {
                 $oldestDateA = $ch->getStartDate();
                 $oldestCenterHistoryA = $ch;
             }
@@ -45,7 +45,7 @@ class PersonMoveCenterHistoryHandler implements PersonMoveSqlHandlerInterface
 
         $centerHistoriesB = $this->centerHistoryRepository->findBy(['person' => $to]);
         foreach ($centerHistoriesB as $ch) {
-            if ($oldestDateB === null || ($ch->getStartDate() < $oldestDateB)) {
+            if (null === $oldestDateB || ($ch->getStartDate() < $oldestDateB)) {
                 $oldestDateB = $ch->getStartDate();
                 $oldestCenterHistoryB = $ch;
             }
@@ -58,7 +58,6 @@ class PersonMoveCenterHistoryHandler implements PersonMoveSqlHandlerInterface
         $sqlStatements = [$sqlDelete];
 
         if ((null !== $oldestDateA && null !== $oldestDateB) && $oldestDateA <= $oldestDateB) {
-
             $sqlInsert = sprintf(<<<'SQL'
                 UPDATE chill_person_person_center_history SET startDate = '%s' WHERE id = %d;
                 SQL, $oldestDateA->format('Y-m-d'), $oldestCenterHistoryB->getId());
@@ -67,7 +66,5 @@ class PersonMoveCenterHistoryHandler implements PersonMoveSqlHandlerInterface
         }
 
         return $sqlStatements;
-
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveHouseholdHandler.php b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveHouseholdHandler.php
index d617e12ed..2fc5ca440 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveHouseholdHandler.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveHouseholdHandler.php
@@ -19,7 +19,7 @@ class PersonMoveHouseholdHandler implements PersonMoveSqlHandlerInterface
 {
     public function supports(string $className, string $field): bool
     {
-        return $className === HouseholdMember::class;
+        return HouseholdMember::class === $className;
     }
 
     public function getSqls(string $className, string $field, Person $from, Person $to): array
@@ -43,5 +43,4 @@ class PersonMoveHouseholdHandler implements PersonMoveSqlHandlerInterface
 
         return [$sqlInsert, $deleteSql];
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveRelationHandler.php b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveRelationHandler.php
index 2c2f68ca9..9d8f4b5e1 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveRelationHandler.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveRelationHandler.php
@@ -19,7 +19,7 @@ class PersonMoveRelationHandler implements PersonMoveSqlHandlerInterface
 {
     public function supports(string $className, string $field): bool
     {
-        return $className === Relationship::class;
+        return Relationship::class === $className;
     }
 
     public function getSqls(string $className, string $field, Person $from, Person $to): array
@@ -38,8 +38,8 @@ class PersonMoveRelationHandler implements PersonMoveSqlHandlerInterface
         SQL, $from->getId(), $from->getId(), $to->getId(), $from->getId(), $from->getId(), $to->getId());
 
         $deleteSql = [
-            sprintf("DELETE FROM chill_person_relationships WHERE fromperson_id = %d", $from->getId()),
-            sprintf("DELETE FROM chill_person_relationships WHERE toperson_id = %d", $from->getId())
+            sprintf('DELETE FROM chill_person_relationships WHERE fromperson_id = %d', $from->getId()),
+            sprintf('DELETE FROM chill_person_relationships WHERE toperson_id = %d', $from->getId()),
         ];
 
         return [$insertSql, ...$deleteSql];
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
index fa0c71263..292c805a0 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
@@ -13,8 +13,6 @@ namespace Chill\PersonBundle\Actions\Remove;
 
 use Chill\PersonBundle\Actions\ActionEvent;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Relationships\Relationship;
@@ -22,10 +20,6 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
-use function array_merge;
-use function implode;
-use function in_array;
-
 /**
  * Move or delete entities associated to a person to a new one, and delete the
  * old person. The data associated to a person (birthdate, name, ...) are left
@@ -36,7 +30,7 @@ use function in_array;
 class PersonMove
 {
     public function __construct(
-        private readonly EntityManagerInterface   $em,
+        private readonly EntityManagerInterface $em,
         private readonly PersonMoveManager $personMoveManager,
         private readonly EventDispatcherInterface $eventDispatcher
     ) {}
@@ -68,7 +62,7 @@ class PersonMove
     public function getSQL(Person $from, Person $to, array $deleteEntities = [])
     {
         $sqls = [];
-        $toDelete = array_merge($deleteEntities, $this->getDeleteEntities());
+        $toDelete = \array_merge($deleteEntities, $this->getDeleteEntities());
 
         foreach ($this->em->getMetadataFactory()->getAllMetadata() as $metadata) {
             if ($metadata->isMappedSuperclass) {
@@ -76,18 +70,17 @@ class PersonMove
             }
 
             foreach ($metadata->getAssociationMappings() as $field => $mapping) {
-
                 if ($this->personMoveManager->hasHandler($metadata->getName(), $field)) {
-                    $sqls = array_merge($sqls, $this->personMoveManager->getSqls($metadata->getName(), $field, $from, $to));
+                    $sqls = \array_merge($sqls, $this->personMoveManager->getSqls($metadata->getName(), $field, $from, $to));
                     continue;
                 }
 
-                if (in_array($mapping['sourceEntity'], $this->getIgnoredEntities(), true)) {
+                if (\in_array($mapping['sourceEntity'], $this->getIgnoredEntities(), true)) {
                     continue;
                 }
 
                 if (Person::class === $mapping['targetEntity'] and true === $mapping['isOwningSide']) {
-                    if (in_array($mapping['sourceEntity'], $toDelete, true)) {
+                    if (\in_array($mapping['sourceEntity'], $toDelete, true)) {
                         $sql = $this->createDeleteSQL($metadata, $from, $field);
                         $event = new ActionEvent(
                             $from->getId(),
@@ -96,9 +89,9 @@ class PersonMove
                             ['to' => $to->getId(), 'original_action' => 'move']
                         );
                         $this->eventDispatcher->dispatch($event, ActionEvent::DELETE);
-                        $sqls = array_merge($sqls, $event->getPreSql(), [$event->getSqlStatement()], $event->getPostSql());
+                        $sqls = \array_merge($sqls, $event->getPreSql(), [$event->getSqlStatement()], $event->getPostSql());
                     } else {
-                        $sqls = array_merge($sqls, $this->createMoveSQLs($metadata, $from, $to, $field));
+                        $sqls = \array_merge($sqls, $this->createMoveSQLs($metadata, $from, $to, $field));
                     }
                 }
             }
@@ -133,7 +126,7 @@ class PersonMove
         return sprintf(
             'DELETE FROM %s WHERE %s;',
             $this->getTableName($metadata),
-            implode(' AND ', $conditions)
+            \implode(' AND ', $conditions)
         );
     }
 
@@ -148,11 +141,11 @@ class PersonMove
 
         if (array_key_exists('joinTable', $mapping)) {
             // there is a join_table: we have to find conflict
-            $tableName = (null !== ($mapping['joinTable']['schema'] ?? null) ? $mapping['joinTable']['schema'] . '.' : '')
-                . $mapping['joinTable']['name'];
+            $tableName = (null !== ($mapping['joinTable']['schema'] ?? null) ? $mapping['joinTable']['schema'].'.' : '')
+                .$mapping['joinTable']['name'];
 
             $sqlInsert = sprintf(
-                "INSERT INTO %s (%s, %s) SELECT %d, %s FROM %s WHERE %s = %d ON CONFLICT DO NOTHING;",
+                'INSERT INTO %s (%s, %s) SELECT %d, %s FROM %s WHERE %s = %d ON CONFLICT DO NOTHING;',
                 $tableName,
                 $mapping['joinTable']['inverseJoinColumns'][0]['name'], // person_id
                 $mapping['joinTable']['joinColumns'][0]['name'], // something_else_id
@@ -164,7 +157,7 @@ class PersonMove
             );
 
             $deleteSql = sprintf(
-                "DELETE FROM %s WHERE %s = %d;",
+                'DELETE FROM %s WHERE %s = %d;',
                 $tableName,
                 $mapping['joinTable']['inverseJoinColumns'][0]['name'], // person_id
                 $from->getId()
@@ -179,9 +172,8 @@ class PersonMove
             }
 
             return [
-                $sqlInsert, $deleteSql
+                $sqlInsert, $deleteSql,
             ];
-
         }
         if (array_key_exists('joinColumns', $mapping)) {
             $tableName = $this->getTableName($metadata);
@@ -197,8 +189,8 @@ class PersonMove
         return [sprintf(
             'UPDATE %s SET %s WHERE %s;',
             $tableName,
-            implode(' ', $sets),
-            implode(' AND ', $conditions)
+            \implode(' ', $sets),
+            \implode(' AND ', $conditions)
         )];
     }
 
@@ -210,7 +202,7 @@ class PersonMove
     {
         return [
             AccompanyingPeriod\AccompanyingPeriodWork::class,
-            Relationship::class
+            Relationship::class,
         ];
     }
 
@@ -230,6 +222,6 @@ class PersonMove
     {
         return empty($metadata->getSchemaName()) ?
                 $metadata->getTableName() :
-                $metadata->getSchemaName() . '.' . $metadata->getTableName();
+                $metadata->getSchemaName().'.'.$metadata->getTableName();
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveManager.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveManager.php
index 8680880bd..0c9230d90 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveManager.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveManager.php
@@ -17,14 +17,13 @@ class PersonMoveManager
 {
     public function __construct(
         /**
-         *  @var  iterable<PersonMoveSqlHandlerInterface>
+         * @var iterable<PersonMoveSqlHandlerInterface>
          */
         private readonly iterable $handlers,
     ) {}
 
     /**
      * @param class-string $className
-     * @return bool
      */
     public function hasHandler(string $className, string $field): bool
     {
@@ -39,6 +38,7 @@ class PersonMoveManager
 
     /**
      * @param class-string $className
+     *
      * @return array<string>
      */
     public function getSqls(string $className, string $field, Person $from, Person $to): array
@@ -48,7 +48,7 @@ class PersonMoveManager
                 return $handler->getSqls($className, $field, $from, $to);
             }
         }
+
         return [];
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveSqlHandlerInterface.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveSqlHandlerInterface.php
index c1b47127d..f30ca4914 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveSqlHandlerInterface.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveSqlHandlerInterface.php
@@ -22,6 +22,7 @@ interface PersonMoveSqlHandlerInterface
 
     /**
      * @param class-string $className
+     *
      * @return array<string>
      */
     public function getSqls(string $className, string $field, Person $from, Person $to): array;
diff --git a/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php b/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
index 1ed8f3a58..12df5a0f9 100644
--- a/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
+++ b/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
@@ -14,11 +14,8 @@ namespace Chill\PersonBundle\CRUD\Controller;
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\QueryBuilder;
-use Exception;
 use Symfony\Component\HttpFoundation\Request;
-
 use Symfony\Component\HttpFoundation\Response;
-use function array_merge;
 
 /**
  * Class EntityPersonCRUDController
@@ -68,25 +65,21 @@ class EntityPersonCRUDController extends CRUDController
     }
 
     /**
-     * @param mixed $entity
-     *
-     * @throws Exception
+     * @throws \Exception
      */
     protected function generateTemplateParameter(string $action, $entity, Request $request, array $defaultTemplateParameters = []): array
     {
         $person = $this->getPerson($request);
 
         if (null === $person) {
-            throw new Exception('the `person_id` parameter is not set in the query. '
-                . 'You should set it or override the current method to allow another '
-                . 'behaviour: ' . __METHOD__);
+            throw new \Exception('the `person_id` parameter is not set in the query. You should set it or override the current method to allow another behaviour: '.__METHOD__);
         }
 
         return parent::generateTemplateParameter(
             $action,
             $entity,
             $request,
-            array_merge(['person' => $person], $defaultTemplateParameters)
+            \array_merge(['person' => $person], $defaultTemplateParameters)
         );
     }
 
@@ -122,7 +115,6 @@ class EntityPersonCRUDController extends CRUDController
 
     /**
      * @param string $action
-     * @param mixed $entity
      *
      * @return string
      */
@@ -142,25 +134,22 @@ class EntityPersonCRUDController extends CRUDController
         };
     }
 
-    /**
-     * @param mixed $entity
-     */
     protected function onBeforeRedirectAfterSubmission(string $action, $entity, \Symfony\Component\Form\FormInterface $form, Request $request): ?Response
     {
         $next = $request->request->get('submit', 'save-and-close');
 
         return match ($next) {
-            'save-and-close' => $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_index', [
+            'save-and-close' => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_index', [
                 'person_id' => $this->getPerson($request)->getId(),
             ]),
-            'save-and-new' => $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_new', [
+            'save-and-new' => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_new', [
                 'person_id' => $this->getPerson($request)->getId(),
             ]),
-            'new' => $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_view', [
+            'new' => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', [
                 'id' => $entity->getId(),
                 'person_id' => $this->getPerson($request)->getId(),
             ]),
-            default => $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_view', [
+            default => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', [
                 'id' => $entity->getId(),
                 'person_id' => $this->getPerson($request)->getId(),
             ]),
diff --git a/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php b/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
index 7260b6e7a..a163e9bbd 100644
--- a/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
+++ b/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
@@ -11,10 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\CRUD\Controller;
 
-use BadMethodCallException;
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\PersonBundle\Entity\Person;
-use LogicException;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -24,7 +22,7 @@ class OneToOneEntityPersonCRUDController extends CRUDController
 {
     protected function generateRedirectOnCreateRoute($action, Request $request, $entity): string
     {
-        throw new BadMethodCallException('Not implemented yet.');
+        throw new \BadMethodCallException('Not implemented yet.');
     }
 
     protected function getEntity($action, $id, Request $request): ?object
@@ -54,9 +52,7 @@ class OneToOneEntityPersonCRUDController extends CRUDController
             'new' => '@ChillPerson/CRUD/new.html.twig',
             'edit' => '@ChillPerson/CRUD/edit.html.twig',
             'index' => '@ChillPerson/CRUD/index.html.twig',
-            default => throw new LogicException("the view for action {$action} is not "
-                . 'defined. You should override ' . __METHOD__ . ' to add this '
-                . 'action'),
+            default => throw new \LogicException("the view for action {$action} is not ".'defined. You should override '.__METHOD__.' to add this action'),
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php b/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
index d587a55e5..fd86aefbf 100644
--- a/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
+++ b/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
@@ -21,8 +21,6 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-use function ctype_digit;
-
 final class ChillPersonMoveCommand extends Command
 {
     public function __construct(
@@ -41,11 +39,11 @@ final class ChillPersonMoveCommand extends Command
         ];
 
         foreach ($deleteEntities as $key => $de) {
-            $ctxt['delete_entity_' . $key] = $de;
+            $ctxt['delete_entity_'.$key] = $de;
         }
 
         foreach ($sqls as $key => $sql) {
-            $ctxt['sql_' . $key] = $sql;
+            $ctxt['sql_'.$key] = $sql;
         }
 
         return $ctxt;
@@ -100,6 +98,7 @@ final class ChillPersonMoveCommand extends Command
 
             $this->chillLogger->notice('Move a person from command line succeeded', $ctxt);
         }
+
         return 0;
     }
 
@@ -117,9 +116,8 @@ final class ChillPersonMoveCommand extends Command
             }
             $id = $input->getOption($name);
 
-            if (ctype_digit((string) $id) === false) {
-                throw new RuntimeException("The id in \"{$name}\" field does not contains "
-                    . "only digits: {$id}");
+            if (false === \ctype_digit((string) $id)) {
+                throw new RuntimeException("The id in \"{$name}\" field does not contains only digits: {$id}");
             }
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
index 7345c1471..6c85548dd 100644
--- a/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
+++ b/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
@@ -11,17 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Command;
 
-use Chill\PersonBundle\Service\Import\ChillImporter;
 use Chill\PersonBundle\Service\Import\SocialWorkMetadataInterface;
 use Doctrine\ORM\EntityManagerInterface;
-use Exception;
 use League\Csv\Reader;
-use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Throwable;
 
 final class ImportSocialWorkMetadata extends Command
 {
@@ -36,10 +32,10 @@ final class ImportSocialWorkMetadata extends Command
     protected function configure()
     {
         $description = 'Imports a structured table containing social issues, social actions, objectives, results and evaluations.';
-        $help = 'File to csv format, no headers, semi-colon as delimiter, datas sorted by alphabetical order, column after column.'. PHP_EOL
-            . 'Columns are: social issues parent, social issues child, social actions parent, social actions child, goals, results, evaluations.'. PHP_EOL
-            . PHP_EOL
-            . 'See social_work_metadata.csv as example.'. PHP_EOL;
+        $help = 'File to csv format, no headers, semi-colon as delimiter, datas sorted by alphabetical order, column after column.'.PHP_EOL
+            .'Columns are: social issues parent, social issues child, social actions parent, social actions child, goals, results, evaluations.'.PHP_EOL
+            .PHP_EOL
+            .'See social_work_metadata.csv as example.'.PHP_EOL;
 
         $this
             ->setName('chill:person:import-socialwork')
@@ -55,8 +51,8 @@ final class ImportSocialWorkMetadata extends Command
 
         try {
             $csv = Reader::createFromPath($filepath);
-        } catch (Throwable $e) {
-            throw new Exception('Error while loading CSV.', 0, $e);
+        } catch (\Throwable $e) {
+            throw new \Exception('Error while loading CSV.', 0, $e);
         }
 
         $csv->setDelimiter(';');
diff --git a/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php b/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php
index b903b84b3..f826c4d17 100644
--- a/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php
+++ b/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php
@@ -12,8 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Command;
 
 use Chill\PersonBundle\Service\AccompanyingPeriod\OldDraftAccompanyingPeriodRemoverInterface;
-use DateInterval;
-use Exception;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -36,21 +34,21 @@ class RemoveOldDraftAccompanyingPeriodCommand extends Command
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $this->logger->info('[' . $this->getName() . '] started', [
+        $this->logger->info('['.$this->getName().'] started', [
             'interval' => $input->getArgument('interval'),
         ]);
 
         try {
-            $interval = new DateInterval($input->getArgument('interval'));
-        } catch (Exception $e) {
-            $this->logger->error('[' . $this->getName() . '] bad interval');
+            $interval = new \DateInterval($input->getArgument('interval'));
+        } catch (\Exception $e) {
+            $this->logger->error('['.$this->getName().'] bad interval');
 
             throw $e;
         }
 
         $this->remover->remove($interval);
 
-        $this->logger->info('[' . $this->getName() . '] end of command');
+        $this->logger->info('['.$this->getName().'] end of command');
 
         return 0;
     }
diff --git a/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php b/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
index 982ee3475..3f233c174 100644
--- a/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
+++ b/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
@@ -40,11 +40,11 @@ class ConfigPersonAltNamesHelper
             $cur = reset($labels);
 
             while ($cur) {
-                if (key($labels) === 'lang') {
+                if ('lang' === key($labels)) {
                     $lang = current($labels);
                 }
 
-                if (key($labels) === 'label') {
+                if ('label' === key($labels)) {
                     $label = current($labels);
                 }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
index 032ac2a77..7819ebb46 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
@@ -29,8 +29,6 @@ use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateInterval;
-use DateTimeImmutable;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -43,11 +41,8 @@ use Symfony\Component\Serializer\Exception\RuntimeException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
-
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Workflow\Registry;
-use function array_values;
-use function count;
 
 final class AccompanyingCourseApiController extends ApiController
 {
@@ -70,7 +65,7 @@ final class AccompanyingCourseApiController extends ApiController
             // throw new BadRequestException('It is not possible to confirm this period');
             $errors = $this->validator->validate($accompanyingPeriod, null, [$accompanyingPeriod::STEP_CONFIRMED]);
 
-            if (count($errors) > 0) {
+            if (\count($errors) > 0) {
                 return $this->json($errors, 422);
             }
         }
@@ -96,7 +91,7 @@ final class AccompanyingCourseApiController extends ApiController
             throw new AccessDeniedException();
         }
 
-        $since = (new DateTimeImmutable('now'))->sub(new DateInterval('P15D'));
+        $since = (new \DateTimeImmutable('now'))->sub(new \DateInterval('P15D'));
 
         $total = $this->accompanyingPeriodRepository->countByRecentUserHistory($user, $since);
 
@@ -146,7 +141,7 @@ final class AccompanyingCourseApiController extends ApiController
             fn (AccompanyingPeriod $period) => $this->isGranted(AccompanyingPeriodVoter::SEE, $period)
         );
 
-        return $this->json(array_values($accompanyingPeriodsChecked), Response::HTTP_OK, [], ['groups' => ['read']]);
+        return $this->json(\array_values($accompanyingPeriodsChecked), Response::HTTP_OK, [], ['groups' => ['read']]);
     }
 
     public function participationApi($id, Request $request, $_format)
@@ -284,11 +279,12 @@ final class AccompanyingCourseApiController extends ApiController
 
     /**
      * @Route("/api/1.0/person/accompanying-course/{id}/confidential.json", name="chill_api_person_accompanying_period_confidential")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "id"})
      */
     public function toggleConfidentialApi(AccompanyingPeriod $accompanyingCourse, mixed $id, Request $request)
     {
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::TOGGLE_CONFIDENTIAL, $accompanyingCourse);
 
             $accompanyingCourse->setConfidential(!$accompanyingCourse->isConfidential());
@@ -301,14 +297,15 @@ final class AccompanyingCourseApiController extends ApiController
 
     /**
      * @Route("/api/1.0/person/accompanying-course/{id}/intensity.json", name="chill_api_person_accompanying_period_intensity")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "id"})
      */
     public function toggleIntensityApi(AccompanyingPeriod $accompanyingCourse, Request $request)
     {
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::TOGGLE_INTENSITY, $accompanyingCourse);
 
-            $status = $accompanyingCourse->getIntensity() === 'regular' ? 'occasional' : 'regular';
+            $status = 'regular' === $accompanyingCourse->getIntensity() ? 'occasional' : 'regular';
             $accompanyingCourse->setIntensity($status);
             $this->getDoctrine()->getManager()->flush();
         }
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php
index 14b9e4664..895011085 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php
@@ -16,7 +16,6 @@ use Chill\PersonBundle\Form\AccompanyingCourseCommentType;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodCommentVoter;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
-use LogicException;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -26,7 +25,6 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -38,6 +36,7 @@ class AccompanyingCourseCommentController extends AbstractController
      * Page of comments in Accompanying Course section.
      *
      * @Route("/{_locale}/parcours/{accompanying_period_id}/comments", name="chill_person_accompanying_period_comment_list")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
      */
     public function commentAction(AccompanyingPeriod $accompanyingCourse, Request $request): Response
@@ -66,13 +65,13 @@ class AccompanyingCourseCommentController extends AbstractController
             }
 
             if (!isset($editForm)) {
-                throw new NotFoundHttpException('comment with id ' . $request->query->getInt('edit') . ' is not found');
+                throw new NotFoundHttpException('comment with id '.$request->query->getInt('edit').' is not found');
             }
 
             if (isset($commentEdited)) {
                 $this->denyAccessUnlessGranted(AccompanyingPeriodCommentVoter::EDIT, $commentEdited);
             } else {
-                throw new LogicException('at this step, commentEdited should be set');
+                throw new \LogicException('at this step, commentEdited should be set');
             }
 
             $editForm->handleRequest($request);
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
index eb0271380..8c60a6acb 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@@ -19,7 +19,6 @@ use Chill\PersonBundle\Form\AccompanyingCourseType;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -33,9 +32,6 @@ use Symfony\Component\Workflow\Registry;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_slice;
-use function is_array;
-
 /**
  * Class AccompanyingCourseController.
  */
@@ -45,6 +41,7 @@ class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle\Contr
 
     /**
      * @Route("/{_locale}/parcours/{accompanying_period_id}/close", name="chill_person_accompanying_course_close")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
      */
     public function closeAction(AccompanyingPeriod $accompanyingCourse, Request $request): Response
@@ -76,7 +73,7 @@ class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle\Contr
             $this->addFlash('error', $this->translator->trans('It is not possible to close this course'));
 
             foreach ($errors as $e) {
-                /** @var ConstraintViolationInterface $e */
+                /* @var ConstraintViolationInterface $e */
                 $this->addFlash('error', $e->getMessage());
             }
         }
@@ -91,6 +88,7 @@ class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle\Contr
      * Delete page of Accompanying Course section.
      *
      * @Route("/{_locale}/parcours/{accompanying_period_id}/delete", name="chill_person_accompanying_course_delete")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
      */
     public function deleteAction(Request $request, AccompanyingPeriod $accompanyingCourse)
@@ -108,7 +106,7 @@ class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle\Contr
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -147,6 +145,7 @@ class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle\Contr
      * the page edit all blocks managed by vuejs component
      *
      * @Route("/{_locale}/parcours/{accompanying_period_id}/edit", name="chill_person_accompanying_course_edit")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
      */
     public function editAction(AccompanyingPeriod $accompanyingCourse): Response
@@ -164,6 +163,7 @@ class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle\Contr
      * the page show anti chronologic history with all actions, title of page is 'Accompanying Course History'
      *
      * @Route("/{_locale}/parcours/{accompanying_period_id}/history", name="chill_person_accompanying_course_history")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
      */
     public function historyAction(AccompanyingPeriod $accompanyingCourse): Response
@@ -179,6 +179,7 @@ class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle\Contr
      * Homepage of Accompanying Course section.
      *
      * @Route("/{_locale}/parcours/{accompanying_period_id}", name="chill_person_accompanying_course_index")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
      */
     public function indexAction(AccompanyingPeriod $accompanyingCourse): Response
@@ -200,7 +201,7 @@ class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle\Contr
             ['date' => 'DESC', 'id' => 'DESC'],
         );
 
-        $activities = array_slice($activities, 0, 3);
+        $activities = \array_slice($activities, 0, 3);
 
         $works = $this->workRepository->findByAccompanyingPeriod(
             $accompanyingCourse,
@@ -228,7 +229,7 @@ class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle\Contr
         if ($request->query->has('person_id')) {
             $personIds = $request->query->get('person_id');
 
-            if (false === is_array($personIds)) {
+            if (false === \is_array($personIds)) {
                 throw new BadRequestHttpException('person_id parameter should be an array');
             }
 
@@ -290,6 +291,7 @@ class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle\Contr
 
     /**
      * @Route("/{_locale}/parcours/{accompanying_period_id}/open", name="chill_person_accompanying_course_reopen")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
      */
     public function reOpenAction(AccompanyingPeriod $accompanyingCourse, Request $request): Response
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
index 61d3cfb02..2a9e4e9da 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
@@ -15,8 +15,6 @@ use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\MainBundle\Serializer\Model\Counter;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
-use DateInterval;
-use DateTimeImmutable;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
@@ -30,10 +28,10 @@ class AccompanyingCourseWorkApiController extends ApiController
      */
     public function myWorksNearEndDate(Request $request): JsonResponse
     {
-        $since = (new DateTimeImmutable('now'))
-            ->sub(new DateInterval('P' . $request->query->getInt('since', 15) . 'D'));
-        $until = (new DateTimeImmutable('now'))
-            ->add(new DateInterval('P' . $request->query->getInt('since', 15) . 'D'));
+        $since = (new \DateTimeImmutable('now'))
+            ->sub(new \DateInterval('P'.$request->query->getInt('since', 15).'D'));
+        $until = (new \DateTimeImmutable('now'))
+            ->add(new \DateInterval('P'.$request->query->getInt('since', 15).'D'));
         $total = $this->accompanyingPeriodWorkRepository
             ->countNearEndDateByUser($this->getUser(), $since, $until);
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
index eb41341f6..89ec1ae17 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Controller;
 
-use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
@@ -25,7 +24,6 @@ use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -56,11 +54,11 @@ final class AccompanyingCourseWorkController extends AbstractController
     {
         $this->denyAccessUnlessGranted(AccompanyingPeriodWorkVoter::CREATE, $period);
 
-        if ($period->getSocialIssues()->count() === 0) {
+        if (0 === $period->getSocialIssues()->count()) {
             $this->addFlash(
                 'error',
                 $this->trans->trans(
-                    'accompanying_work.You must add at least ' .
+                    'accompanying_work.You must add at least '.
                     'one social issue on accompanying period'
                 )
             );
@@ -93,7 +91,7 @@ final class AccompanyingCourseWorkController extends AbstractController
 
         $form = $this->createDeleteForm($work->getId());
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -161,7 +159,7 @@ final class AccompanyingCourseWorkController extends AbstractController
             'types' => $filter->hasEntityChoice('typesFilter') ? $filter->getEntityChoiceData('typesFilter') : [],
             'before' => $filter->getDateRangeData('dateFilter')['to'],
             'after' => $filter->getDateRangeData('dateFilter')['from'],
-            'user' => $filter->getUserPickerData('userFilter')
+            'user' => $filter->getUserPickerData('userFilter'),
         ];
 
         $totalItems = $this->workRepository->countByAccompanyingPeriod($period);
@@ -178,7 +176,7 @@ final class AccompanyingCourseWorkController extends AbstractController
             'accompanyingCourse' => $period,
             'works' => $works,
             'paginator' => $paginator,
-            'filter' => $filter
+            'filter' => $filter,
         ]);
     }
 
@@ -226,7 +224,7 @@ final class AccompanyingCourseWorkController extends AbstractController
         if (1 < count($types)) {
             $filterBuilder
                 ->addEntityChoice('typesFilter', 'accompanying_course_work.types_filter', \Chill\PersonBundle\Entity\SocialWork\SocialAction::class, $types, [
-                    'choice_label' => fn (SocialAction $sa) => $this->translatableStringHelper->localize($sa->getTitle())
+                    'choice_label' => fn (SocialAction $sa) => $this->translatableStringHelper->localize($sa->getTitle()),
                 ]);
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkEvaluationDocumentController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkEvaluationDocumentController.php
index c36ece6f2..21378b9d7 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkEvaluationDocumentController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkEvaluationDocumentController.php
@@ -37,7 +37,7 @@ class AccompanyingCourseWorkEvaluationDocumentController extends AbstractControl
             $this->security->isGranted(AccompanyingPeriodWorkVoter::UPDATE, $work) ?
                 'chill_person_accompanying_period_work_edit' : 'chill_person_accompanying_period_work_show',
             [
-                'id' => $work->getId()
+                'id' => $work->getId(),
             ]
         );
     }
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
index c557fe978..c2e236aa9 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
@@ -18,7 +18,6 @@ use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use DateTime;
 use Doctrine\DBAL\Exception;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -27,9 +26,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-
 use function array_filter;
-use function count;
 
 /**
  * Class AccompanyingPeriodController.
@@ -57,6 +54,7 @@ class AccompanyingPeriodController extends AbstractController
 
     /**
      * @throws \Exception
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/accompanying-period/close", name="chill_person_accompanying_period_close")
      */
     public function closeAction(int $person_id, Request $request): Response
@@ -65,7 +63,7 @@ class AccompanyingPeriodController extends AbstractController
 
         $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $person, 'You are not allowed to update this person');
 
-        if ($person->isOpen() === false) {
+        if (false === $person->isOpen()) {
             $this->get('session')->getFlashBag()
                 ->add('error', $this->get('translator')
                     ->trans(
@@ -85,14 +83,14 @@ class AccompanyingPeriodController extends AbstractController
             'center' => $person->getCenter(),
         ]);
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
                 $person->close($current);
                 $errors = $this->_validatePerson($person);
 
-                if (count($errors) === 0) {
+                if (0 === \count($errors)) {
                     $this->get('session')->getFlashBag()
                         ->add('success', $this->get('translator')
                             ->trans('An accompanying period has been closed.', [
@@ -113,7 +111,7 @@ class AccompanyingPeriodController extends AbstractController
                     $this->get('session')->getFlashBag()
                         ->add('info', $error->getMessage());
                 }
-            } else { //if form is not valid
+            } else { // if form is not valid
                 $this->get('session')->getFlashBag()
                     ->add(
                         'error',
@@ -148,11 +146,11 @@ class AccompanyingPeriodController extends AbstractController
             'You are not allowed to update this person'
         );
 
-        $accompanyingPeriod = new AccompanyingPeriod(new DateTime('now'));
-        $accompanyingPeriod->setClosingDate(new DateTime('now'));
+        $accompanyingPeriod = new AccompanyingPeriod(new \DateTime('now'));
+        $accompanyingPeriod->setClosingDate(new \DateTime('now'));
 
         $accompanyingPeriod->addPerson($person);
-        //or $person->addAccompanyingPeriod($accompanyingPeriod);
+        // or $person->addAccompanyingPeriod($accompanyingPeriod);
 
         $form = $this->createForm(
             AccompanyingPeriodType::class,
@@ -163,14 +161,14 @@ class AccompanyingPeriodController extends AbstractController
             ]
         );
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
             $errors = $this->_validatePerson($person);
             $flashBag = $this->get('session')->getFlashBag();
 
             if (
                 $form->isValid(['Default', 'closed'])
-                && count($errors) === 0
+                && 0 === \count($errors)
             ) {
                 $em = $this->getDoctrine()->getManager();
                 $em->persist($accompanyingPeriod);
@@ -203,6 +201,7 @@ class AccompanyingPeriodController extends AbstractController
 
     /**
      * @ParamConverter("person", options={"id": "person_id"})
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/accompanying-period", name="chill_person_accompanying_period_list")
      */
     public function listAction(Person $person): Response
@@ -216,12 +215,12 @@ class AccompanyingPeriodController extends AbstractController
         $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
         $accompanyingPeriods = $this->accompanyingPeriodACLAwareRepository
-            ->findByPerson($person, AccompanyingPeriodVoter::SEE, ["openingDate" => "DESC", "id" => "DESC"]);
+            ->findByPerson($person, AccompanyingPeriodVoter::SEE, ['openingDate' => 'DESC', 'id' => 'DESC']);
 
-        //usort($accompanyingPeriodsRaw, static fn ($a, $b) => $b->getOpeningDate() <=> $a->getOpeningDate());
+        // usort($accompanyingPeriodsRaw, static fn ($a, $b) => $b->getOpeningDate() <=> $a->getOpeningDate());
 
         // filter visible or not visible
-        //$accompanyingPeriods = array_filter($accompanyingPeriodsRaw, fn (AccompanyingPeriod $ap) => $this->isGranted(AccompanyingPeriodVoter::SEE, $ap));
+        // $accompanyingPeriods = array_filter($accompanyingPeriodsRaw, fn (AccompanyingPeriod $ap) => $this->isGranted(AccompanyingPeriodVoter::SEE, $ap));
 
         return $this->render('@ChillPerson/AccompanyingPeriod/list.html.twig', [
             'accompanying_periods' => $accompanyingPeriods,
@@ -242,7 +241,7 @@ class AccompanyingPeriodController extends AbstractController
             'You are not allowed to update this person'
         );
 
-        //in case the person is already open
+        // in case the person is already open
         if ($person->isOpen()) {
             $this->get('session')->getFlashBag()
                 ->add('error', $this->get('translator')
@@ -256,7 +255,7 @@ class AccompanyingPeriodController extends AbstractController
             ]);
         }
 
-        $accompanyingPeriod = new AccompanyingPeriod(new DateTime());
+        $accompanyingPeriod = new AccompanyingPeriod(new \DateTime());
 
         $form = $this->createForm(
             AccompanyingPeriodType::class,
@@ -267,7 +266,7 @@ class AccompanyingPeriodController extends AbstractController
             ]
         );
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -275,7 +274,7 @@ class AccompanyingPeriodController extends AbstractController
 
                 $errors = $this->_validatePerson($person);
 
-                if (count($errors) <= 0) {
+                if (\count($errors) <= 0) {
                     $this->get('session')->getFlashBag()
                         ->add('success', $this->get('translator')
                             ->trans(
@@ -323,9 +322,9 @@ class AccompanyingPeriodController extends AbstractController
         $person = $this->_getPerson($person_id);
 
         /** @var AccompanyingPeriod $period */
-        $period = array_filter(
+        $period = \array_filter(
             $person->getAccompanyingPeriods(),
-            static fn (AccompanyingPeriod $p) => $p->getId() === ($period_id)
+            static fn (AccompanyingPeriod $p) => $p->getId() === $period_id
         )[0] ?? null;
 
         if (null === $period) {
@@ -364,6 +363,7 @@ class AccompanyingPeriodController extends AbstractController
 
     /**
      * @throws Exception
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/accompanying-period/{period_id}/update", name="chill_person_accompanying_period_update")
      */
     public function updateAction(int $person_id, int $period_id, Request $request): Response
@@ -374,7 +374,7 @@ class AccompanyingPeriodController extends AbstractController
         $accompanyingPeriod = $em->getRepository(AccompanyingPeriod::class)->find($period_id);
 
         if (null === $accompanyingPeriod) {
-            throw $this->createNotFoundException('Period with id ' . $period_id . ' is not found');
+            throw $this->createNotFoundException('Period with id '.$period_id.' is not found');
         }
 
         /** @var Person $person */
@@ -382,7 +382,7 @@ class AccompanyingPeriodController extends AbstractController
 
         // CHECK
         if (!$accompanyingPeriod->containsPerson($person)) {
-            throw new Exception('Accompanying period ' . $period_id . ' does not contain person ' . $person_id);
+            throw new Exception('Accompanying period '.$period_id.' does not contain person '.$person_id);
         }
 
         $this->denyAccessUnlessGranted(
@@ -400,14 +400,14 @@ class AccompanyingPeriodController extends AbstractController
             ]
         );
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
             $errors = $this->_validatePerson($person);
             $flashBag = $this->get('session')->getFlashBag();
 
             if (
                 $form->isValid(['Default', 'closed'])
-                    && count($errors) === 0
+                    && 0 === \count($errors)
             ) {
                 $em->flush();
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php
index 4fa855b37..f5516114f 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php
@@ -28,7 +28,6 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 
 class AccompanyingPeriodRegulationListController
 {
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
index 374751e88..60b8e9cff 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
@@ -27,9 +27,6 @@ use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
 
-use function count;
-use function in_array;
-
 class AccompanyingPeriodWorkEvaluationApiController
 {
     public function __construct(private readonly AccompanyingPeriodWorkEvaluationRepository $accompanyingPeriodWorkEvaluationRepository, private readonly DocGeneratorTemplateRepository $docGeneratorTemplateRepository, private readonly SerializerInterface $serializer, private readonly PaginatorFactory $paginatorFactory, private readonly Security $security) {}
@@ -51,12 +48,12 @@ class AccompanyingPeriodWorkEvaluationApiController
                 static function (DocGeneratorTemplate $t) use ($evaluation) {
                     $ids = $t->getOptions()['evaluations'] ?? [];
 
-                    return in_array($evaluation->getId(), $ids, true);
+                    return \in_array($evaluation->getId(), $ids, true);
                 }
             );
 
-        $paginator = $this->paginatorFactory->create(count($evaluations));
-        $paginator->setItemsPerPage(count($evaluations));
+        $paginator = $this->paginatorFactory->create(\count($evaluations));
+        $paginator->setItemsPerPage(\count($evaluations));
 
         return new JsonResponse($this->serializer->serialize(
             new Collection(array_values($evaluations), $paginator),
diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminController.php b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
index 7ada96b92..7f973d50a 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
@@ -53,6 +53,7 @@ class AdminController extends AbstractController
 
     /**
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/person_redirect_to_main", name="chill_person_admin_redirect_to_admin_index", options={null})
      */
     public function redirectToAdminIndexAction()
diff --git a/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php b/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
index 8a2e704ce..2943615f5 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
@@ -52,7 +52,7 @@ class ClosingMotiveController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var \Doctrine\ORM\QueryBuilder $query */
+        /* @var \Doctrine\ORM\QueryBuilder $query */
         return $query->orderBy('e.ordering', 'ASC');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
index d6b8af41f..a5b1081d5 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
@@ -22,16 +22,12 @@ use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
 use Chill\PersonBundle\Repository\Household\HouseholdACLAwareRepositoryInterface;
 use Chill\PersonBundle\Repository\Household\HouseholdRepository;
 use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
-use DateTimeImmutable;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
-use function array_filter;
-use function array_values;
 
 class HouseholdApiController extends ApiController
 {
@@ -79,9 +75,9 @@ class HouseholdApiController extends ApiController
         $household->addAddress($address);
 
         foreach ($household->getMembersOnRange(
-            DateTimeImmutable::createFromMutable($address->getValidFrom()),
+            \DateTimeImmutable::createFromMutable($address->getValidFrom()),
             null === $address->getValidTo() ? null :
-                DateTimeImmutable::createFromMutable($address->getValidTo())
+                \DateTimeImmutable::createFromMutable($address->getValidTo())
         ) as $member) {
             /** @var HouseholdMember $member */
             $event = new PersonAddressMoveEvent($member->getPerson());
@@ -114,6 +110,7 @@ class HouseholdApiController extends ApiController
      *         "_format": "json"
      *     }
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function suggestAddressByHousehold(Household $household, string $_format)
@@ -146,11 +143,11 @@ class HouseholdApiController extends ApiController
         $actual = $household->getCurrentAddress();
 
         if (null !== $actual) {
-            $addresses = array_filter($addresses, static fn ($a) => $a !== $actual);
+            $addresses = \array_filter($addresses, static fn ($a) => $a !== $actual);
         }
 
         return $this->json(
-            array_values($addresses),
+            \array_values($addresses),
             Response::HTTP_OK,
             [],
             ['groups' => ['read']]
@@ -186,7 +183,7 @@ class HouseholdApiController extends ApiController
             }
 
             if (null !== $currentHouseholdPerson) {
-                $count = $count - 1;
+                --$count;
                 $paginator = $this->getPaginatorFactory()->create($count);
             }
         }
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
index 3e0ab7add..00503ab3e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
@@ -18,7 +18,6 @@ use Chill\PersonBundle\Form\HouseholdCompositionType;
 use Chill\PersonBundle\Repository\Household\HouseholdCompositionRepository;
 use Chill\PersonBundle\Repository\Household\HouseholdRepository;
 use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -31,7 +30,6 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class HouseholdCompositionController extends AbstractController
@@ -71,7 +69,7 @@ class HouseholdCompositionController extends AbstractController
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -135,13 +133,13 @@ class HouseholdCompositionController extends AbstractController
             if ($isEdit) {
                 $householdCompositions = $household->getCompositions()->filter(static fn (HouseholdComposition $composition) => $composition->getId() === $request->query->getInt('edit'));
 
-                if ($householdCompositions->count() !== 1) {
+                if (1 !== $householdCompositions->count()) {
                     throw new BadRequestHttpException('could not find the composition with this id associated to the household');
                 }
                 $householdComposition = $householdCompositions->first();
             } else {
                 $householdComposition = (new HouseholdComposition())
-                    ->setStartDate(new DateTimeImmutable());
+                    ->setStartDate(new \DateTimeImmutable());
             }
             $form = $this->formFactory->create(HouseholdCompositionType::class, $householdComposition);
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php
index 4e07e4004..0d792d6ac 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php
@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Controller;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\Request;
-use UnexpectedValueException;
 
 class HouseholdCompositionTypeApiController extends ApiController
 {
@@ -25,7 +24,7 @@ class HouseholdCompositionTypeApiController extends ApiController
     {
         match ($action) {
             '_index' => $query->andWhere($query->expr()->eq('e.active', "'TRUE'")),
-            default => throw new UnexpectedValueException('unexepcted action: ' . $action),
+            default => throw new \UnexpectedValueException('unexepcted action: '.$action),
         };
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
index 463fa02f2..c85edaaf7 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
@@ -29,9 +29,6 @@ use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-use function count;
-
 /**
  * @Route("/{_locale}/person/household")
  */
@@ -45,6 +42,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_accompanying_period",
      *     methods={"GET", "HEAD"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function accompanyingPeriod(Request $request, Household $household)
@@ -77,7 +75,7 @@ class HouseholdController extends AbstractController
                 }
                 $id = $accompanyingPeriod->getId();
 
-                if (!array_key_exists($id, $accompanyingPeriodsOld) && !array_key_exists($id, $accompanyingPeriods)) {
+                if (!\array_key_exists($id, $accompanyingPeriodsOld) && !\array_key_exists($id, $accompanyingPeriods)) {
                     $accompanyingPeriodsOld[$id] = $accompanyingPeriod;
                 }
             }
@@ -99,6 +97,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_address_edit",
      *     methods={"GET", "HEAD", "POST"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function addressEdit(Request $request, Household $household)
@@ -125,17 +124,18 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_addresses",
      *     methods={"GET", "HEAD"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function addresses(Request $request, Household $household)
     {
         // TODO ACL
 
-        //TODO put these lines into a validator constraint on household->getAddress
+        // TODO put these lines into a validator constraint on household->getAddress
         $addresses = $household->getAddresses();
         $cond = true;
 
-        for ($i = 0; count($addresses) - 1 > $i; ++$i) {
+        for ($i = 0; \count($addresses) - 1 > $i; ++$i) {
             if ($addresses[$i]->getValidFrom() !== $addresses[$i + 1]->getValidTo()) {
                 $cond = false;
             }
@@ -155,6 +155,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_address_move",
      *     methods={"GET", "HEAD", "POST"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function addressMove(Request $request, Household $household)
@@ -175,6 +176,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_address_valid_from_edit",
      *     methods={"GET", "HEAD", "POST"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function addressValidFromEdit(Request $request, Household $household)
@@ -231,6 +233,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_members_metadata_edit",
      *     methods={"GET", "POST"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function editHouseholdMetadata(Request $request, Household $household)
@@ -262,6 +265,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_relationship",
      *     methods={"GET", "HEAD"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function showRelationship(Request $request, Household $household)
@@ -287,6 +291,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_summary",
      *     methods={"GET", "HEAD"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function summary(Request $request, Household $household)
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
index fa88d0722..7f895d478 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
@@ -28,8 +28,6 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Serializer\Exception;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function count;
-
 class HouseholdMemberController extends ApiController
 {
     public function __construct(private readonly UrlGeneratorInterface $generator, private readonly TranslatorInterface $translator, private readonly AccompanyingPeriodRepository $periodRepository) {}
@@ -90,9 +88,8 @@ class HouseholdMemberController extends ApiController
         if ($request->query->has('persons')) {
             $ids = $request->query->get('persons', []);
 
-            if (0 === count($ids)) {
-                throw new BadRequestHttpException('parameters persons in query ' .
-                    'is not an array or empty');
+            if (0 === \count($ids)) {
+                throw new BadRequestHttpException('parameters persons in query is not an array or empty');
             }
 
             $persons = $em->getRepository(Person::class)
@@ -181,7 +178,7 @@ class HouseholdMemberController extends ApiController
         //
         $errors = $editor->validate();
 
-        if (count($errors) > 0) {
+        if (\count($errors) > 0) {
             return $this->json($errors, 422);
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php b/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php
index accb7996d..88ebd05e9 100644
--- a/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
-use DateTime;
 use Symfony\Component\HttpFoundation\Request;
 
 class OpeningApiController extends ApiController
@@ -21,6 +20,6 @@ class OpeningApiController extends ApiController
     {
         $qb->where($qb->expr()->gt('e.noActiveAfter', ':now'))
             ->orWhere($qb->expr()->isNull('e.noActiveAfter'));
-        $qb->setParameter('now', new DateTime('now'));
+        $qb->setParameter('now', new \DateTime('now'));
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
index 111371310..975b44436 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
@@ -19,8 +19,6 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
-use function count;
-
 /**
  * Class PersonAddressController
  * Controller for addresses associated with person.
@@ -50,8 +48,7 @@ class PersonAddressController extends AbstractController
             ->find($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-                    . ' found ');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found ');
         }
 
         $this->denyAccessUnlessGranted(
@@ -70,7 +67,7 @@ class PersonAddressController extends AbstractController
         if ($form->isSubmitted() && $form->isValid()) {
             $validatePersonErrors = $this->validatePerson($person);
 
-            if (count($validatePersonErrors) !== 0) {
+            if (0 !== \count($validatePersonErrors)) {
                 foreach ($validatePersonErrors as $error) {
                     $this->addFlash('error', $error->getMessage());
                 }
@@ -108,8 +105,7 @@ class PersonAddressController extends AbstractController
             ->find($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-                    . ' found ');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found ');
         }
 
         $this->denyAccessUnlessGranted(
@@ -139,8 +135,7 @@ class PersonAddressController extends AbstractController
             ->find($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-                    . ' found ');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found ');
         }
 
         $this->denyAccessUnlessGranted(
@@ -164,8 +159,7 @@ class PersonAddressController extends AbstractController
             ->find($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-                    . ' found ');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found ');
         }
 
         $this->denyAccessUnlessGranted(
@@ -194,8 +188,7 @@ class PersonAddressController extends AbstractController
             ->find($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-                . ' found ');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found ');
         }
 
         $this->denyAccessUnlessGranted(
@@ -212,7 +205,7 @@ class PersonAddressController extends AbstractController
         if ($form->isSubmitted() && $form->isValid()) {
             $validatePersonErrors = $this->validatePerson($person);
 
-            if (count($validatePersonErrors) !== 0) {
+            if (0 !== \count($validatePersonErrors)) {
                 foreach ($validatePersonErrors as $error) {
                     $this->addFlash('error', $error->getMessage());
                 }
@@ -284,9 +277,9 @@ class PersonAddressController extends AbstractController
     /**
      * @param int $address_id
      *
-     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the address id does not exists or is not associated with given person
-     *
      * @return Address
+     *
+     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the address id does not exists or is not associated with given person
      */
     protected function findAddressById(Person $person, $address_id)
     {
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
index 94f08d9ba..01008f240 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Entity\Address;
-use Chill\MainBundle\Entity\Center;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Person;
@@ -24,7 +23,6 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use function in_array;
 
 class PersonApiController extends ApiController
 {
@@ -91,6 +89,7 @@ class PersonApiController extends ApiController
      *         "_format": "json"
      *     }
      * )
+     *
      * @ParamConverter("person", options={"id": "person_id"})
      */
     public function suggestAddress(Person $person, Request $request, string $_format): Response
@@ -116,7 +115,7 @@ class PersonApiController extends ApiController
                 static function (Address $address) use (&$seenAddressIds): bool {
                     $id = $address->getId();
 
-                    if (in_array($id, $seenAddressIds, true)) {
+                    if (\in_array($id, $seenAddressIds, true)) {
                         return false;
                     }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 31fb1037e..f9c24d2d4 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Controller;
 
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Household\Household;
@@ -23,9 +22,7 @@ use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Search\SimilarPersonMatcher;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
-use Psr\Log\LoggerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -33,18 +30,11 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 use function hash;
-use function implode;
-use function in_array;
-use function is_array;
 
 final class PersonController extends AbstractController
 {
@@ -131,6 +121,7 @@ final class PersonController extends AbstractController
      *     name="chill_person_household_person_history",
      *     methods={"GET", "POST"}
      * )
+     *
      * @ParamConverter("person", options={"id": "person_id"})
      */
     public function householdHistoryByPerson(Request $request, Person $person): Response
@@ -160,6 +151,7 @@ final class PersonController extends AbstractController
      *
      * The next post compare the data with previous one and, if yes, show a
      * review page if there are "alternate persons".
+     *
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/new", name="chill_person_new")
      */
     public function newAction(Request $request): Response
@@ -168,7 +160,7 @@ final class PersonController extends AbstractController
 
         $authorizedCenters = $this->authorizationHelper->getReachableCenters($this->getUser(), PersonVoter::CREATE);
 
-        if (1 === count($authorizedCenters)) {
+        if (1 === \count($authorizedCenters)) {
             $person->setCenter($authorizedCenters[0]);
         }
 
@@ -183,10 +175,10 @@ final class PersonController extends AbstractController
 
         $form->handleRequest($request);
 
-        if ($request->getMethod() === Request::METHOD_GET) {
+        if (Request::METHOD_GET === $request->getMethod()) {
             $this->lastPostDataReset();
         } elseif (
-            $request->getMethod() === Request::METHOD_POST
+            Request::METHOD_POST === $request->getMethod()
             && $form->isValid()
         ) {
             $alternatePersons = $this->similarPersonMatcher
@@ -194,7 +186,7 @@ final class PersonController extends AbstractController
 
             if (
                 false === $this->isLastPostDataChanges($form, $request, true)
-                || count($alternatePersons) === 0
+                || 0 === \count($alternatePersons)
             ) {
                 $this->em->persist($person);
 
@@ -209,7 +201,7 @@ final class PersonController extends AbstractController
 
                     $member = new HouseholdMember();
                     $member->setPerson($person);
-                    $member->setStartDate(new DateTimeImmutable());
+                    $member->setStartDate(new \DateTimeImmutable());
 
                     $household->addMember($member);
                     $household->setForceAddress($address);
@@ -243,7 +235,7 @@ final class PersonController extends AbstractController
                     ['person_id' => $person->getId()]
                 );
             }
-        } elseif ($request->getMethod() === Request::METHOD_POST && !$form->isValid()) {
+        } elseif (Request::METHOD_POST === $request->getMethod() && !$form->isValid()) {
             $this->addFlash('error', $this->translator->trans('This form contains errors'));
         }
 
@@ -264,8 +256,7 @@ final class PersonController extends AbstractController
         $person = $this->_getPerson($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-                    . ' found on this server');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found on this server');
         }
 
         $this->denyAccessUnlessGranted(
@@ -290,7 +281,6 @@ final class PersonController extends AbstractController
     /**
      * easy getting a person by his id.
      *
-     *
      * @return \Chill\PersonBundle\Entity\Person
      */
     private function _getPerson(int $id)
@@ -306,14 +296,14 @@ final class PersonController extends AbstractController
         $errors = $this->validator
             ->validate($person, null, ['creation']);
 
-        //validate accompanying periods
+        // validate accompanying periods
         $periods = $person->getAccompanyingPeriods();
 
         foreach ($periods as $period) {
             $period_errors = $this->validator
                 ->validate($period);
 
-            //group errors :
+            // group errors :
             foreach ($period_errors as $error) {
                 $errors->add($error);
             }
@@ -353,15 +343,15 @@ final class PersonController extends AbstractController
         $ignoredFields = ['form_status', '_token'];
 
         foreach ($request->request->all()[$form->getName()] as $field => $value) {
-            if (in_array($field, $ignoredFields, true)) {
+            if (\in_array($field, $ignoredFields, true)) {
                 continue;
             }
-            $fields[$field] = is_array($value) ?
-                implode(',', $value) : $value;
+            $fields[$field] = \is_array($value) ?
+                \implode(',', $value) : $value;
         }
         ksort($fields);
 
-        return hash('sha512', implode('&', $fields));
+        return \hash('sha512', \implode('&', $fields));
     }
 
     private function lastPostDataReset(): void
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
index 4291a1a69..034189674 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
@@ -25,11 +25,9 @@ use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Search\SimilarPersonMatcher;
 use Chill\TaskBundle\Entity\SingleTask;
 use http\Exception\InvalidArgumentException;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Contracts\Translation\TranslatorInterface;
-
 use function count;
 
 class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controller\AbstractController
@@ -52,8 +50,7 @@ class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controll
         $person2->counters = $this->_getCounters($person2_id);
 
         if (null === $person1) {
-            throw $this->createNotFoundException("Person with id {$person1_id} not"
-                . ' found on this server');
+            throw $this->createNotFoundException("Person with id {$person1_id} not".' found on this server');
         }
 
         $this->denyAccessUnlessGranted(
@@ -63,8 +60,7 @@ class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controll
         );
 
         if (null === $person2) {
-            throw $this->createNotFoundException("Person with id {$person2_id} not"
-                . ' found on this server');
+            throw $this->createNotFoundException("Person with id {$person2_id} not".' found on this server');
         }
 
         $form = $this->createForm(PersonConfimDuplicateType::class);
@@ -109,8 +105,7 @@ class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controll
         $person = $this->_getPerson($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-              . ' found on this server');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found on this server');
         }
 
         $this->denyAccessUnlessGranted(
@@ -127,8 +122,7 @@ class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controll
             $person2 = $form->get('person')->getData();
 
             if (null === $person2) {
-                throw $this->createNotFoundException("Person with id {$person2->getId}() not"
-                  . ' found on this server');
+                throw $this->createNotFoundException("Person with id {$person2->getId}() not".' found on this server');
             }
 
             $direction = $form->get('direction')->getData();
@@ -215,8 +209,7 @@ class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controll
         $person = $this->_getPerson($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-              . ' found on this server');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found on this server');
         }
 
         $this->denyAccessUnlessGranted(
@@ -248,11 +241,11 @@ class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controll
         $person = $em->getRepository(Person::class)->findOneBy(['id' => $id]);
 
         return [
-            'nb_activity' => count($nb_activity),
-            'nb_document' => count($nb_document),
+            'nb_activity' => \count($nb_activity),
+            'nb_document' => \count($nb_document),
             //            'nb_event' => count($nb_event),
             'nb_task' => $nb_task,
-            'nb_addresses' => count($person->getAddresses()),
+            'nb_addresses' => \count($person->getAddresses()),
         ];
     }
 
@@ -279,13 +272,11 @@ class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controll
         }
 
         if (null === $person1) {
-            throw $this->createNotFoundException("Person with id {$person1_id} not"
-              . ' found on this server');
+            throw $this->createNotFoundException("Person with id {$person1_id} not".' found on this server');
         }
 
         if (null === $person2) {
-            throw $this->createNotFoundException("Person with id {$person2_id} not"
-              . ' found on this server');
+            throw $this->createNotFoundException("Person with id {$person2_id} not".' found on this server');
         }
 
         return [$person1, $person2];
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
index 493f123ac..a9d60d18e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
@@ -50,7 +50,7 @@ final class PersonResourceController extends AbstractController
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
diff --git a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
index 11d42f74b..03b6975b4 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
@@ -36,7 +36,6 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Validator\Constraints\NotIdenticalTo;
 use Symfony\Component\Validator\Constraints\NotNull;
-use function is_int;
 
 class ReassignAccompanyingPeriodController extends AbstractController
 {
@@ -142,7 +141,7 @@ class ReassignAccompanyingPeriodController extends AbstractController
         return $builder->getForm();
     }
 
-    private function buildReassignForm(array $periodIds, ?User $userFrom = null): FormInterface
+    private function buildReassignForm(array $periodIds, User $userFrom = null): FormInterface
     {
         $defaultData = [
             'userFrom' => $userFrom,
@@ -181,7 +180,7 @@ class ReassignAccompanyingPeriodController extends AbstractController
                     return null;
                 }
 
-                if (!is_int((int) $id)) {
+                if (!\is_int((int) $id)) {
                     throw new TransformationFailedException('the user id is not a numeric');
                 }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php
index fd864f507..a866ceff7 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Pagination\PaginatorInterface;
-use DateTimeImmutable;
 use Symfony\Component\HttpFoundation\Request;
 
 class SocialIssueApiController extends ApiController
@@ -26,7 +25,7 @@ class SocialIssueApiController extends ApiController
                 $query->expr()->isNull('e.desactivationDate')
             )
         );
-        $query->setParameter('now', new DateTimeImmutable());
+        $query->setParameter('now', new \DateTimeImmutable());
     }
 
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
index 769e90de7..7b1dd4211 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
@@ -13,13 +13,12 @@ namespace Chill\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\MainBundle\Pagination\PaginatorInterface;
-use LogicException;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 class SocialIssueController extends CRUDController
 {
-    protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
+    protected function createFormFor(string $action, $entity, string $formClass = null, array $formOptions = []): FormInterface
     {
         if ('new' === $action) {
             return parent::createFormFor($action, $entity, $formClass, ['step' => 'create']);
@@ -29,7 +28,7 @@ class SocialIssueController extends CRUDController
             return parent::createFormFor($action, $entity, $formClass, ['step' => 'edit']);
         }
 
-        throw new LogicException('action is not supported: ' . $action);
+        throw new \LogicException('action is not supported: '.$action);
     }
 
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php
index 01adc8854..b97f2ed30 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php
@@ -31,6 +31,7 @@ class SocialWorkEvaluationApiController extends AbstractController
      *         "_format": "json"
      *     }
      * )
+     *
      * @ParamConverter("action", options={"id": "action_id"})
      */
     public function listEvaluationBySocialAction(SocialAction $action): Response
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
index ddd9310b3..6b341e926 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
@@ -20,8 +20,6 @@ use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 
-use function count;
-
 final class SocialWorkSocialActionApiController extends ApiController
 {
     public function __construct(
@@ -46,9 +44,9 @@ final class SocialWorkSocialActionApiController extends ApiController
 
         usort($socialActions, static fn (SocialAction $sa, SocialAction $sb) => $sa->getOrdering() <=> $sb->getOrdering());
 
-        $pagination = $this->paginator->create(count($socialActions));
+        $pagination = $this->paginator->create(\count($socialActions));
         // max one page
-        $pagination->setItemsPerPage(count($socialActions));
+        $pagination->setItemsPerPage(\count($socialActions));
 
         $collection = new Collection($socialActions, $pagination);
 
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php
index 130167428..c6cf3b5e1 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php
@@ -14,9 +14,6 @@ namespace Chill\PersonBundle\DataFixtures\Helper;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 
-use function array_pop;
-use function random_int;
-
 trait PersonRandomHelper
 {
     private ?int $countPersons = null;
@@ -41,11 +38,11 @@ trait PersonRandomHelper
                 ->select('p')
                 ->from(Person::class, 'p')
                 ->getQuery()
-                ->setFirstResult(random_int(0, $this->countPersons - $fetchBy))
+                ->setFirstResult(\random_int(0, $this->countPersons - $fetchBy))
                 ->setMaxResults($fetchBy)
                 ->getResult();
         }
 
-        return array_pop($this->randPersons);
+        return \array_pop($this->randPersons);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php
index b84df6dd2..942f6cc5a 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php
@@ -14,8 +14,6 @@ namespace Chill\PersonBundle\DataFixtures\Helper;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 
-use function random_int;
-
 trait RandomPersonHelperTrait
 {
     private ?int $nbOfPersons = null;
@@ -36,7 +34,7 @@ trait RandomPersonHelperTrait
         return $qb
             ->select('p')
             ->setMaxResults(1)
-            ->setFirstResult(random_int(0, $this->nbOfPersons))
+            ->setFirstResult(\random_int(0, $this->nbOfPersons))
             ->getQuery()
             ->getSingleResult();
     }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php
index cda7d76e7..fb836ed3a 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php
@@ -58,7 +58,7 @@ class LoadAccompanyingPeriodClosingMotive extends AbstractFixture implements Ord
         foreach (static::$closingMotives as $ref => $new) {
             $motive = new ClosingMotive();
             $motive->setName($new['name'])
-                ->setActive(($new['active'] ?? true));
+                ->setActive($new['active'] ?? true);
 
             $manager->persist($motive);
             $this->addReference($ref, $motive);
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
index 63adfe9b0..44992ebef 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
@@ -17,13 +17,8 @@ use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
-use DateTimeImmutable;
 use Doctrine\Persistence\ObjectManager;
 
-use function array_pop;
-use function array_rand;
-use function count;
-
 class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Doctrine\Common\DataFixtures\DependentFixtureInterface
 {
     /**
@@ -48,8 +43,8 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
 
         $i = 0;
 
-        while (null !== $period = array_pop($periods)) {
-            /** @var AccompanyingPeriod $period */
+        while (null !== $period = \array_pop($periods)) {
+            /* @var AccompanyingPeriod $period */
             ++$i;
 
             if (0 === $i % 15) {
@@ -66,11 +61,11 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
                 $work
                     ->setAccompanyingPeriod($period)
                     ->setSocialAction($action)
-                    ->setStartDate(new DateTimeImmutable('today'))
+                    ->setStartDate(new \DateTimeImmutable('today'))
                     ->addPerson($period->getPersons()->first())
-                    ->setCreatedAt(new DateTimeImmutable())
+                    ->setCreatedAt(new \DateTimeImmutable())
                     ->setCreatedBy($this->getReference('center a_social'))
-                    ->setUpdatedAt(new DateTimeImmutable())
+                    ->setUpdatedAt(new \DateTimeImmutable())
                     ->setUpdatedBy($this->getReference('center a_social'));
                 $manager->persist($work);
 
@@ -93,11 +88,11 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
                 $work
                     ->setAccompanyingPeriod($period)
                     ->setSocialAction($action)
-                    ->setStartDate(new DateTimeImmutable('today'))
+                    ->setStartDate(new \DateTimeImmutable('today'))
                     ->addPerson($period->getPersons()->first())
-                    ->setCreatedAt(new DateTimeImmutable())
+                    ->setCreatedAt(new \DateTimeImmutable())
                     ->setCreatedBy($this->getReference('center a_social'))
-                    ->setUpdatedAt(new DateTimeImmutable())
+                    ->setUpdatedAt(new \DateTimeImmutable())
                     ->setUpdatedBy($this->getReference('center a_social'));
                 $manager->persist($work);
                 $ev = new AccompanyingPeriod\AccompanyingPeriodWorkEvaluation();
@@ -114,20 +109,20 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
     {
         $actions = $socialIssue->getRecursiveSocialActions()->toArray();
 
-        if (0 === count($actions)) {
+        if (0 === \count($actions)) {
             return null;
         }
 
-        return $actions[array_rand($actions)];
+        return $actions[\array_rand($actions)];
     }
 
     private function getRandomEvaluation(): Evaluation
     {
-        if (0 === count($this->cacheEvaluations)) {
+        if (0 === \count($this->cacheEvaluations)) {
             $this->cacheEvaluations = $this->evaluationRepository
                 ->findAll();
         }
 
-        return $this->cacheEvaluations[array_rand($this->cacheEvaluations)];
+        return $this->cacheEvaluations[\array_rand($this->cacheEvaluations)];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
index a1aedb2a2..30aa345e7 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
@@ -17,27 +17,20 @@ use Chill\CustomFieldsBundle\CustomFields\CustomFieldTitle;
 use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup;
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectManager;
-use RuntimeException;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-use Twig\Environment;
 
-class LoadCustomFields extends AbstractFixture implements
-    OrderedFixtureInterface
+class LoadCustomFields extends AbstractFixture implements OrderedFixtureInterface
 {
     private ?\Chill\CustomFieldsBundle\Entity\CustomField $cfText = null;
 
     private ?\Chill\CustomFieldsBundle\Entity\CustomField $cfChoice = null;
 
     /**
-    /**
+     * /**
      * LoadCustomFields constructor.
      */
     public function __construct(
@@ -46,7 +39,7 @@ class LoadCustomFields extends AbstractFixture implements
         private readonly CustomFieldText $customFieldText,
     ) {}
 
-    //put your code here
+    // put your code here
     public function getOrder()
     {
         return 10003;
@@ -85,7 +78,7 @@ class LoadCustomFields extends AbstractFixture implements
         // select a set of people and add data
         foreach ($personIds as $id) {
             // add info on 1 person on 2
-            if (random_int(0, 1) === 1) {
+            if (1 === random_int(0, 1)) {
                 /** @var Person $person */
                 $person = $manager->getRepository(Person::class)->find($id);
                 $person->setCFData([
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
index 274aa7638..ba2c67a08 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
@@ -19,20 +19,12 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Household\MembersEditorFactory;
-use DateInterval;
-use DateTime;
-use DateTimeImmutable;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectManager;
 use Nelmio\Alice\Loader\NativeLoader;
 
-use function array_pop;
-use function array_rand;
-use function random_int;
-use function shuffle;
-
 class LoadHousehold extends Fixture implements DependentFixtureInterface
 {
     private const NUMBER_OF_HOUSEHOLD = 10;
@@ -64,43 +56,43 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
         $this->generateHousehold(
             $manager,
-            DateTimeImmutable::createFromFormat('Y-m-d', '2010-01-01')
+            \DateTimeImmutable::createFromFormat('Y-m-d', '2010-01-01')
         );
 
         $this->preparePersonIds();
 
         $this->generateHousehold(
             $manager,
-            DateTimeImmutable::createFromFormat('Y-m-d', '2015-01-01')
+            \DateTimeImmutable::createFromFormat('Y-m-d', '2015-01-01')
         );
 
         $manager->flush();
     }
 
-    private function addAddressToHousehold(Household $household, DateTimeImmutable $date, ObjectManager $manager)
+    private function addAddressToHousehold(Household $household, \DateTimeImmutable $date, ObjectManager $manager)
     {
-        if (random_int(0, 10) > 8) {
+        if (\random_int(0, 10) > 8) {
             //  20% of household without address
             return;
         }
 
-        $nb = random_int(1, 6);
+        $nb = \random_int(1, 6);
 
         $i = 0;
 
         while ($i < $nb) {
             $address = $this->createAddress();
-            $address->setValidFrom(DateTime::createFromImmutable($date));
+            $address->setValidFrom(\DateTime::createFromImmutable($date));
 
-            if (random_int(0, 20) < 1) {
-                $date = $date->add(new DateInterval('P' . random_int(8, 52) . 'W'));
-                $address->setValidTo(DateTime::createFromImmutable($date));
+            if (\random_int(0, 20) < 1) {
+                $date = $date->add(new \DateInterval('P'.\random_int(8, 52).'W'));
+                $address->setValidTo(\DateTime::createFromImmutable($date));
             }
 
             $household->addAddress($address);
             $manager->persist($address);
 
-            $date = $date->add(new DateInterval('P' . random_int(8, 52) . 'W'));
+            $date = $date->add(new \DateInterval('P'.\random_int(8, 52).'W'));
             ++$i;
         }
     }
@@ -120,7 +112,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
         return $objectSet->getObjects()['address1'];
     }
 
-    private function generateHousehold(ObjectManager $manager, DateTimeImmutable $startDate)
+    private function generateHousehold(ObjectManager $manager, \DateTimeImmutable $startDate)
     {
         for ($i = 0; self::NUMBER_OF_HOUSEHOLD > $i; ++$i) {
             $household = new Household();
@@ -134,7 +126,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
             $k = 0;
 
             foreach ($this->getRandomPersons(1, 3) as $person) {
-                $date = $startDate->add(new DateInterval('P' . random_int(1, 200) . 'W'));
+                $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W'));
                 $position = $this->getReference(LoadHouseholdPosition::ADULT);
 
                 $movement->addMovement($date, $person, $position, 0 === $k, 'self generated');
@@ -143,7 +135,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
             // load children
             foreach ($this->getRandomPersons(0, 3) as $person) {
-                $date = $startDate->add(new DateInterval('P' . random_int(1, 200) . 'W'));
+                $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W'));
                 $position = $this->getReference(LoadHouseholdPosition::CHILD);
 
                 $movement->addMovement($date, $person, $position, 0 === $k, 'self generated');
@@ -152,7 +144,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
             // load children out
             foreach ($this->getRandomPersons(0, 2) as $person) {
-                $date = $startDate->add(new DateInterval('P' . random_int(1, 200) . 'W'));
+                $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W'));
                 $position = $this->getReference(LoadHouseholdPosition::CHILD_OUT);
 
                 $movement->addMovement($date, $person, $position, 0 === $k, 'self generated');
@@ -167,7 +159,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
     private function getPostalCode(): PostalCode
     {
-        $ref = LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)];
+        $ref = LoadPostalCodes::$refs[\array_rand(LoadPostalCodes::$refs)];
 
         return $this->getReference($ref);
     }
@@ -176,10 +168,10 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
     {
         $persons = [];
 
-        $nb = random_int($min, $max);
+        $nb = \random_int($min, $max);
 
         for ($i = 0; $i < $nb; ++$i) {
-            $personId = array_pop($this->personIds)['id'];
+            $personId = \array_pop($this->personIds)['id'];
             $persons[] = $this->em->getRepository(Person::class)->find($personId);
         }
 
@@ -193,17 +185,17 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
         // @TODO: Remove this and make this service stateless
         $this->personIds = $this->em
             ->createQuery(
-                'SELECT p.id FROM ' . Person::class . ' p ' .
-                'WHERE EXISTS( ' .
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch ' .
-                    'JOIN pch.center c ' .
-                    'WHERE pch.person = p.id ' .
-                    'AND c.name IN (:authorized_centers)' .
+                'SELECT p.id FROM '.Person::class.' p '.
+                'WHERE EXISTS( '.
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' pch '.
+                    'JOIN pch.center c '.
+                    'WHERE pch.person = p.id '.
+                    'AND c.name IN (:authorized_centers)'.
                 ')'
             )
             ->setParameter('authorized_centers', $centers)
             ->getScalarResult();
 
-        shuffle($this->personIds);
+        \shuffle($this->personIds);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
index 67c0ea38f..ddce77d6c 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
@@ -41,11 +41,11 @@ class LoadMaritalStatus extends AbstractFixture implements OrderedFixtureInterfa
         echo "loading maritalStatuses... \n";
 
         foreach ($this->maritalStatuses as $ms) {
-            echo $ms['name']['en'] . ' ';
+            echo $ms['name']['en'].' ';
             $new_ms = new MaritalStatus();
             $new_ms->setId($ms['id']);
             $new_ms->setName($ms['name']);
-            $this->addReference('ms_' . $ms['id'], $new_ms);
+            $this->addReference('ms_'.$ms['id'], $new_ms);
             $manager->persist($new_ms);
         }
 
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
index 35b57a0c0..e8026d04b 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
-use Chill\MainBundle\Doctrine\Model\Point;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Country;
@@ -29,13 +28,9 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Repository\MaritalStatusRepository;
 use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
-use DateInterval;
-use DateTime;
-use DateTimeImmutable;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Exception;
 use Faker\Factory;
 use Faker\Generator;
 use Nelmio\Alice\Loader\NativeLoader;
@@ -43,10 +38,6 @@ use Nelmio\Alice\ObjectSet;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\Workflow\Registry;
 
-use function count;
-use function random_int;
-use function ucfirst;
-
 /**
  * Load people into database.
  */
@@ -118,7 +109,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             ],
         ],
         [
-            //to have a person with same firstname as Gérard Depardieu
+            // to have a person with same firstname as Gérard Depardieu
             'lastName' => 'Depardieu',
             'firstName' => 'Jean',
             'birthdate' => '1960-10-12',
@@ -128,7 +119,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             'maritalStatus' => 'ms_divorce',
         ],
         [
-            //to have a person with same birthdate of Gérard Depardieu
+            // to have a person with same birthdate of Gérard Depardieu
             'lastName' => 'Van Snick',
             'firstName' => 'Bart',
             'birthdate' => '1948-12-27',
@@ -136,7 +127,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             'maritalStatus' => 'ms_legalco',
         ],
         [
-            //to have a woman with Depardieu as FirstName
+            // to have a woman with Depardieu as FirstName
             'lastName' => 'Depardieu',
             'firstName' => 'Charline',
             'birthdate' => '1970-10-15',
@@ -145,14 +136,14 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             'maritalStatus' => 'ms_legalco',
         ],
         [
-            //to have a special character in lastName
+            // to have a special character in lastName
             'lastName' => 'Manço',
             'firstName' => 'Étienne',
             'center' => 'Center A',
             'maritalStatus' => 'ms_unknown',
         ],
         [
-            //to have true duplicate person
+            // to have true duplicate person
             'lastName' => 'Depardieu',
             'firstName' => 'Jean',
             'birthdate' => '1960-10-12',
@@ -162,7 +153,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             'maritalStatus' => 'ms_divorce',
         ],
         [
-            //to have false duplicate person
+            // to have false duplicate person
             'lastName' => 'Depardieu',
             'firstName' => 'Jeanne',
             'birthdate' => '1966-11-13',
@@ -253,7 +244,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
      */
     public function getRandomCenter(): Center
     {
-        if (0 === count($this->cacheCenters)) {
+        if (0 === \count($this->cacheCenters)) {
             $this->cacheCenters = $this->centerRepository->findAll();
         }
 
@@ -263,15 +254,15 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
     /**
      * @internal This method is public and called by faker as a custom generator
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function getRandomCountry(int $nullPercentage = 20): ?Country
     {
-        if (0 === count($this->cacheCountries)) {
+        if (0 === \count($this->cacheCountries)) {
             $this->cacheCountries = $this->countryRepository->findAll();
         }
 
-        if (random_int(0, 100) > $nullPercentage) {
+        if (\random_int(0, 100) > $nullPercentage) {
             return null;
         }
 
@@ -289,15 +280,15 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
     /**
      * @internal This method is public and called by faker as a custom generator
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function getRandomMaritalStatus(int $nullPercentage = 50): ?MaritalStatus
     {
-        if (0 === count($this->cacheMaritalStatuses)) {
+        if (0 === \count($this->cacheMaritalStatuses)) {
             $this->cacheMaritalStatuses = $this->maritalStatusRepository->findAll();
         }
 
-        if (random_int(0, 100) > $nullPercentage) {
+        if (\random_int(0, 100) > $nullPercentage) {
             return null;
         }
 
@@ -335,22 +326,22 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
     /**
      * create a new person from array data.
      *
-     * @throws Exception
+     * @throws \Exception
      */
     private function addAPerson(Person $person, ObjectManager $manager)
     {
         $accompanyingPeriod = new AccompanyingPeriod(
-            (new DateTime())
+            (new \DateTime())
                 ->sub(
-                    new DateInterval('P' . random_int(0, 180) . 'D')
+                    new \DateInterval('P'.\random_int(0, 180).'D')
                 )
         );
         $accompanyingPeriod->setCreatedBy($this->getRandomUser())
-            ->setCreatedAt(new DateTimeImmutable('now'));
+            ->setCreatedAt(new \DateTimeImmutable('now'));
         $person->addAccompanyingPeriod($accompanyingPeriod);
         $accompanyingPeriod->addSocialIssue($this->getRandomSocialIssue());
 
-        if (random_int(0, 10) > 3) {
+        if (\random_int(0, 10) > 3) {
             // always add social scope:
             $accompanyingPeriod->addScope($this->getReference('scope_social'));
             $origin = $this->getReference(LoadAccompanyingPeriodOrigin::ACCOMPANYING_PERIOD_ORIGIN);
@@ -365,7 +356,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
         $manager->persist($person);
         $manager->persist($accompanyingPeriod);
 
-        $this->addReference(self::PERSON . $person->getId(), $person);
+        $this->addReference(self::PERSON.$person->getId(), $person);
     }
 
     private function createAddress(): Address
@@ -408,7 +399,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
         foreach ($default as $key => $value) {
             switch ($key) {
                 case 'birthdate':
-                    $person->setBirthdate(new DateTime($value));
+                    $person->setBirthdate(new \DateTime($value));
 
                     break;
 
@@ -471,7 +462,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
 
     private function getRandomSocialIssue(): SocialIssue
     {
-        if (0 === count($this->cacheSocialIssues)) {
+        if (0 === \count($this->cacheSocialIssues)) {
             $this->cacheSocialIssues = $this->socialIssueRepository->findAll();
         }
 
@@ -480,7 +471,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
 
     private function getRandomUser(): User
     {
-        if (0 === count($this->cacheUsers)) {
+        if (0 === \count($this->cacheUsers)) {
             $this->cacheUsers = $this->userRepository->findAll();
         }
 
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
index 9c4c90447..4b57dd048 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
@@ -36,7 +36,7 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
             $permissionsGroup = $this->getReference($permissionsGroupRef);
             $scopeSocial = $this->getReference('scope_social');
 
-            //create permission group
+            // create permission group
             switch ($permissionsGroup->getName()) {
                 case 'social':
                 case 'direction':
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
index 7a05f7f6a..529918377 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
@@ -38,13 +38,13 @@ class LoadRelations extends Fixture implements FixtureGroupInterface
     public function load(ObjectManager $manager)
     {
         foreach (self::RELATIONS as $key => $value) {
-            echo 'Creating a new relation type: relation' . $value['title']['fr'] . 'reverse relation: ' . $value['reverseTitle']['fr'] . "\n";
+            echo 'Creating a new relation type: relation'.$value['title']['fr'].'reverse relation: '.$value['reverseTitle']['fr']."\n";
             $relation = new Relation();
             $relation->setTitle($value['title'])
                 ->setReverseTitle($value['reverseTitle']);
             $manager->persist($relation);
 
-            $this->addReference(self::RELATION_KEY . $key, $relation);
+            $this->addReference(self::RELATION_KEY.$key, $relation);
         }
 
         $manager->flush();
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
index f67141e35..3efcc6386 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
@@ -15,15 +15,11 @@ use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\DataFixtures\Helper\PersonRandomHelper;
 use Chill\PersonBundle\Entity\Relationships\Relationship;
-use DateTimeImmutable;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function array_key_exists;
-use function count;
-
 class LoadRelationships extends Fixture implements DependentFixtureInterface
 {
     use PersonRandomHelper;
@@ -45,12 +41,12 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface
 
         for ($i = 0; 20 > $i; ++$i) {
             $user = $this->getRandomUser();
-            $date = new DateTimeImmutable();
+            $date = new \DateTimeImmutable();
             $relationship = (new Relationship())
                 ->setFromPerson($this->getRandomPerson($this->em))
                 ->setToPerson($this->getRandomPerson($this->em))
-                ->setRelation($this->getReference(LoadRelations::RELATION_KEY .
-                    random_int(0, count(LoadRelations::RELATIONS) - 1)))
+                ->setRelation($this->getReference(LoadRelations::RELATION_KEY.
+                    random_int(0, \count(LoadRelations::RELATIONS) - 1)))
                 ->setReverse((bool) random_int(0, 1))
                 ->setCreatedBy($user)
                 ->setUpdatedBy($user)
@@ -63,7 +59,7 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface
                 max($relationship->getFromPerson()->getId(), $relationship->getToPerson()->getId()),
             ];
 
-            if (array_key_exists($set[0], $existing) && array_key_exists($set[1], $existing[$set[0]])) {
+            if (\array_key_exists($set[0], $existing) && \array_key_exists($set[1], $existing[$set[0]])) {
                 continue;
             }
             $existing[$set[0]][$set[1]] = 1;
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
index b34754e92..dc1e7b4dd 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
@@ -15,9 +15,7 @@ use Chill\PersonBundle\Service\Import\SocialWorkMetadata;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Exception;
 use League\Csv\Reader;
-use Throwable;
 
 class LoadSocialWorkMetadata extends Fixture implements OrderedFixtureInterface
 {
@@ -31,9 +29,9 @@ class LoadSocialWorkMetadata extends Fixture implements OrderedFixtureInterface
     public function load(ObjectManager $manager)
     {
         try {
-            $csv = Reader::createFromPath(__DIR__ . '/data/social_work_metadata.csv');
-        } catch (Throwable $e) {
-            throw new Exception('Error while loading CSV.', 0, $e);
+            $csv = Reader::createFromPath(__DIR__.'/data/social_work_metadata.csv');
+        } catch (\Throwable $e) {
+            throw new \Exception('Error while loading CSV.', 0, $e);
         }
 
         $csv->setDelimiter(';');
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 441a2863e..c5d7a026b 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -20,7 +20,6 @@ use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodCommentVoter;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodResourceVoter;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Exception;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
@@ -28,8 +27,6 @@ use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-use function array_key_exists;
-
 /**
  * Class ChillPersonExtension
  * Loads and manages your bundle configuration.
@@ -39,7 +36,7 @@ use function array_key_exists;
 class ChillPersonExtension extends Extension implements PrependExtensionInterface
 {
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     public function load(array $configs, ContainerBuilder $container)
     {
@@ -73,7 +70,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         // register all configuration in a unique parameter
         $container->setParameter('chill_person', $config);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/widgets.yaml');
         $loader->load('services/fixtures.yaml');
@@ -97,7 +94,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
 
         $loader->load('services/exports_person.yaml');
 
-        if ($container->getParameter('chill_person.accompanying_period') !== 'hidden') {
+        if ('hidden' !== $container->getParameter('chill_person.accompanying_period')) {
             $loader->load('services/exports_accompanying_course.yaml');
             $loader->load('services/exports_social_actions.yaml');
             $loader->load('services/exports_evaluation.yaml');
@@ -117,7 +114,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $this->prependCruds($container);
         $this->prependWorkflows($container);
 
-        //add person_fields parameter as global
+        // add person_fields parameter as global
         $chillPersonConfig = $container->getExtensionConfig($this->getAlias());
         $config = $this->processConfiguration(new Configuration(), $chillPersonConfig);
         $twigConfig = [
@@ -135,7 +132,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
 
         $this->declarePersonAsCustomizable($container);
 
-        //declare routes for person bundle
+        // declare routes for person bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
@@ -918,7 +915,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
      */
     protected function prependDoctrineDQL(ContainerBuilder $container)
     {
-        //add DQL function to ORM (default entity_manager)
+        // add DQL function to ORM (default entity_manager)
 
         $container->prependExtensionConfig('doctrine', [
             'orm' => [
@@ -1026,7 +1023,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         'mark_inactive_long' => [
                             'from' => [
                                 AccompanyingPeriod::STEP_CONFIRMED,
-                                AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT
+                                AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
                             ],
                             'to' => AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
                         ],
@@ -1035,7 +1032,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                                 AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
                                 AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
                             ],
-                            'to' => AccompanyingPeriod::STEP_CONFIRMED
+                            'to' => AccompanyingPeriod::STEP_CONFIRMED,
                         ],
                         'close' => [
                             'from' => [
@@ -1071,9 +1068,6 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         );
     }
 
-    /**
-     * @param $config
-     */
     private function handleAccompanyingPeriodsFieldsParameters(ContainerBuilder $container, $config)
     {
         $container->setParameter('chill_person.accompanying_period_fields', $config);
@@ -1084,19 +1078,16 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     break;
 
                 default:
-                    $container->setParameter('chill_person.accompanying_period_fields.' . $key, $value);
+                    $container->setParameter('chill_person.accompanying_period_fields.'.$key, $value);
 
                     break;
             }
         }
     }
 
-    /**
-     * @param $config
-     */
     private function handlePersonFieldsParameters(ContainerBuilder $container, $config)
     {
-        if (array_key_exists('enabled', $config)) {
+        if (\array_key_exists('enabled', $config)) {
             unset($config['enabled']);
         }
 
@@ -1105,7 +1096,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         foreach ($config as $key => $value) {
             match ($key) {
                 'accompanying_period' => $container->setParameter('chill_person.accompanying_period', $value),
-                default => $container->setParameter('chill_person.person_fields.' . $key, $value),
+                default => $container->setParameter('chill_person.person_fields.'.$key, $value),
             };
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php b/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
index ac8ca6593..c010196f8 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
@@ -14,8 +14,6 @@ namespace Chill\PersonBundle\DependencyInjection\CompilerPass;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-use function in_array;
-
 /**
  * Remove services which add AccompanyingPeriod to timeline if
  * accompanying_periods are set to `hidden`.
@@ -25,7 +23,7 @@ class AccompanyingPeriodTimelineCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         // remove services when accompanying period are hidden
-        if ($container->getParameter('chill_person.accompanying_period') !== 'hidden') {
+        if ('hidden' !== $container->getParameter('chill_person.accompanying_period')) {
             return;
         }
 
@@ -52,7 +50,7 @@ class AccompanyingPeriodTimelineCompilerPass implements CompilerPassInterface
 
             $definition->removeMethodCall('addProvider');
 
-            if (false === in_array($arguments[1], $definitions, true)) {
+            if (false === \in_array($arguments[1], $definitions, true)) {
                 $definition->addMethodCall($method, $arguments);
             }
         }
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
index d645727ef..3579407f2 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\DependencyInjection;
 
-use DateInterval;
-use Exception;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -24,8 +22,8 @@ use Symfony\Component\Config\Definition\ConfigurationInterface;
 class Configuration implements ConfigurationInterface
 {
     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';
+            .' any birthdate is not allowed. The birthdate is expressed as ISO8601 : '
+            .'https://en.wikipedia.org/wiki/ISO_8601#Durations';
 
     public function getConfigTreeBuilder()
     {
@@ -48,19 +46,19 @@ class Configuration implements ConfigurationInterface
             ->validate()
             ->ifTrue(static function ($period) {
                 try {
-                    $interval = new DateInterval($period);
-                } catch (Exception) {
+                    $interval = new \DateInterval($period);
+                } catch (\Exception) {
                     return true;
                 }
 
                 return false;
             })
             ->thenInvalid('Invalid period for birthdate validation : "%s" '
-                                                . 'The parameter should match duration as defined by ISO8601 : '
-                                                . 'https://en.wikipedia.org/wiki/ISO_8601#Durations')
+                                                .'The parameter should match duration as defined by ISO8601 : '
+                                                .'https://en.wikipedia.org/wiki/ISO_8601#Durations')
             ->end() // birthdate_not_after, parent = children of validation
             ->end() // children for 'validation', parent = validation
-            ->end() //validation, parent = children of root
+            ->end() // validation, parent = children of root
             ->end() // children of root, parent = root
             ->booleanNode('create_person_allowed')
             ->defaultTrue()
@@ -107,7 +105,7 @@ class Configuration implements ConfigurationInterface
             ->end()
             ->end()
             ->end()
-            ->end() //children for 'person_fields', parent = array 'person_fields'
+            ->end() // children for 'person_fields', parent = array 'person_fields'
             ->end() // person_fields, parent = children of root
             ->arrayNode('accompanying_periods_fields')
             ->canBeDisabled()
@@ -122,7 +120,7 @@ class Configuration implements ConfigurationInterface
             ->append($this->addFieldNode('anonymous'))
             ->append($this->addFieldNode('emergency'))
             ->append($this->addFieldNode('confidential'))
-            ->end() //children for 'accompanying_person_fields', parent = array 'person_fields'
+            ->end() // children for 'accompanying_person_fields', parent = array 'person_fields'
             ->end() // paccompanying_person_fields, parent = children of root
             ->booleanNode('allow_multiple_simultaneous_accompanying_periods')
             ->info('Can we have more than one simultaneous accompanying period in the same time. Default false.')
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index e074f53ef..fd65c1cfe 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -38,38 +38,36 @@ use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOve
 use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\ReadableCollection;
 use Doctrine\Common\Collections\Selectable;
 use Doctrine\ORM\Mapping as ORM;
-use Iterator;
-use LogicException;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Validator\GroupSequenceProviderInterface;
-
 use UnexpectedValueException;
 
-use function array_key_exists;
-use const SORT_REGULAR;
-
 /**
  * AccompanyingPeriod Class.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_accompanying_period")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "accompanying_period": AccompanyingPeriod::class
  * })
+ *
  * @Assert\GroupSequenceProvider
+ *
  * @AccompanyingPeriodValidity(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
+ *
  * @LocationValidity(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
+ *
  * @ConfidentialCourseMustHaveReferrer(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
  */
 class AccompanyingPeriod implements
@@ -112,7 +110,7 @@ class AccompanyingPeriod implements
     final public const STEP_CONFIRMED = 'CONFIRMED';
 
     /**
-     * Mark an accompanying period as confirmed, but inactive
+     * Mark an accompanying period as confirmed, but inactive.
      *
      * this means that the accompanying period **is**
      * confirmed, but no activity (Activity, AccompanyingPeriod, ...)
@@ -121,7 +119,7 @@ class AccompanyingPeriod implements
     final public const STEP_CONFIRMED_INACTIVE_SHORT = 'CONFIRMED_INACTIVE_SHORT';
 
     /**
-     * Mark an accompanying period as confirmed, but inactive
+     * Mark an accompanying period as confirmed, but inactive.
      *
      * this means that the accompanying period **is**
      * confirmed, but no activity (Activity, AccompanyingPeriod, ...)
@@ -146,36 +144,43 @@ class AccompanyingPeriod implements
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     *
      * @Groups({"read", "write"})
+     *
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private ?Location $administrativeLocation = null;
 
     /**
      * @var Collection&Selectable<int, Calendar>
+     *
      * @ORM\OneToMany(targetEntity="Chill\CalendarBundle\Entity\Calendar", mappedBy="accompanyingPeriod")
      */
     private Collection&Selectable $calendars;
 
     /**
      * @ORM\Column(type="date", nullable=true)
+     *
      * @Groups({"read", "write", "docgen:read"})
+     *
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CLOSED})
+     *
      * @Assert\GreaterThanOrEqual(
      *     propertyPath="openingDate",
      *     groups={AccompanyingPeriod::STEP_CLOSED},
      *     message="The closing date must be later than the date of creation"
      * )
      */
-    private ?DateTime $closingDate = null;
+    private ?\DateTime $closingDate = null;
 
     /**
-     * @var AccompanyingPeriod\ClosingMotive
-     *
      * @ORM\ManyToOne(
      * targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive")
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read", "write"})
+     *
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CLOSED})
      */
     private ?ClosingMotive $closingMotive = null;
@@ -186,48 +191,61 @@ class AccompanyingPeriod implements
      *     cascade={"persist", "remove"},
      *     orphanRemoval=true
      * )
+     *
      * @ORM\OrderBy({"createdAt": "DESC", "id": "DESC"})
+     *
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_DRAFT})
+     *
      * @var Collection<Comment>
      */
     private Collection $comments;
 
     /**
      * @ORM\Column(type="boolean", options={"default": false})
+     *
      * @Groups({"read", "write", "docgen:read"})
      */
     private bool $confidential = false;
 
     /**
      * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
+     *
      * @Groups({"docgen:read"})
      */
-    private ?DateTimeInterface $createdAt = null;
+    private ?\DateTimeInterface $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?User $createdBy = null;
 
     /**
      * @ORM\Column(type="boolean", options={"default": false})
+     *
      * @Groups({"read", "write", "docgen:read"})
      */
     private bool $emergency = false;
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="string", nullable=true)
+     *
      * @Groups({"read"})
+     *
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private string $intensity = self::INTENSITY_OCCASIONAL;
@@ -236,13 +254,16 @@ class AccompanyingPeriod implements
      * @ORM\ManyToOne(
      *     targetEntity=UserJob::class
      * )
+     *
      * @Groups({"read", "write"})
+     *
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private ?UserJob $job = null;
 
     /**
      * @var Collection<AccompanyingPeriodLocationHistory>
+     *
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodLocationHistory::class,
      * mappedBy="period", cascade={"persist", "remove"}, orphanRemoval=true)
      */
@@ -250,16 +271,22 @@ class AccompanyingPeriod implements
 
     /**
      * @ORM\Column(type="date")
+     *
      * @Groups({"read", "write", "docgen:read"})
+     *
      * @Assert\LessThan(value="tomorrow", groups={AccompanyingPeriod::STEP_CONFIRMED})
+     *
      * @Assert\LessThanOrEqual(propertyPath="closingDate", groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
-    private ?DateTime $openingDate = null;
+    private ?\DateTime $openingDate = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Origin::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read", "write"})
+     *
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private ?Origin $origin = null;
@@ -268,8 +295,11 @@ class AccompanyingPeriod implements
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
      *     mappedBy="accompanyingPeriod", orphanRemoval=true,
      * cascade={"persist", "refresh", "remove", "merge", "detach"})
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @ParticipationOverlap(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
+     *
      * @var Collection<AccompanyingPeriodParticipation>
      */
     private Collection $participations;
@@ -287,7 +317,9 @@ class AccompanyingPeriod implements
      *     targetEntity=Comment::class,
      *     cascade={"persist"},
      * )
+     *
      * @Groups({"read"})
+     *
      * @ORM\JoinColumn(onDelete="SET NULL")
      */
     private ?Comment $pinnedComment = null;
@@ -296,79 +328,97 @@ class AccompanyingPeriod implements
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Groups({"read", "write"})
      */
     private string $remark = '';
 
     /**
      * @ORM\Column(type="boolean", options={"default": false})
+     *
      * @Groups({"read", "write", "docgen:read"})
      */
     private bool $requestorAnonymous = false;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="accompanyingPeriodRequested")
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?Person $requestorPerson = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?ThirdParty $requestorThirdParty = null;
 
     /**
-     * @var Collection<Resource>
+     * @var Collection<resource>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\Resource",
      *     mappedBy="accompanyingPeriod",
      *     cascade={"persist", "remove"},
      *     orphanRemoval=true
      * )
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @ResourceDuplicateCheck(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED, "Default", "default"})
      */
     private Collection $resources;
 
     /**
      * @var Collection<Scope>
+     *
      * @ORM\ManyToMany(
      *     targetEntity=Scope::class,
      *     cascade={}
      * )
+     *
      * @ORM\JoinTable(
      *     name="accompanying_periods_scopes",
      *     joinColumns={@ORM\JoinColumn(name="accompanying_period_id", referencedColumnName="id")},
      *     inverseJoinColumns={@ORM\JoinColumn(name="scope_id", referencedColumnName="id")}
      * )
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @Assert\Count(min=1, groups={AccompanyingPeriod::STEP_CONFIRMED}, minMessage="A course must be associated to at least one scope")
      */
     private Collection $scopes;
 
     /**
      * @var Collection<SocialIssue>
+     *
      * @ORM\ManyToMany(
      *     targetEntity=SocialIssue::class
      * )
+     *
      * @ORM\JoinTable(
      *     name="chill_person_accompanying_period_social_issues"
      * )
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @Assert\Count(min=1, groups={AccompanyingPeriod::STEP_CONFIRMED}, minMessage="A course must contains at least one social issue")
      */
     private Collection $socialIssues;
 
     /**
      * @ORM\Column(type="string", length=32, nullable=true)
+     *
      * @Groups({"read"})
+     *
      * @var AccompanyingPeriod::STEP_*
      */
     private string $step = self::STEP_DRAFT;
 
     /**
      * @var Collection<AccompanyingPeriodStepHistory>
+     *
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodStepHistory::class,
      * mappedBy="period", cascade={"persist", "remove"}, orphanRemoval=true)
      */
@@ -377,7 +427,7 @@ class AccompanyingPeriod implements
     /**
      * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
      */
-    private ?DateTimeInterface $updatedAt = null;
+    private ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(
@@ -388,7 +438,9 @@ class AccompanyingPeriod implements
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read", "write", "docgen:read"})
      */
     private ?User $user = null;
@@ -412,10 +464,12 @@ class AccompanyingPeriod implements
 
     /**
      * @var Collection<AccompanyingPeriodWork>
+     *
      * @ORM\OneToMany(
      *     targetEntity=AccompanyingPeriodWork::class,
      *     mappedBy="accompanyingPeriod"
      * )
+     *
      * @Assert\Valid(traverse=true)
      */
     private Collection $works;
@@ -423,11 +477,9 @@ class AccompanyingPeriod implements
     /**
      * AccompanyingPeriod constructor.
      *
-     * @param DateTime $dateOpening
-     *
      * @uses AccompanyingPeriod::setClosingDate()
      */
-    public function __construct(?DateTime $dateOpening = null)
+    public function __construct(\DateTime $dateOpening = null)
     {
         $this->calendars = new ArrayCollection(); // TODO we cannot add a dependency between AccompanyingPeriod and calendars
         $this->participations = new ArrayCollection();
@@ -439,7 +491,7 @@ class AccompanyingPeriod implements
         $this->userHistories = new ArrayCollection();
         $this->locationHistories = new ArrayCollection();
         $this->stepHistories = new ArrayCollection();
-        $this->setOpeningDate($dateOpening ?? new DateTime('now'));
+        $this->setOpeningDate($dateOpening ?? new \DateTime('now'));
     }
 
     /**
@@ -462,7 +514,7 @@ class AccompanyingPeriod implements
         foreach ($participations as $p) {
             $households[] = $p->getPerson()->getCurrentHousehold();
         }
-        $households = array_unique($households, SORT_REGULAR);
+        $households = array_unique($households, \SORT_REGULAR);
 
         $array = [];
 
@@ -492,7 +544,7 @@ class AccompanyingPeriod implements
 
     public function addLocationHistory(AccompanyingPeriodLocationHistory $history): self
     {
-        if ($this->getStep() === self::STEP_DRAFT) {
+        if (self::STEP_DRAFT === $this->getStep()) {
             return $this;
         }
 
@@ -505,7 +557,7 @@ class AccompanyingPeriod implements
         $criteria = new Criteria();
         $criteria->orderBy(['startDate' => Criteria::ASC, 'id' => Criteria::ASC]);
 
-        /** @var Iterator $locations */
+        /** @var \Iterator $locations */
         $locations = $this->getLocationHistories()->matching($criteria)->getIterator();
         $locations->rewind();
 
@@ -523,7 +575,7 @@ class AccompanyingPeriod implements
         return $this;
     }
 
-    public function addPerson(?Person $person = null): self
+    public function addPerson(Person $person = null): self
     {
         if (null !== $person) {
             $this->createParticipationFor($person);
@@ -574,7 +626,7 @@ class AccompanyingPeriod implements
      */
     public function canBeReOpened(Person $person): bool
     {
-        if ($this->isOpen() === true) {
+        if (true === $this->isOpen()) {
             return false;
         }
 
@@ -600,7 +652,7 @@ class AccompanyingPeriod implements
         $participation = $this->getOpenParticipationContainsPerson($person);
 
         if ($participation instanceof AccompanyingPeriodParticipation) {
-            $participation->setEndDate(new DateTime('now'));
+            $participation->setEndDate(new \DateTime('now'));
         }
 
         return $participation;
@@ -660,7 +712,7 @@ class AccompanyingPeriod implements
 
     public function getCenter(): ?Center
     {
-        if ($this->getPersons()->count() === 0) {
+        if (0 === $this->getPersons()->count()) {
             return null;
         }
 
@@ -674,7 +726,7 @@ class AccompanyingPeriod implements
         foreach ($this->getPersons() as $person) {
             if (
                 null !== $person->getCenter()
-                && !array_key_exists(spl_object_hash($person->getCenter()), $centers)
+                && !\array_key_exists(spl_object_hash($person->getCenter()), $centers)
             ) {
                 $centers[spl_object_hash($person->getCenter())] = $person->getCenter();
             }
@@ -685,10 +737,8 @@ class AccompanyingPeriod implements
 
     /**
      * Get closingDate.
-     *
-     * @return DateTime
      */
-    public function getClosingDate(): ?DateTime
+    public function getClosingDate(): ?\DateTime
     {
         return $this->closingDate;
     }
@@ -700,6 +750,7 @@ class AccompanyingPeriod implements
 
     /**
      * @Groups({"read"})
+     *
      * @return ReadableCollection<(int|string), Comment>
      */
     public function getComments(): ReadableCollection
@@ -714,7 +765,7 @@ class AccompanyingPeriod implements
         ;
     }
 
-    public function getCreatedAt(): ?DateTimeInterface
+    public function getCreatedAt(): ?\DateTimeInterface
     {
         return $this->createdAt;
     }
@@ -734,17 +785,17 @@ class AccompanyingPeriod implements
 
     public function getGroupSequence()
     {
-        if ($this->getStep() === self::STEP_DRAFT) {
+        if (self::STEP_DRAFT === $this->getStep()) {
             return [[self::STEP_DRAFT]];
         }
         if (str_starts_with($this->getStep(), 'CONFIRM')) {
             return [[self::STEP_DRAFT, self::STEP_CONFIRMED]];
         }
-        if ($this->getStep() === self::STEP_CLOSED) {
+        if (self::STEP_CLOSED === $this->getStep()) {
             return [[self::STEP_DRAFT, self::STEP_CONFIRMED, self::STEP_CLOSED]];
         }
 
-        throw new LogicException('no validation group permitted with this step: ' . $this->getStep());
+        throw new \LogicException('no validation group permitted with this step: '.$this->getStep());
     }
 
     public function getId(): ?int
@@ -778,7 +829,7 @@ class AccompanyingPeriod implements
      *
      * @Groups({"read"})
      */
-    public function getLocation(?DateTimeImmutable $at = null): ?Address
+    public function getLocation(\DateTimeImmutable $at = null): ?Address
     {
         if ($this->getPersonLocation() instanceof Person) {
             return $this->getPersonLocation()->getCurrentPersonAddress();
@@ -799,6 +850,7 @@ class AccompanyingPeriod implements
      * Get where the location is.
      *
      * @Groups({"read"})
+     *
      * @return 'person'|'address'|'none'
      */
     public function getLocationStatus(): string
@@ -816,10 +868,10 @@ class AccompanyingPeriod implements
 
     public function getNextCalendarsForPerson(Person $person, $limit = 5): ReadableCollection
     {
-        $today = new DateTimeImmutable('today');
+        $today = new \DateTimeImmutable('today');
         $criteria = Criteria::create()
             ->where(Criteria::expr()->gte('startDate', $today))
-            //->andWhere(Criteria::expr()->memberOf('persons', $person))
+            // ->andWhere(Criteria::expr()->memberOf('persons', $person))
             ->orderBy(['startDate' => 'DESC'])
             ->setMaxResults($limit * 2);
 
@@ -834,10 +886,8 @@ class AccompanyingPeriod implements
 
     /**
      * Get openingDate.
-     *
-     * @return DateTime
      */
-    public function getOpeningDate(): ?DateTime
+    public function getOpeningDate(): ?\DateTime
     {
         return $this->openingDate;
     }
@@ -877,6 +927,7 @@ class AccompanyingPeriod implements
 
     /**
      * Get Participations Collection.
+     *
      * @return Collection<AccompanyingPeriodParticipation>
      */
     public function getParticipations(): Collection
@@ -886,6 +937,7 @@ class AccompanyingPeriod implements
 
     /**
      * Get the participation containing a person.
+     *
      * @return ReadableCollection<(int|string), AccompanyingPeriodParticipation>
      */
     public function getParticipationsContainsPerson(Person $person): ReadableCollection
@@ -934,7 +986,7 @@ class AccompanyingPeriod implements
 
     /**
      * @return Collection|SocialAction[] All the descendant social actions of all
-     * the descendants of the entity
+     *                                   the descendants of the entity
      */
     public function getRecursiveSocialActions(): Collection
     {
@@ -1109,11 +1161,11 @@ class AccompanyingPeriod implements
 
     public function isOpen(): bool
     {
-        if ($this->getOpeningDate() > new DateTimeImmutable('now')) {
+        if ($this->getOpeningDate() > new \DateTimeImmutable('now')) {
             return false;
         }
 
-        if ($this->getClosingDate() === null) {
+        if (null === $this->getClosingDate()) {
             return true;
         }
 
@@ -1205,7 +1257,7 @@ class AccompanyingPeriod implements
     /**
      * @Groups({"write"})
      */
-    public function setAddressLocation(?Address $addressLocation = null): self
+    public function setAddressLocation(Address $addressLocation = null): self
     {
         if ($this->addressLocation !== $addressLocation) {
             $this->addressLocation = $addressLocation;
@@ -1214,7 +1266,7 @@ class AccompanyingPeriod implements
                 $this->setPersonLocation(null);
                 $locationHistory = new AccompanyingPeriodLocationHistory();
                 $locationHistory
-                    ->setStartDate(new DateTimeImmutable('now'))
+                    ->setStartDate(new \DateTimeImmutable('now'))
                     ->setAddressLocation($addressLocation);
 
                 $this->addLocationHistory($locationHistory);
@@ -1236,7 +1288,6 @@ class AccompanyingPeriod implements
      *
      * For closing a Person file, you should use Person::setClosed instead.
      *
-     *
      * @return AccompanyingPeriod
      */
     public function setClosingDate(mixed $closingDate)
@@ -1246,7 +1297,7 @@ class AccompanyingPeriod implements
         return $this;
     }
 
-    public function setClosingMotive(?ClosingMotive $closingMotive = null): self
+    public function setClosingMotive(ClosingMotive $closingMotive = null): self
     {
         $this->closingMotive = $closingMotive;
 
@@ -1260,7 +1311,7 @@ class AccompanyingPeriod implements
         return $this;
     }
 
-    public function setCreatedAt(DateTimeInterface $datetime): self
+    public function setCreatedAt(\DateTimeInterface $datetime): self
     {
         $this->createdAt = $datetime;
 
@@ -1298,7 +1349,6 @@ class AccompanyingPeriod implements
     /**
      * Set openingDate.
      *
-     *
      * @return AccompanyingPeriod
      */
     public function setOpeningDate(mixed $openingDate)
@@ -1322,7 +1372,7 @@ class AccompanyingPeriod implements
     /**
      * @Groups({"write"})
      */
-    public function setPersonLocation(?Person $person = null): self
+    public function setPersonLocation(Person $person = null): self
     {
         if ($this->personLocation !== $person) {
             $this->personLocation = $person;
@@ -1331,7 +1381,7 @@ class AccompanyingPeriod implements
                 $this->setAddressLocation(null);
                 $locationHistory = new AccompanyingPeriodLocationHistory();
                 $locationHistory
-                    ->setStartDate(new DateTimeImmutable('now'))
+                    ->setStartDate(new \DateTimeImmutable('now'))
                     ->setPersonLocation($person);
 
                 $this->addLocationHistory($locationHistory);
@@ -1344,7 +1394,7 @@ class AccompanyingPeriod implements
     /**
      * @Groups({"write"})
      */
-    public function setPinnedComment(?Comment $comment = null): self
+    public function setPinnedComment(Comment $comment = null): self
     {
         if (null !== $this->pinnedComment) {
             $this->addComment($this->pinnedComment);
@@ -1355,7 +1405,7 @@ class AccompanyingPeriod implements
         return $this;
     }
 
-    public function setRemark(?string $remark = null): self
+    public function setRemark(string $remark = null): self
     {
         $this->remark = (string) $remark;
 
@@ -1369,7 +1419,9 @@ class AccompanyingPeriod implements
      * instance of Person
      *
      * @param $requestor Person|ThirdParty
+     *
      * @throw UnexpectedValueException if the requestor is not a Person or ThirdParty
+     *
      * @Groups({"write"})
      */
     public function setRequestor($requestor): self
@@ -1384,7 +1436,7 @@ class AccompanyingPeriod implements
             $this->setRequestorPerson(null);
             $this->setRequestorThirdParty(null);
         } else {
-            throw new UnexpectedValueException('requestor is not an instance of Person or ThirdParty');
+            throw new \UnexpectedValueException('requestor is not an instance of Person or ThirdParty');
         }
 
         return $this;
@@ -1410,7 +1462,7 @@ class AccompanyingPeriod implements
         if (self::STEP_DRAFT !== $this->step && $previous !== $step) {
             // we create a new history
             $history = new AccompanyingPeriodStepHistory();
-            $history->setStep($this->step)->setStartDate(new DateTimeImmutable('now'));
+            $history->setStep($this->step)->setStartDate(new \DateTimeImmutable('now'));
 
             $this->addStepHistory($history);
         }
@@ -1418,7 +1470,7 @@ class AccompanyingPeriod implements
         return $this;
     }
 
-    public function setUpdatedAt(DateTimeInterface $datetime): self
+    public function setUpdatedAt(\DateTimeInterface $datetime): self
     {
         $this->updatedAt = $datetime;
 
@@ -1441,7 +1493,7 @@ class AccompanyingPeriod implements
 
             foreach ($this->userHistories as $history) {
                 if (null === $history->getEndDate()) {
-                    $history->setEndDate(new DateTimeImmutable('now'));
+                    $history->setEndDate(new \DateTimeImmutable('now'));
                 }
             }
 
@@ -1471,7 +1523,7 @@ class AccompanyingPeriod implements
         // first location history
         $locationHistory = new AccompanyingPeriodLocationHistory();
         $locationHistory
-            ->setStartDate(new DateTimeImmutable('now'))
+            ->setStartDate(new \DateTimeImmutable('now'))
             ->setPersonLocation($this->getPersonLocation())
             ->setAddressLocation($this->getAddressLocation());
         $this->addLocationHistory($locationHistory);
@@ -1483,7 +1535,7 @@ class AccompanyingPeriod implements
         $criteria = new Criteria();
         $criteria->orderBy(['startDate' => Criteria::ASC, 'id' => Criteria::ASC]);
 
-        /** @var Iterator $steps */
+        /** @var \Iterator $steps */
         $steps = $this->getStepHistories()->matching($criteria)->getIterator();
         $steps->rewind();
 
@@ -1498,7 +1550,7 @@ class AccompanyingPeriod implements
 
         if ($this->getOpeningDate()->format('Y-m-d') !== $current->getStartDate()->format('Y-m-d')
             && ($this->getOpeningDate() <= $current->getEndDate() || null === $current->getEndDate())) {
-            $current->setStartDate(DateTimeImmutable::createFromMutable($this->getOpeningDate()));
+            $current->setStartDate(\DateTimeImmutable::createFromMutable($this->getOpeningDate()));
         }
 
         // then we set all the end date to the start date of the next one
@@ -1514,14 +1566,14 @@ class AccompanyingPeriod implements
         } while ($steps->valid());
     }
 
-    private function setRequestorPerson(?Person $requestorPerson = null): self
+    private function setRequestorPerson(Person $requestorPerson = null): self
     {
         $this->requestorPerson = $requestorPerson;
 
         return $this;
     }
 
-    private function setRequestorThirdParty(?ThirdParty $requestorThirdParty = null): self
+    private function setRequestorThirdParty(ThirdParty $requestorThirdParty = null): self
     {
         $this->requestorThirdParty = $requestorThirdParty;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodInfo.php
index 7a762e487..d68292927 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodInfo.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodInfo.php
@@ -16,7 +16,7 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Informations about AccompanyingPeriod
+ * Informations about AccompanyingPeriod.
  *
  * This entity allow access to some basic information about the AccompanyingPeriod. It is
  * populated from a SQL view, dynamically build from various sources.
@@ -26,6 +26,7 @@ use Doctrine\ORM\Mapping as ORM;
  * - get the user involved with an accompanying period
  *
  * @ORM\Entity()
+ *
  * @ORM\Table(name="view_chill_person_accompanying_period_info")
  */
 class AccompanyingPeriodInfo
@@ -33,44 +34,53 @@ class AccompanyingPeriodInfo
     public function __construct(
         /**
          * @var AccompanyingPeriod
+         *
          * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class)
          */
         public readonly AccompanyingPeriod $accompanyingPeriod,
 
         /**
          * @var string
+         *
          * @ORM\Column(type="text")
+         *
          * @ORM\Id
          */
         public readonly string $relatedEntity,
 
         /**
          * @var int
+         *
          * @ORM\Column(type="integer")
+         *
          * @ORM\Id
          */
         public readonly int $relatedEntityId,
 
         /**
          * @var User
+         *
          * @ORM\ManyToOne(targetEntity=User::class)
          */
-        public readonly ?User  $user,
+        public readonly ?User $user,
 
         /**
          * @var \DateTimeImmutable
+         *
          * @ORM\Column(type="datetime_immutable")
          */
         public readonly \DateTimeImmutable $infoDate,
 
         /**
          * @var array
+         *
          * @ORM\Column(type="json")
          */
         public readonly array $metadata,
 
         /**
          * @var string
+         *
          * @ORM\Column(type="text")
          */
         public readonly string $discriminator,
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodLocationHistory.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodLocationHistory.php
index 8b2839636..700076506 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodLocationHistory.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodLocationHistory.php
@@ -16,11 +16,11 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Entity\Address;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_person_accompanying_period_location_history")
  */
 class AccompanyingPeriodLocationHistory implements TrackCreationInterface
@@ -35,11 +35,13 @@ class AccompanyingPeriodLocationHistory implements TrackCreationInterface
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -57,14 +59,14 @@ class AccompanyingPeriodLocationHistory implements TrackCreationInterface
     /**
      * @ORM\Column(type="date_immutable")
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     public function getAddressLocation(): ?Address
     {
         return $this->addressLocation;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -84,7 +86,7 @@ class AccompanyingPeriodLocationHistory implements TrackCreationInterface
         return $this->personLocation;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -96,7 +98,7 @@ class AccompanyingPeriodLocationHistory implements TrackCreationInterface
         return $this;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): AccompanyingPeriodLocationHistory
+    public function setEndDate(?\DateTimeImmutable $endDate): AccompanyingPeriodLocationHistory
     {
         $this->endDate = $endDate;
 
@@ -120,7 +122,7 @@ class AccompanyingPeriodLocationHistory implements TrackCreationInterface
         return $this;
     }
 
-    public function setStartDate(?DateTimeImmutable $startDate): AccompanyingPeriodLocationHistory
+    public function setStartDate(?\DateTimeImmutable $startDate): AccompanyingPeriodLocationHistory
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodStepHistory.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodStepHistory.php
index f9baffa35..15b2f0d2e 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodStepHistory.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodStepHistory.php
@@ -17,11 +17,11 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_person_accompanying_period_step_history")
  */
 class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpdateInterface
@@ -33,11 +33,13 @@ class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpda
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -50,14 +52,14 @@ class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpda
     /**
      * @ORM\Column(type="date_immutable")
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     /**
      * @ORM\Column(type="text", nullable=false)
      */
     private string $step;
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -72,7 +74,7 @@ class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpda
         return $this->period;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -82,7 +84,7 @@ class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpda
         return $this->step;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): self
+    public function setEndDate(?\DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
 
@@ -99,7 +101,7 @@ class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpda
         return $this;
     }
 
-    public function setStartDate(?DateTimeImmutable $startDate): self
+    public function setStartDate(?\DateTimeImmutable $startDate): self
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 0c17276ae..8dfb9155a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -22,19 +22,18 @@ use Chill\PersonBundle\Entity\SocialWork\Result;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ReadableCollection;
 use Doctrine\ORM\Mapping as ORM;
-use LogicException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_accompanying_period_work")
+ *
  * @Serializer\DiscriminatorMap(
  *     typeProperty="type",
  *     mapping={
@@ -46,7 +45,9 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 {
     /**
      * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class)
+     *
      * @Serializer\Groups({"read", "read:accompanyingPeriodWork:light"})
+     *
      * @Serializer\Context(normalizationContext={"groups": {"read"}}, groups={"read:accompanyingPeriodWork:light"})
      */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
@@ -58,8 +59,11 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
      *     cascade={"remove", "persist"},
      *     orphanRemoval=true
      * )
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @ORM\OrderBy({"startDate": "DESC", "id": "DESC"})
+     *
      * @var Collection<AccompanyingPeriodWorkEvaluation>
      *
      * @internal /!\ the serialization for write evaluations is handled in `AccompanyingPeriodWorkDenormalizer`
@@ -68,48 +72,57 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @ORM\Column(type="datetime_immutable")
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      */
-    private ?DateTimeImmutable $createdAt = null;
+    private ?\DateTimeImmutable $createdAt = null;
 
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      */
     private bool $createdAutomatically = false;
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      */
     private string $createdAutomaticallyReason = '';
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      */
     private ?User $createdBy = null;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"accompanying_period_work:create"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
+     *
      * @Assert\GreaterThanOrEqual(propertyPath="startDate",
      *     message="accompanying_course_work.The endDate should be greater or equal than the start date"
      * )
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @var Collection<AccompanyingPeriodWorkGoal>
+     *
      * @ORM\OneToMany(
      *     targetEntity=AccompanyingPeriodWorkGoal::class,
      *     mappedBy="accompanyingPeriodWork",
      *     cascade={"persist"},
      *     orphanRemoval=true
      * )
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      */
@@ -117,6 +130,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      *
@@ -126,22 +140,29 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light", "read:evaluation:include-work"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Serializer\Groups({"read", "accompanying_period_work:edit", "docgen:read"})
      */
     private string $note = '';
 
     /**
      * @var Collection<Person>
+     *
      * @ORM\ManyToMany(targetEntity=Person::class)
+     *
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_person")
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      * @Serializer\Groups({"accompanying_period_work:create"})
@@ -150,20 +171,25 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
+     *
      * @Serializer\Groups({"read", "accompanying_period_work:edit"})
      */
     private PrivateCommentEmbeddable $privateComment;
 
     /**
      * @var Collection<int, AccompanyingPeriodWorkReferrerHistory>
+     *
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodWorkReferrerHistory::class, cascade={"persist", "remove"}, mappedBy="accompanyingPeriodWork", orphanRemoval=true)
      */
     private Collection $referrersHistory;
 
     /**
      * @var Collection<Result>
+     *
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="accompanyingPeriodWorks")
+     *
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_result")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      */
@@ -171,26 +197,32 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @ORM\ManyToOne(targetEntity=SocialAction::class)
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      * @Serializer\Groups({"accompanying_period_work:create"})
+     *
      * @Serializer\Context(normalizationContext={"groups": {"read"}}, groups={"read:accompanyingPeriodWork:light"})
      */
     private ?SocialAction $socialAction = null;
 
     /**
      * @ORM\Column(type="date_immutable")
+     *
      * @Serializer\Groups({"accompanying_period_work:create"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     /**
      * @var Collection<ThirdParty>
+     *
      * @ORM\ManyToMany(targetEntity=ThirdParty::class)
+     *
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_third_party")
      *
      * In schema : intervenants
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      */
@@ -198,13 +230,16 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @ORM\Column(type="datetime_immutable")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?User $updatedBy = null;
@@ -253,7 +288,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     {
         if (!$this->getReferrers()->contains($referrer)) {
             $this->referrersHistory[] =
-                new AccompanyingPeriodWorkReferrerHistory($this, $referrer, new DateTimeImmutable('today'));
+                new AccompanyingPeriodWorkReferrerHistory($this, $referrer, new \DateTimeImmutable('today'));
         }
 
         return $this;
@@ -290,7 +325,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->accompanyingPeriodWorkEvaluations;
     }
 
-    public function getCreatedAt(): ?DateTimeImmutable
+    public function getCreatedAt(): ?\DateTimeImmutable
     {
         return $this->createdAt;
     }
@@ -310,7 +345,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->createdBy;
     }
 
-    public function getEndDate(): ?DateTimeInterface
+    public function getEndDate(): ?\DateTimeInterface
     {
         return $this->endDate;
     }
@@ -350,6 +385,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @return ReadableCollection<int, User>
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      * @Serializer\Groups({"accompanying_period_work:create"})
@@ -366,7 +402,6 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->referrersHistory;
     }
 
-
     /**
      * @return Collection<int, Result>
      */
@@ -385,7 +420,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return new ArrayCollection([$this->getSocialAction()->getIssue()]);
     }
 
-    public function getStartDate(): ?DateTimeInterface
+    public function getStartDate(): ?\DateTimeInterface
     {
         return $this->startDate;
     }
@@ -403,7 +438,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->getThirdParties();
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -445,7 +480,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     {
         foreach ($this->referrersHistory as $history) {
             if ($history->isOpen() && $referrer === $history->getUser()) {
-                $history->setEndDate(new DateTimeImmutable('today'));
+                $history->setEndDate(new \DateTimeImmutable('today'));
 
                 if ($history->isDateRangeEmpty()) {
                     $history->removeAccompanyingPeriodWork();
@@ -488,7 +523,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
             $this->accompanyingPeriod instanceof AccompanyingPeriod
             && $accompanyingPeriod !== $this->accompanyingPeriod
         ) {
-            throw new LogicException('A work cannot change accompanyingPeriod');
+            throw new \LogicException('A work cannot change accompanyingPeriod');
         }
 
         $this->accompanyingPeriod = $accompanyingPeriod;
@@ -496,7 +531,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
-    public function setCreatedAt(DateTimeInterface $createdAt): self
+    public function setCreatedAt(\DateTimeInterface $createdAt): self
     {
         $this->createdAt = $createdAt;
 
@@ -524,7 +559,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
-    public function setEndDate(?DateTimeInterface $endDate = null): self
+    public function setEndDate(\DateTimeInterface $endDate = null): self
     {
         $this->endDate = $endDate;
 
@@ -559,14 +594,14 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
-    public function setStartDate(DateTimeInterface $startDate): self
+    public function setStartDate(\DateTimeInterface $startDate): self
     {
         $this->startDate = $startDate;
 
         return $this;
     }
 
-    public function setUpdatedAt(DateTimeInterface $datetime): TrackUpdateInterface
+    public function setUpdatedAt(\DateTimeInterface $datetime): TrackUpdateInterface
     {
         $this->updatedAt = $datetime;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index 4d401f6c5..7f2fc981c 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -16,18 +16,16 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use DateInterval;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use LogicException;
-use RuntimeException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_person_accompanying_period_work_evaluation")
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "accompanying_period_work_evaluation": AccompanyingPeriodWorkEvaluation::class,
  * })
@@ -39,13 +37,16 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
      *     targetEntity=AccompanyingPeriodWork::class,
      *     inversedBy="accompanyingPeriodWorkEvaluations"
      * )
+     *
      * @Serializer\Groups({"read:evaluation:include-work"})
+     *
      * @Serializer\Context(normalizationContext={"groups": {"read:accompanyingPeriodWork:light"}}, groups={"read:evaluation:include-work"})
      */
     private ?AccompanyingPeriodWork $accompanyingPeriodWork = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
@@ -54,14 +55,16 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
-    private ?DateTimeImmutable $createdAt = null;
+    private ?\DateTimeImmutable $createdAt = null;
 
     /**
      * @ORM\ManyToOne(
      *     targetEntity=User::class
      * )
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?User $createdBy = null;
@@ -77,24 +80,29 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
      *     cascade={"remove", "persist"},
      *     orphanRemoval=true
      * )
+     *
      * @ORM\OrderBy({"createdAt": "DESC", "id": "DESC"})
+     *
      * @Serializer\Groups({"read"})
+     *
      * @var Collection<AccompanyingPeriodWorkEvaluationDocument>
      */
     private Collection $documents;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\ManyToOne(
      *     targetEntity=Evaluation::class
      * )
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
@@ -102,8 +110,11 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
@@ -118,51 +129,55 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
      * @Serializer\Groups({"read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
-     *
-     * @var mixed
      */
     private $key;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
-    private ?DateTimeImmutable $maxDate = null;
+    private ?\DateTimeImmutable $maxDate = null;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(
      *     targetEntity=User::class
      * )
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?User $updatedBy = null;
 
     /**
      * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
-    private ?DateInterval $warningInterval = null;
+    private ?\DateInterval $warningInterval = null;
 
     /**
      * @ORM\Column(type="integer", nullable=true)
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
@@ -194,7 +209,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
         return $this->comment;
     }
 
-    public function getCreatedAt(): ?DateTimeImmutable
+    public function getCreatedAt(): ?\DateTimeImmutable
     {
         return $this->createdAt;
     }
@@ -212,7 +227,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
         return $this->documents;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -229,25 +244,23 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
 
     /**
      * Arbitrary data, used for client.
-     *
-     * @return mixed
      */
     public function getKey()
     {
         return $this->key;
     }
 
-    public function getMaxDate(): ?DateTimeImmutable
+    public function getMaxDate(): ?\DateTimeImmutable
     {
         return $this->maxDate;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -260,7 +273,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     /**
      * @Serializer\Groups({"docgen:read"})
      */
-    public function getWarningDate(): ?DateTimeImmutable
+    public function getWarningDate(): ?\DateTimeImmutable
     {
         if (null === $this->getEndDate() || null === $this->getWarningInterval()) {
             return null;
@@ -269,7 +282,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
         return $this->getEndDate()->sub($this->getWarningInterval());
     }
 
-    public function getWarningInterval(): ?DateInterval
+    public function getWarningInterval(): ?\DateInterval
     {
         return $this->warningInterval;
     }
@@ -294,8 +307,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
             && $this->accompanyingPeriodWork instanceof AccompanyingPeriodWork
             && $this->accompanyingPeriodWork->getId() !== $accompanyingPeriodWork->getId()
         ) {
-            throw new RuntimeException('Changing the ' .
-            'accompanyingPeriodWork is not allowed');
+            throw new \RuntimeException('Changing the accompanyingPeriodWork is not allowed');
         }
 
         $this->accompanyingPeriodWork = $accompanyingPeriodWork;
@@ -311,11 +323,9 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     }
 
     /**
-     * @param DateTimeImmutable|null $createdAt
-     *
-     * @return AccompanyingPeriodWorkEvaluation
+     * @param \DateTimeImmutable|null $createdAt
      */
-    public function setCreatedAt(DateTimeInterface $createdAt): self
+    public function setCreatedAt(\DateTimeInterface $createdAt): self
     {
         $this->createdAt = $createdAt;
 
@@ -329,7 +339,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
         return $this;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): AccompanyingPeriodWorkEvaluation
+    public function setEndDate(?\DateTimeImmutable $endDate): AccompanyingPeriodWorkEvaluation
     {
         $this->endDate = $endDate;
 
@@ -354,7 +364,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
         ) {
             $cl = AccompanyingPeriodWorkEvaluation::class;
 
-            throw new LogicException("once set, an {$cl}  cannot
+            throw new \LogicException("once set, an {$cl}  cannot
                 change or remove the linked Evaluation::class");
         }
 
@@ -365,8 +375,6 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
 
     /**
      * Arbitrary data, used for client.
-     *
-     *
      */
     public function setKey(mixed $key): self
     {
@@ -375,14 +383,14 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
         return $this;
     }
 
-    public function setMaxDate(?DateTimeImmutable $maxDate): AccompanyingPeriodWorkEvaluation
+    public function setMaxDate(?\DateTimeImmutable $maxDate): AccompanyingPeriodWorkEvaluation
     {
         $this->maxDate = $maxDate;
 
         return $this;
     }
 
-    public function setStartDate(?DateTimeImmutable $startDate): AccompanyingPeriodWorkEvaluation
+    public function setStartDate(?\DateTimeImmutable $startDate): AccompanyingPeriodWorkEvaluation
     {
         $this->startDate = $startDate;
 
@@ -390,11 +398,9 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     }
 
     /**
-     * @param DateTimeImmutable|null $updatedAt
-     *
-     * @return AccompanyingPeriodWorkEvaluation
+     * @param \DateTimeImmutable|null $updatedAt
      */
-    public function setUpdatedAt(DateTimeInterface $updatedAt): self
+    public function setUpdatedAt(\DateTimeInterface $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
 
@@ -408,7 +414,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
         return $this;
     }
 
-    public function setWarningInterval(?DateInterval $warningInterval): AccompanyingPeriodWorkEvaluation
+    public function setWarningInterval(?\DateInterval $warningInterval): AccompanyingPeriodWorkEvaluation
     {
         $this->warningInterval = $warningInterval;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
index b3ad86ed6..e5ddc059a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
@@ -16,13 +16,14 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Doctrine\ORM\Mapping as ORM;
-use RuntimeException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_person_accompanying_period_work_evaluation_document")
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "accompanying_period_work_evaluation_document": AccompanyingPeriodWorkEvaluationDocument::class
  * })
@@ -43,11 +44,15 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      *
      * @internal the default name exceeds 64 characters, we must set manually:
+     *
      * @ORM\SequenceGenerator(sequenceName="chill_person_social_work_eval_doc_id_seq", allocationSize=1, initialValue=1000)
+     *
      * @Serializer\Groups({"read"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
@@ -63,8 +68,6 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      * @Serializer\Groups({"read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
-     *
-     * @var mixed
      */
     private $key;
 
@@ -72,9 +75,11 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      * @ORM\ManyToOne(
      *     targetEntity=StoredObject::class,
      * )
+     *
      * @Serializer\Groups({"read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     *
      * @Assert\Valid
      */
     private ?StoredObject $storedObject = null;
@@ -83,6 +88,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      * @ORM\ManyToOne(
      *     targetEntity=DocGeneratorTemplate::class
      * )
+     *
      * @Serializer\Groups({"read"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
@@ -90,6 +96,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Serializer\Groups({"read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
@@ -106,9 +113,6 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
         return $this->id;
     }
 
-    /**
-     * @return mixed
-     */
     public function getKey()
     {
         return $this->key;
@@ -138,7 +142,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
             && $accompanyingPeriodWorkEvaluation instanceof AccompanyingPeriodWorkEvaluation
         ) {
             if ($this->accompanyingPeriodWorkEvaluation !== $accompanyingPeriodWorkEvaluation) {
-                throw new RuntimeException('It is not allowed to change the evaluation for a document');
+                throw new \RuntimeException('It is not allowed to change the evaluation for a document');
             }
         }
         $this->accompanyingPeriodWorkEvaluation = $accompanyingPeriodWorkEvaluation;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
index f59c45ccd..f02ade804 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
@@ -16,12 +16,13 @@ use Chill\PersonBundle\Entity\SocialWork\Result;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use LogicException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_accompanying_period_work_goal")
+ *
  * @Serializer\DiscriminatorMap(
  *     typeProperty="type",
  *     mapping={
@@ -38,6 +39,7 @@ class AccompanyingPeriodWorkGoal
 
     /**
      * @ORM\ManyToOne(targetEntity=Goal::class)
+     *
      * @Serializer\Groups({"accompanying_period_work:edit"})
      * @Serializer\Groups({"read", "docgen:read"})
      */
@@ -45,14 +47,18 @@ class AccompanyingPeriodWorkGoal
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Serializer\Groups({"accompanying_period_work:edit"})
      * @Serializer\Groups({"read"})
      */
@@ -60,8 +66,11 @@ class AccompanyingPeriodWorkGoal
 
     /**
      * @var Collection<Result>
+     *
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="accompanyingPeriodWorkGoals")
+     *
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_goal_result")
+     *
      * @Serializer\Groups({"accompanying_period_work:edit"})
      * @Serializer\Groups({"read", "docgen:read"})
      */
@@ -123,7 +132,7 @@ class AccompanyingPeriodWorkGoal
             && $accompanyingPeriodWork !== $this->accompanyingPeriodWork
             && null !== $accompanyingPeriodWork
         ) {
-            throw new LogicException('Change accompanying period work is not allowed');
+            throw new \LogicException('Change accompanying period work is not allowed');
         }
 
         $this->accompanyingPeriodWork = $accompanyingPeriodWork;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkReferrerHistory.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkReferrerHistory.php
index 057b5a409..0086faab2 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkReferrerHistory.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkReferrerHistory.php
@@ -20,6 +20,7 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_accompanying_period_work_referrer")
  */
 class AccompanyingPeriodWorkReferrerHistory implements TrackCreationInterface, TrackUpdateInterface
@@ -29,13 +30,14 @@ class AccompanyingPeriodWorkReferrerHistory implements TrackCreationInterface, T
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
 
     /**
-     * @var \DateTimeImmutable|null
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      */
     private ?\DateTimeImmutable $endDate = null;
@@ -47,11 +49,13 @@ class AccompanyingPeriodWorkReferrerHistory implements TrackCreationInterface, T
         private ?AccompanyingPeriodWork $accompanyingPeriodWork,
         /**
          * @var User
+         *
          * @ORM\ManyToOne(targetEntity=User::class)
          */
         private User $user,
         /**
          * @var \DateTimeImmutable
+         *
          * @ORM\Column(type="date_immutable", nullable=false)
          */
         private \DateTimeImmutable $startDate
@@ -70,6 +74,7 @@ class AccompanyingPeriodWorkReferrerHistory implements TrackCreationInterface, T
     public function setEndDate(?\DateTimeImmutable $endDate): AccompanyingPeriodWorkReferrerHistory
     {
         $this->endDate = $endDate;
+
         return $this;
     }
 
@@ -89,9 +94,7 @@ class AccompanyingPeriodWorkReferrerHistory implements TrackCreationInterface, T
     }
 
     /**
-     * to be used when the history is removed (when startDate = endDate)
-     *
-     * @return self
+     * to be used when the history is removed (when startDate = endDate).
      */
     public function removeAccompanyingPeriodWork(): self
     {
@@ -111,7 +114,7 @@ class AccompanyingPeriodWorkReferrerHistory implements TrackCreationInterface, T
     /**
      * return true if the date range is empty (start date and end date are equal).
      *
-     * @return bool true if the start date and end date are equal.
+     * @return bool true if the start date and end date are equal
      */
     public function isDateRangeEmpty(): bool
     {
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
index dbe75158d..97938dafc 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
@@ -20,6 +20,7 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * ClosingMotive give an explanation why we closed the Accompanying period.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_accompanying_period_closingmotive")
  */
 class ClosingMotive
@@ -33,6 +34,7 @@ class ClosingMotive
      * Child Accompanying periods.
      *
      * @var Collection<ClosingMotive>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive",
      * mappedBy="parent")
@@ -40,18 +42,21 @@ class ClosingMotive
     private Collection $children;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
@@ -62,8 +67,6 @@ class ClosingMotive
     private float $ordering = 0.0;
 
     /**
-     * @var self
-     *
      * @ORM\ManyToOne(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive",
      * inversedBy="children")
@@ -155,7 +158,7 @@ class ClosingMotive
 
     public function isLeaf(): bool
     {
-        return $this->children->count() === 0;
+        return 0 === $this->children->count();
     }
 
     public function isParent(): bool
@@ -229,7 +232,7 @@ class ClosingMotive
         $this->parent = $parent;
 
         if (null !== $parent) {
-            //$parent->addChildren($this);
+            // $parent->addChildren($this);
         }
 
         return $this;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
index 1652a45e9..aed611d80 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
@@ -23,7 +22,9 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_accompanying_period_comment")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "accompanying_period_comment": Comment::class
  * })
@@ -34,48 +35,61 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
      * @ORM\ManyToOne(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod",
      * inversedBy="comments")
+     *
      * @ORM\JoinColumn(nullable=false, onDelete="CASCADE")
      */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Groups({"read", "write", "docgen:read"})
+     *
      * @Assert\NotBlank
+     *
      * @Assert\NotNull
      */
     private ?string $content = null;
 
     /**
      * @ORM\Column(type="datetime")
+     *
      * @Groups({"read", "docgen:read"})
      */
-    private ?DateTimeInterface $createdAt = null;
+    private ?\DateTimeInterface $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?User $creator = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="datetime")
+     *
      * @Groups({"read"})
      */
-    private ?DateTimeInterface $updatedAt = null;
+    private ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Groups({"read"})
      */
     private ?User $updatedBy = null;
@@ -90,7 +104,7 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
         return $this->content;
     }
 
-    public function getCreatedAt(): ?DateTimeInterface
+    public function getCreatedAt(): ?\DateTimeInterface
     {
         return $this->createdAt;
     }
@@ -105,7 +119,7 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
         return $this->id;
     }
 
-    public function getUpdatedAt(): ?DateTimeInterface
+    public function getUpdatedAt(): ?\DateTimeInterface
     {
         return $this->updatedAt;
     }
@@ -134,7 +148,7 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setCreatedAt(DateTimeInterface $createdAt): self
+    public function setCreatedAt(\DateTimeInterface $createdAt): self
     {
         $this->createdAt = $createdAt;
 
@@ -153,7 +167,7 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setUpdatedAt(DateTimeInterface $updatedAt): self
+    public function setUpdatedAt(\DateTimeInterface $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
index b7cfd0e0c..979fd4581 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
@@ -11,13 +11,14 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_accompanying_period_origin")
+ *
  * @Serializer\DiscriminatorMap(
  *     typeProperty="type",
  *     mapping={
@@ -28,24 +29,30 @@ class Origin
 {
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $label = [];
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
-    private ?DateTimeImmutable $noActiveAfter = null;
+    private ?\DateTimeImmutable $noActiveAfter = null;
 
     public function getId(): ?int
     {
@@ -57,7 +64,7 @@ class Origin
         return $this->label;
     }
 
-    public function getNoActiveAfter(): ?DateTimeImmutable
+    public function getNoActiveAfter(): ?\DateTimeImmutable
     {
         return $this->noActiveAfter;
     }
@@ -69,7 +76,7 @@ class Origin
         return $this;
     }
 
-    public function setNoActiveAfter(?DateTimeImmutable $noActiveAfter): self
+    public function setNoActiveAfter(?\DateTimeImmutable $noActiveAfter): self
     {
         $this->noActiveAfter = $noActiveAfter;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php
index abe171df1..515816637 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php
@@ -17,19 +17,21 @@ use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
-use UnexpectedValueException;
 
 /**
  * **About denormalization**: this operation is operated by @see{AccompanyingPeriodResourdeNormalizer}.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_person_accompanying_period_resource",
  *     uniqueConstraints={
+ *
  *         @ORM\UniqueConstraint(name="person_unique", columns={"person_id", "accompanyingperiod_id"}),
  *         @ORM\UniqueConstraint(name="thirdparty_unique", columns={"thirdparty_id", "accompanyingperiod_id"})
  *     }
  * )
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "accompanying_period_resource": Resource::class
  * })
@@ -41,34 +43,43 @@ class Resource
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod",
      *     inversedBy="resources"
      * )
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
 
     /**
      * @ORM\Column(type="text", nullable=true)
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?string $comment = '';
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"docgen:read"})
      */
     private ?Person $person = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"docgen:read"})
      */
     private ?ThirdParty $thirdParty = null;
@@ -113,7 +124,7 @@ class Resource
         return $this;
     }
 
-    public function setComment(?string $comment = null): self
+    public function setComment(string $comment = null): self
     {
         $this->comment = (string) $comment;
 
@@ -135,12 +146,7 @@ class Resource
             $this->setPerson(null);
             $this->setThirdParty(null);
         } else {
-            throw new UnexpectedValueException(sprintf(
-                'the resource ' .
-                'should be an instance of %s or %s',
-                Person::class,
-                ThirdParty::class
-            ));
+            throw new \UnexpectedValueException(sprintf('the resource should be an instance of %s or %s', Person::class, ThirdParty::class));
         }
 
         return $this;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php
index 3e8276596..ab9ca7c7d 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_person_accompanying_period_user_history")
  */
 class UserHistory implements TrackCreationInterface
@@ -29,11 +29,13 @@ class UserHistory implements TrackCreationInterface
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -41,11 +43,13 @@ class UserHistory implements TrackCreationInterface
     public function __construct(
         /**
          * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class, inversedBy="userHistories")
+         *
          * @ORM\JoinColumn(nullable=false)
          */
-        private ?\Chill\PersonBundle\Entity\AccompanyingPeriod $accompanyingPeriod,
+        private ?AccompanyingPeriod $accompanyingPeriod,
         /**
          * @ORM\ManyToOne(targetEntity=User::class)
+         *
          * @ORM\JoinColumn(nullable=false)
          */
         private User $user,
@@ -53,7 +57,7 @@ class UserHistory implements TrackCreationInterface
         /**
          * @ORM\Column(type="datetime_immutable", nullable=false, options={"default": "now()"})
          */
-        private DateTimeImmutable $startDate = new DateTimeImmutable('now')
+        private \DateTimeImmutable $startDate = new \DateTimeImmutable('now')
     ) {}
 
     public function getAccompanyingPeriod(): AccompanyingPeriod
@@ -61,7 +65,7 @@ class UserHistory implements TrackCreationInterface
         return $this->accompanyingPeriod;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -71,7 +75,7 @@ class UserHistory implements TrackCreationInterface
         return $this->id;
     }
 
-    public function getStartDate(): DateTimeImmutable
+    public function getStartDate(): \DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -81,7 +85,7 @@ class UserHistory implements TrackCreationInterface
         return $this->user;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): UserHistory
+    public function setEndDate(?\DateTimeImmutable $endDate): UserHistory
     {
         $this->endDate = $endDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
index 2f3b0798e..964f66f1a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Entity;
 
-use DateTime;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
@@ -21,7 +19,9 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * AccompanyingPeriodParticipation Class.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_accompanying_period_participation")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "accompanying_period_participation": AccompanyingPeriodParticipation::class
  * })
@@ -30,36 +30,44 @@ class AccompanyingPeriodParticipation
 {
     /**
      * @ORM\Column(type="date", nullable=true)
+     *
      * @Groups({"read", "docgen:read"})
      */
-    private ?DateTime $endDate = null;
+    private ?\DateTime $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="date", nullable=false)
+     *
      * @Groups({"read", "docgen:read"})
      */
-    private ?DateTime $startDate = null;
+    private ?\DateTime $startDate = null;
 
     public function __construct(/**
      * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class, inversedBy="participations", cascade={"persist"})
+     *
      * @ORM\JoinColumn(name="accompanyingperiod_id", referencedColumnName="id", nullable=false)
      */
-        private ?\Chill\PersonBundle\Entity\AccompanyingPeriod $accompanyingPeriod, /**
+        private ?AccompanyingPeriod $accompanyingPeriod, /**
      * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="accompanyingPeriodParticipations")
+     *
      * @ORM\JoinColumn(name="person_id", referencedColumnName="id", nullable=false)
+     *
      * @Groups({"read", "docgen:read"})
      */
-        private ?\Chill\PersonBundle\Entity\Person $person
+        private ?Person $person
     ) {
-        $this->startDate = new DateTime('now');
+        $this->startDate = new \DateTime('now');
         $person->getAccompanyingPeriodParticipations()->add($this);
     }
 
@@ -68,7 +76,7 @@ class AccompanyingPeriodParticipation
         return $this->accompanyingPeriod;
     }
 
-    public function getEndDate(): ?DateTimeInterface
+    public function getEndDate(): ?\DateTimeInterface
     {
         return $this->endDate;
     }
@@ -83,7 +91,7 @@ class AccompanyingPeriodParticipation
         return $this->person;
     }
 
-    public function getStartDate(): ?DateTimeInterface
+    public function getStartDate(): ?\DateTimeInterface
     {
         return $this->startDate;
     }
@@ -100,7 +108,7 @@ class AccompanyingPeriodParticipation
         return $this;
     }
 
-    public function setEndDate(?DateTime $endDate): self
+    public function setEndDate(?\DateTime $endDate): self
     {
         $this->endDate = $endDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/HasPerson.php b/src/Bundle/ChillPersonBundle/Entity/HasPerson.php
index ab0854a57..ba4f3699d 100644
--- a/src/Bundle/ChillPersonBundle/Entity/HasPerson.php
+++ b/src/Bundle/ChillPersonBundle/Entity/HasPerson.php
@@ -18,5 +18,5 @@ interface HasPerson
 {
     public function getPerson(): ?Person;
 
-    public function setPerson(?Person $person = null): HasPerson;
+    public function setPerson(Person $person = null): HasPerson;
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
index 864635acf..6d5bdf674 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
@@ -11,14 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Entity\Household;
 
-use ArrayIterator;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Validator\Constraints\Household\MaxHolder;
-use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
@@ -27,18 +23,19 @@ use Doctrine\Common\Collections\Selectable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
-
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function count;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_person_household"
  * )
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "household": Household::class
  * })
+ *
  * @MaxHolder(groups={"household_memberships"})
  */
 class Household
@@ -47,11 +44,15 @@ class Household
      * Addresses.
      *
      * @var Collection<Address>
+     *
      * @ORM\ManyToMany(
      *     targetEntity="Chill\MainBundle\Entity\Address",
      * cascade={"persist", "remove", "merge", "detach"})
+     *
      * @ORM\JoinTable(name="chill_person_household_to_addresses")
+     *
      * @ORM\OrderBy({"validFrom": "DESC", "id": "DESC"})
+     *
      * @Serializer\Groups({"write"})
      */
     private Collection $addresses;
@@ -63,46 +64,56 @@ class Household
 
     /**
      * @var Collection&Selectable<int, HouseholdComposition>
+     *
      * @ORM\OneToMany(
      *     targetEntity=HouseholdComposition::class,
      *     mappedBy="household",
      *     orphanRemoval=true,
      *     cascade={"persist"}
      * )
+     *
      * @ORM\OrderBy({"startDate": "DESC"})
+     *
      * @Assert\Valid(traverse=true, groups={"household_composition"})
      */
     private Collection&Selectable $compositions;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @var Collection<HouseholdMember>
+     *
      * @ORM\OneToMany(
      *     targetEntity=HouseholdMember::class,
      *     mappedBy="household"
      * )
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private Collection $members;
 
     /**
      * @ORM\Column(type="boolean", name="waiting_for_birth", options={"default": false})
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private bool $waitingForBirth = false;
 
     /**
      * @ORM\Column(type="date_immutable", name="waiting_for_birth_date", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"docgen:read"})
      */
-    private ?DateTimeImmutable $waitingForBirthDate = null;
+    private ?\DateTimeImmutable $waitingForBirthDate = null;
 
     public function __construct()
     {
@@ -200,11 +211,12 @@ class Household
 
     /**
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\SerializedName("current_address")
      */
-    public function getCurrentAddress(?DateTime $at = null): ?Address
+    public function getCurrentAddress(\DateTime $at = null): ?Address
     {
-        $at ??= new DateTime('today');
+        $at ??= new \DateTime('today');
 
         $addrs = $this->getAddresses()->filter(static fn (Address $a) => $a->getValidFrom() <= $at && (
             null === $a->getValidTo() || $a->getValidTo() > $at
@@ -219,11 +231,12 @@ class Household
 
     /**
      * @Serializer\Groups({"docgen:read"})
+     *
      * @Serializer\SerializedName("current_composition")
      */
-    public function getCurrentComposition(?DateTimeImmutable $at = null): ?HouseholdComposition
+    public function getCurrentComposition(\DateTimeImmutable $at = null): ?HouseholdComposition
     {
-        $at ??= new DateTimeImmutable('today');
+        $at ??= new \DateTimeImmutable('today');
         $criteria = new Criteria();
         $expr = Criteria::expr();
 
@@ -249,12 +262,12 @@ class Household
     /**
      * @Serializer\Groups({"docgen:read"})
      */
-    public function getCurrentMembers(?DateTimeImmutable $now = null): Collection
+    public function getCurrentMembers(\DateTimeImmutable $now = null): Collection
     {
         return $this->getMembers()->matching($this->buildCriteriaCurrentMembers($now));
     }
 
-    public function getCurrentMembersByPosition(Position $position, ?DateTimeInterface $now = null)
+    public function getCurrentMembersByPosition(Position $position, \DateTimeInterface $now = null)
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
@@ -270,9 +283,10 @@ class Household
      * Used in serialization
      *
      * @Serializer\Groups({"read"})
+     *
      * @Serializer\SerializedName("current_members_id")
      */
-    public function getCurrentMembersIds(?DateTimeImmutable $now = null): ReadableCollection
+    public function getCurrentMembersIds(\DateTimeImmutable $now = null): ReadableCollection
     {
         return $this->getCurrentMembers($now)->map(
             static fn (HouseholdMember $m) => $m->getId()
@@ -282,22 +296,22 @@ class Household
     /**
      * @return HouseholdMember[]
      */
-    public function getCurrentMembersOrdered(?DateTimeImmutable $now = null): Collection
+    public function getCurrentMembersOrdered(\DateTimeImmutable $now = null): Collection
     {
         $members = $this->getCurrentMembers($now);
 
         $members->getIterator()
             ->uasort(
                 static function (HouseholdMember $a, HouseholdMember $b) {
-                    if ($a->getPosition() === null) {
-                        if ($b->getPosition() === null) {
+                    if (null === $a->getPosition()) {
+                        if (null === $b->getPosition()) {
                             return 0;
                         }
 
                         return -1;
                     }
 
-                    if ($b->getPosition() === null) {
+                    if (null === $b->getPosition()) {
                         return 1;
                     }
 
@@ -324,7 +338,7 @@ class Household
         return $members;
     }
 
-    public function getCurrentMembersWithoutPosition(?DateTimeInterface $now = null)
+    public function getCurrentMembersWithoutPosition(\DateTimeInterface $now = null)
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
@@ -341,7 +355,7 @@ class Household
      *
      * @return ReadableCollection<(int|string), Person>
      */
-    public function getCurrentPersons(?DateTimeImmutable $now = null): ReadableCollection
+    public function getCurrentPersons(\DateTimeImmutable $now = null): ReadableCollection
     {
         return $this->getCurrentMembers($now)
             ->map(static fn (HouseholdMember $m) => $m->getPerson());
@@ -387,7 +401,7 @@ class Household
         return $this->getMembers()->matching($criteria);
     }
 
-    public function getMembersOnRange(DateTimeImmutable $from, ?DateTimeImmutable $to): ReadableCollection
+    public function getMembersOnRange(\DateTimeImmutable $from, ?\DateTimeImmutable $to): ReadableCollection
     {
         return $this->getMembers()->filter(static function (HouseholdMember $m) use ($from, $to) {
             if (null === $m->getEndDate() && null !== $to) {
@@ -410,11 +424,11 @@ class Household
         });
     }
 
-    public function getNonCurrentMembers(?DateTimeImmutable $now = null): Collection
+    public function getNonCurrentMembers(\DateTimeImmutable $now = null): Collection
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
-        $date = $now ?? new DateTimeImmutable('today');
+        $date = $now ?? new \DateTimeImmutable('today');
 
         $criteria
             ->where(
@@ -430,7 +444,7 @@ class Household
         return $this->getMembers()->matching($criteria);
     }
 
-    public function getNonCurrentMembersByPosition(Position $position, ?DateTimeInterface $now = null)
+    public function getNonCurrentMembersByPosition(Position $position, \DateTimeInterface $now = null)
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
@@ -440,7 +454,7 @@ class Household
         return $this->getNonCurrentMembers($now)->matching($criteria);
     }
 
-    public function getNonCurrentMembersWithoutPosition(?DateTimeInterface $now = null)
+    public function getNonCurrentMembersWithoutPosition(\DateTimeInterface $now = null)
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
@@ -474,7 +488,7 @@ class Household
 
     public function getPreviousAddressOf(Address $address): ?Address
     {
-        $iterator = new ArrayIterator($this->getAddressesOrdered());
+        $iterator = new \ArrayIterator($this->getAddressesOrdered());
         $iterator->rewind();
 
         while ($iterator->valid()) {
@@ -496,7 +510,7 @@ class Household
         return $this->waitingForBirth;
     }
 
-    public function getWaitingForBirthDate(): ?DateTimeImmutable
+    public function getWaitingForBirthDate(): ?\DateTimeImmutable
     {
         return $this->waitingForBirthDate;
     }
@@ -513,7 +527,7 @@ class Household
             static fn (HouseholdComposition $a, HouseholdComposition $b) => $a->getStartDate() <=> $b->getStartDate()
         );
 
-        $iterator = new ArrayIterator($compositionOrdered);
+        $iterator = new \ArrayIterator($compositionOrdered);
         $iterator->rewind();
 
         /** @var ?HouseholdComposition $previous */
@@ -535,7 +549,7 @@ class Household
 
     public function makeAddressConsistent(): void
     {
-        $iterator = new ArrayIterator($this->getAddressesOrdered());
+        $iterator = new \ArrayIterator($this->getAddressesOrdered());
 
         $iterator->rewind();
 
@@ -597,7 +611,7 @@ class Household
      */
     public function setForceAddress(Address $address)
     {
-        $address->setValidFrom(new DateTime('today'));
+        $address->setValidFrom(new \DateTime('today'));
         $this->addAddress($address);
     }
 
@@ -608,7 +622,7 @@ class Household
         return $this;
     }
 
-    public function setWaitingForBirthDate(?DateTimeImmutable $waitingForBirthDate): self
+    public function setWaitingForBirthDate(?\DateTimeImmutable $waitingForBirthDate): self
     {
         $this->waitingForBirthDate = $waitingForBirthDate;
 
@@ -620,7 +634,7 @@ class Household
         $addresses = $this->getAddresses();
         $cond = true;
 
-        for ($i = 0; count($addresses) - 1 > $i; ++$i) {
+        for ($i = 0; \count($addresses) - 1 > $i; ++$i) {
             if ($addresses[$i]->getValidFrom() !== $addresses[$i + 1]->getValidTo()) {
                 $cond = false;
                 $context->buildViolation('The address are not sequentials. The validFrom date of one address should be equal to the validTo date of the previous address.')
@@ -630,11 +644,11 @@ class Household
         }
     }
 
-    private function buildCriteriaCurrentMembers(?DateTimeImmutable $now = null): Criteria
+    private function buildCriteriaCurrentMembers(\DateTimeImmutable $now = null): Criteria
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
-        $date = $now ?? new DateTimeImmutable('today');
+        $date = $now ?? new \DateTimeImmutable('today');
 
         $criteria
             ->where($expr->orX(
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php
index 65178c3ed..d8eab9bef 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php
@@ -16,16 +16,17 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_person_household_composition"
  * )
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "household_composition_type": HouseholdCompositionType::class
  * })
@@ -43,46 +44,59 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Assert\GreaterThanOrEqual(propertyPath="startDate", groups={"Default", "household_composition"})
+     *
      * @Serializer\Groups({"docgen:read"})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Household::class, inversedBy="compositions")
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private ?Household $household = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=HouseholdCompositionType::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Serializer\Groups({"docgen:read"})
      */
-    private ?HouseholdCompositionType  $householdCompositionType = null;
+    private ?HouseholdCompositionType $householdCompositionType = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="integer", nullable=true, options={"default": null})
+     *
      * @Assert\NotNull
+     *
      * @Assert\GreaterThanOrEqual(0, groups={"Default", "household_composition"})
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?int $numberOfChildren = null;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=false)
+     *
      * @Assert\NotNull(groups={"Default", "household_composition"})
+     *
      * @Serializer\Groups({"docgen:read"})
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     public function __construct()
     {
@@ -94,7 +108,7 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
         return $this->comment;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -119,7 +133,7 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
         return $this->numberOfChildren;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -131,7 +145,7 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
         return $this;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): HouseholdComposition
+    public function setEndDate(?\DateTimeImmutable $endDate): HouseholdComposition
     {
         $this->endDate = $endDate;
 
@@ -163,7 +177,7 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
         return $this;
     }
 
-    public function setStartDate(?DateTimeImmutable $startDate): HouseholdComposition
+    public function setStartDate(?\DateTimeImmutable $startDate): HouseholdComposition
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php
index 5fca56c3c..cb1fe2703 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php
@@ -16,9 +16,11 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_person_household_composition_type"
  * )
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "household_composition_type": HouseholdCompositionType::class
  * })
@@ -32,15 +34,20 @@ class HouseholdCompositionType
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $label = [];
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
index fad3b213a..ccce246c8 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
@@ -12,14 +12,13 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Entity\Household;
 
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
-use LogicException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_person_household_members"
  * )
@@ -28,59 +27,71 @@ class HouseholdMember
 {
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?string $comment = null;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Assert\GreaterThanOrEqual(
      *     propertyPath="startDate",
      *     message="household_membership.The end date must be after start date",
      *     groups={"household_memberships"}
      * )
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Column(type="boolean", options={"default": false})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private bool $holder = false;
 
     /**
-     * @var Household
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\PersonBundle\Entity\Household\Household"
      * )
+     *
      * @Assert\Valid(groups={"household_memberships"})
+     *
      * @Assert\NotNull(groups={"household_memberships"})
      */
     private ?Household $household = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
-     * @var Person
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\PersonBundle\Entity\Person"
      * )
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"docgen:person:with-household": false})
+     *
      * @Assert\Valid(groups={"household_memberships"})
+     *
      * @Assert\NotNull(groups={"household_memberships"})
      */
     private ?Person $person = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Position::class)
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?Position $position = null;
@@ -92,17 +103,19 @@ class HouseholdMember
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Assert\NotNull(groups={"household_memberships"})
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     public function getComment(): ?string
     {
         return $this->comment;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -135,14 +148,14 @@ class HouseholdMember
         return $this->shareHousehold;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
 
-    public function isCurrent(?DateTimeImmutable $at = null): bool
+    public function isCurrent(\DateTimeImmutable $at = null): bool
     {
-        $at ??= new DateTimeImmutable('now');
+        $at ??= new \DateTimeImmutable('now');
 
         return $this->getStartDate() < $at && (
             null === $this->getEndDate() || $this->getEndDate() > $at
@@ -161,7 +174,7 @@ class HouseholdMember
         return $this;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate = null): self
+    public function setEndDate(\DateTimeImmutable $endDate = null): self
     {
         $this->endDate = $endDate;
 
@@ -178,8 +191,7 @@ class HouseholdMember
     public function setHousehold(?Household $household): self
     {
         if ($this->household instanceof Household) {
-            throw new LogicException('You cannot change household ' .
-                'on a membership');
+            throw new \LogicException('You cannot change household on a membership');
         }
 
         $this->household = $household;
@@ -190,8 +202,7 @@ class HouseholdMember
     public function setPerson(?Person $person): self
     {
         if ($this->person instanceof Person) {
-            throw new LogicException('You cannot change person ' .
-                'on a membership');
+            throw new \LogicException('You cannot change person on a membership');
         }
 
         $this->person = $person;
@@ -203,8 +214,7 @@ class HouseholdMember
     public function setPosition(?Position $position): self
     {
         if ($this->position instanceof Position && $this->position !== $position) {
-            throw new LogicException('The position is already set. You cannot change ' .
-                'a position of a membership');
+            throw new \LogicException('The position is already set. You cannot change a position of a membership');
         }
 
         $this->position = $position;
@@ -223,7 +233,7 @@ class HouseholdMember
         return $this;
     }
 
-    public function setStartDate(DateTimeImmutable $startDate): self
+    public function setStartDate(\DateTimeImmutable $startDate): self
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php b/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
index 6a1e34ba9..453176334 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
@@ -13,8 +13,6 @@ namespace Chill\PersonBundle\Entity\Household;
 
 use Chill\MainBundle\Entity\Address;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -42,27 +40,34 @@ use Doctrine\ORM\Mapping as ORM;
  * 3. 3st entity: from 2021-12-01 to NULL, household V, address T;
  *
  * @ORM\Entity(readOnly=true)
+ *
  * @ORM\Table(name="view_chill_person_household_address")
  */
 class PersonHouseholdAddress
 {
     /**
      * @ORM\Id
+     *
      * @ORM\ManyToOne(targetEntity=Address::class)
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private ?\Chill\MainBundle\Entity\Address $address = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\ManyToOne(targetEntity=Household::class)
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private ?\Chill\PersonBundle\Entity\Household\Household $household = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\ManyToOne(targetEntity=Person::class)
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private ?\Chill\PersonBundle\Entity\Person $person = null;
@@ -98,7 +103,7 @@ class PersonHouseholdAddress
      * (this is not the startdate of the household, not
      * the startdate of the address)
      */
-    public function getValidFrom(): ?DateTimeInterface
+    public function getValidFrom(): ?\DateTimeInterface
     {
         return $this->validFrom;
     }
@@ -109,7 +114,7 @@ class PersonHouseholdAddress
      * (this is not the enddate of the household, not
      * the enddate of the address)
      */
-    public function getValidTo(): ?DateTimeImmutable
+    public function getValidTo(): ?\DateTimeImmutable
     {
         return $this->validTo;
     }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Position.php b/src/Bundle/ChillPersonBundle/Entity/Household/Position.php
index 64409c809..2252fca97 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Position.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Position.php
@@ -16,7 +16,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_household_position")
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "household_position": Position::class
  * })
@@ -25,33 +27,41 @@ class Position
 {
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Serializer\Groups({ "read" })
      */
     private bool $allowHolder = false;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $label = [];
 
     /**
      * @ORM\Column(type="float")
+     *
      * @Serializer\Groups({"read"})
      */
     private float $ordering = 0.00;
 
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Serializer\Groups({"read"})
      */
     private bool $shareHouseHold = true;
diff --git a/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php b/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
index cce546802..36834542a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
+++ b/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
@@ -17,15 +17,16 @@ use Doctrine\ORM\Mapping as ORM;
  * MaritalStatus.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_marital_status")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class MaritalStatus
 {
     /**
-     * @var string
-     *
      * @ORM\Id
+     *
      * @ORM\Column(type="string", length=7)
      */
     private ?string $id;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 3265f09e1..1adc695b0 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Entity;
 
-use ArrayIterator;
 use Chill\BudgetBundle\Entity\Charge;
 use Chill\BudgetBundle\Entity\Resource;
 use Chill\CalendarBundle\Entity\Calendar;
@@ -37,27 +36,23 @@ use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequen
 use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
 use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter;
 use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
-use Exception;
 use libphonenumber\PhoneNumber;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use UnexpectedValueException;
-use function count;
-use function in_array;
 
 /**
  * Person Class.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_person",
  *     indexes={
+ *
  *         @ORM\Index(
  *             name="person_names",
  *             columns={"firstName", "lastName"}
@@ -67,11 +62,15 @@ use function in_array;
  *             columns={"birthdate"}
  *         )
  *     })
+ *
  *     @ORM\HasLifecycleCallbacks
+ *
  *     @DiscriminatorMap(typeProperty="type", mapping={
  *         "person": Person::class
  *     })
+ *
  *     @PersonHasCenter
+ *
  *     @HouseholdMembershipSequential(
  *         groups={"household_memberships"}
  *     )
@@ -94,8 +93,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Accept receiving email.
      *
-     * @var bool
-     *
      * @ORM\Column(type="boolean", options={"default": false})
      */
     private ?bool $acceptEmail = false;
@@ -103,8 +100,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Accept short text message (aka SMS).
      *
-     * @var bool
-     *
      * @ORM\Column(type="boolean", options={"default": false})
      */
     private ?bool $acceptSMS = false;
@@ -117,6 +112,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
      *     mappedBy="person",
      * cascade={"persist", "remove", "merge", "detach"})
+     *
      * @ORM\OrderBy({"startDate": "DESC"})
      */
     private Collection $accompanyingPeriodParticipations;
@@ -139,7 +135,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @ORM\ManyToMany(
      *     targetEntity="Chill\MainBundle\Entity\Address",
      * cascade={"persist", "remove", "merge", "detach"})
+     *
      * @ORM\JoinTable(name="chill_person_persons_to_addresses")
+     *
      * @ORM\OrderBy({"validFrom": "DESC"})
      */
     private Collection $addresses;
@@ -159,12 +157,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's birthdate.
      *
      * @ORM\Column(type="date", nullable=true)
+     *
      * @Birthdate
      */
     private ?\DateTime $birthdate = null;
 
     /**
      * @var Collection<Charge>
+     *
      * @ORM\OneToMany(
      *     targetEntity=Charge::class,
      *     mappedBy="person"
@@ -173,7 +173,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private Collection $budgetCharges;
 
     /**
-     * @var Collection<Resource>
+     * @var Collection<resource>
+     *
      * @ORM\OneToMany(
      *     targetEntity=Resource::class,
      *     mappedBy="person"
@@ -183,6 +184,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
 
     /**
      * @var Collection<int, Calendar>
+     *
      * @ORM\ManyToMany(
      *     targetEntity="Chill\CalendarBundle\Entity\Calendar",
      *     mappedBy="persons"
@@ -214,7 +216,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Array where customfield's data are stored.
      *
-     *
      * @ORM\Column(type="json")
      */
     private ?array $cFData = null;
@@ -222,8 +223,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The marital status of the person.
      *
-     *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Civility")
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?\Chill\MainBundle\Entity\Civility $civility = null;
@@ -231,7 +232,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Contact information for contacting the person.
      *
-     *
      * @ORM\Column(type="text", nullable=true)
      */
     private string $contactInfo = '';
@@ -239,10 +239,10 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's country of birth.
      *
-     *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Country")
      *
      *     sf4 check: option inversedBy="birthsIn" return error mapping !!
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?\Chill\MainBundle\Entity\Country $countryOfBirth = null;
@@ -254,6 +254,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?\Chill\MainBundle\Entity\User $createdBy = null;
@@ -280,20 +281,21 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's deathdate.
      *
-     * @var DateTimeImmutable
-     *
      * @ORM\Column(type="date_immutable", nullable=true)
+     *
      * @Assert\Date
+     *
      * @Assert\GreaterThanOrEqual(propertyPath="birthdate")
+     *
      * @Assert\LessThanOrEqual("today")
      */
-    private ?DateTimeImmutable $deathdate = null;
+    private ?\DateTimeImmutable $deathdate = null;
 
     /**
      * The person's email.
      *
-     *
      * @ORM\Column(type="text", nullable=true)
+     *
      * @Assert\Email()
      */
     private string $email = '';
@@ -302,7 +304,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's first name.
      *
      * @ORM\Column(type="string", length=255)
+     *
      * @Assert\NotBlank(message="The firstname cannot be empty")
+     *
      * @Assert\Length(
      *     max=255,
      * )
@@ -320,8 +324,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's gender.
      *
-     *
      * @ORM\Column(type="string", length=9, nullable=true)
+     *
      * @Assert\NotNull(message="The gender must be set")
      */
     private ?string $gender = null;
@@ -337,6 +341,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * Read-only field, computed by the database.
      *
      * @var Collection<PersonHouseholdAddress>
+     *
      * @ORM\OneToMany(
      *     targetEntity=PersonHouseholdAddress::class,
      *     mappedBy="person"
@@ -358,7 +363,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's id.
      *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -367,7 +374,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's last name.
      *
      * @ORM\Column(type="string", length=255)
+     *
      * @Assert\NotBlank(message="The lastname cannot be empty")
+     *
      * @Assert\Length(
      *     max=255,
      * )
@@ -377,8 +386,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The marital status of the person.
      *
-     *
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\MaritalStatus")
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?\Chill\PersonBundle\Entity\MaritalStatus $maritalStatus = null;
@@ -394,14 +403,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The date of the last marital status change of the person.
      *
      * @ORM\Column(type="date", nullable=true)
+     *
      * @Assert\Date
      */
-    private ?DateTime $maritalStatusDate = null;
+    private ?\DateTime $maritalStatusDate = null;
 
     /**
      * A remark over the person.
      *
-     *
      * @ORM\Column(type="text")
      */
     private string $memo = ''; // TO-CHANGE in remark
@@ -410,6 +419,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's mobile phone number.
      *
      * @PhonenumberConstraint(type="mobile")
+     *
      * @ORM\Column(type="phone_number", nullable=true)
      */
     private ?PhoneNumber $mobilenumber = null;
@@ -417,10 +427,10 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's nationality.
      *
-     *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Country")
      *
      *    sf4 check: option inversedBy="nationals" return error mapping !!
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?\Chill\MainBundle\Entity\Country $nationality = null;
@@ -428,8 +438,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Number of children.
      *
-     * @var int
-     *
      * @ORM\Column(type="integer", nullable=true)
      */
     private ?int $numberOfChildren = null;
@@ -443,6 +451,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *     cascade={"persist", "remove", "merge", "detach"},
      *     orphanRemoval=true
      * )
+     *
      * @Assert\Valid(
      *     traverse=true,
      * )
@@ -454,6 +463,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *     targetEntity=AccompanyingPeriod::class,
      *     mappedBy="personLocation"
      * )
+     *
      * @var Collection<AccompanyingPeriod>
      */
     private Collection $periodLocatedOn;
@@ -462,6 +472,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's phonenumber.
      *
      * @ORM\Column(type="phone_number", nullable=true)
+     *
      * @PhonenumberConstraint(
      *     type="landline",
      * )
@@ -471,17 +482,16 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's place of birth.
      *
-     *
      * @ORM\Column(type="string", length=255, name="place_of_birth")
      */
     private string $placeOfBirth = '';
 
     /**
-     *
      * @deprecated
+     *
      * @ORM\Column(type="boolean")
      */
-    private bool $proxyAccompanyingPeriodOpenState = false; //TO-DELETE ?
+    private bool $proxyAccompanyingPeriodOpenState = false; // TO-DELETE ?
 
     /**
      * @ORM\OneToMany(targetEntity=PersonResource::class, mappedBy="personOwner")
@@ -496,6 +506,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var Collection<Language>
      *
      * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\Language")
+     *
      * @ORM\JoinTable(
      *     name="persons_spoken_languages",
      *     joinColumns={@ORM\JoinColumn(name="person_id", referencedColumnName="id")},
@@ -539,9 +550,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $this->centerHistory = new ArrayCollection();
     }
 
-    /**
-     * @return string
-     */
     public function __toString(): string
     {
         return $this->getLabel();
@@ -616,13 +624,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * the person are not collapsing (i.e. have not shared days) or having
      * a period after an open period.
      *
-     * @return true | array True if the accompanying periods are not collapsing,
-     * an array with data for displaying the error
+     * @return true|array True if the accompanying periods are not collapsing,
+     *                    an array with data for displaying the error
      */
     public function checkAccompanyingPeriodsAreNotCollapsing(): array|bool
     {
         $periods = $this->getAccompanyingPeriodsOrdered();
-        $periodsNbr = count($periods);
+        $periodsNbr = \count($periods);
         $i = 0;
 
         while ($periodsNbr - 1 > $i) {
@@ -661,9 +669,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * To check if the Person and its accompanying period are consistent, use validation.
      *
-     * @throws Exception if two lines of the accompanying period are open.
+     * @throws \Exception if two lines of the accompanying period are open
      */
-    public function close(?AccompanyingPeriod $accompanyingPeriod = null): void
+    public function close(AccompanyingPeriod $accompanyingPeriod = null): void
     {
         $this->proxyAccompanyingPeriodOpenState = false;
     }
@@ -701,7 +709,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
             }
         }
 
-        if (0 < count($closeCandidates)) {
+        if (0 < \count($closeCandidates)) {
             return $closeCandidates[0];
         }
 
@@ -725,7 +733,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * * as participant, only for opened participation;
      *
      * @param bool $asParticipantOpen add participation which are still opened
-     * @param bool $asRequestor add accompanying period where the person is requestor
+     * @param bool $asRequestor       add accompanying period where the person is requestor
      *
      * @return AccompanyingPeriod[]|Collection
      */
@@ -737,8 +745,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
 
         if ($asParticipantOpen) {
             foreach ($this->getAccompanyingPeriodParticipations()
-                ->map(fn (AccompanyingPeriodParticipation $app) => $app->getAccompanyingPeriod())
-               as $period
+                ->map(fn (AccompanyingPeriodParticipation $app) => $app->getAccompanyingPeriod()) as $period
             ) {
                 if (!$result->contains($period)) {
                     $result->add($period);
@@ -763,7 +770,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     ): int {
         // TODO should be optimized to avoid loading accompanying period ?
         return $this->getAccompanyingPeriodInvolved($asParticipantOpen, $asRequestor)
-            ->filter(fn (AccompanyingPeriod $p) => $p->getStep() !== AccompanyingPeriod::STEP_DRAFT)
+            ->filter(fn (AccompanyingPeriod $p) => AccompanyingPeriod::STEP_DRAFT !== $p->getStep())
             ->count();
     }
 
@@ -793,7 +800,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $accompanyingPeriods = [];
 
         foreach ($this->accompanyingPeriodParticipations as $participation) {
-            /** @var AccompanyingPeriodParticipation $participation */
+            /* @var AccompanyingPeriodParticipation $participation */
             $accompanyingPeriods[] = $participation->getAccompanyingPeriod();
         }
 
@@ -807,7 +814,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     {
         $periods = $this->getAccompanyingPeriods();
 
-        //order by date :
+        // order by date :
         usort($periods, static function ($a, $b) {
             $dateA = $a->getOpeningDate();
             $dateB = $b->getOpeningDate();
@@ -845,17 +852,17 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * @deprecated since chill2.0, address is linked to the household. Use @see{Person::getCurrentHouseholdAddress}
      *
-     * @throws Exception
+     * @throws \Exception
      */
-    public function getAddressAt(?DateTimeInterface $at = null): ?Address
+    public function getAddressAt(\DateTimeInterface $at = null): ?Address
     {
-        $at ??= new DateTime('now');
+        $at ??= new \DateTime('now');
 
-        if ($at instanceof DateTimeImmutable) {
-            $at = DateTime::createFromImmutable($at);
+        if ($at instanceof \DateTimeImmutable) {
+            $at = \DateTime::createFromImmutable($at);
         }
 
-        /** @var ArrayIterator $addressesIterator */
+        /** @var \ArrayIterator $addressesIterator */
         $addressesIterator = $this->getAddresses()
             ->filter(static fn (Address $address): bool => $address->getValidFrom() <= $at)
             ->getIterator();
@@ -883,12 +890,12 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * If the person has a deathdate, calculate the age at the deathdate.
      *
-     * @param string $at A valid string to create a DateTime.
+     * @param string $at a valid string to create a DateTime
      */
     public function getAge(string $at = 'now'): ?int
     {
-        if ($this->birthdate instanceof DateTimeInterface) {
-            if ($this->deathdate instanceof DateTimeInterface) {
+        if ($this->birthdate instanceof \DateTimeInterface) {
+            if ($this->deathdate instanceof \DateTimeInterface) {
                 return (int) date_diff($this->birthdate, $this->deathdate)->format('%y');
             }
 
@@ -903,7 +910,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->altNames;
     }
 
-    public function getBirthdate(): ?DateTime
+    public function getBirthdate(): ?\DateTime
     {
         return $this->birthdate;
     }
@@ -987,7 +994,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->countryOfBirth;
     }
 
-    public function getCreatedAt(): ?DateTimeInterface
+    public function getCreatedAt(): ?\DateTimeInterface
     {
         return $this->createdAt;
     }
@@ -1015,7 +1022,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     public function getCurrentAccompanyingPeriods(): array
     {
         $currentAccompanyingPeriods = [];
-        $currentDate = new DateTime();
+        $currentDate = new \DateTime();
 
         foreach ($this->accompanyingPeriodParticipations as $participation) {
             $endDate = $participation->getEndDate();
@@ -1028,7 +1035,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $currentAccompanyingPeriods;
     }
 
-    public function getCurrentHousehold(?DateTimeImmutable $at = null): ?Household
+    public function getCurrentHousehold(\DateTimeImmutable $at = null): ?Household
     {
         $participation = $this->getCurrentHouseholdParticipationShareHousehold($at);
 
@@ -1043,11 +1050,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * if the given date is 'now', use instead @see{getCurrentPersonAddress}, which is optimized on
      * database side.
      */
-    public function getCurrentHouseholdAddress(?DateTimeImmutable $at = null): ?Address
+    public function getCurrentHouseholdAddress(\DateTimeImmutable $at = null): ?Address
     {
         if (
             null === $at
-            || $at->format('Ymd') === (new DateTime('today'))->format('Ymd')
+            || $at->format('Ymd') === (new \DateTime('today'))->format('Ymd')
         ) {
             return $this->currentPersonAddress instanceof PersonCurrentAddress
                 ? $this->currentPersonAddress->getAddress() : null;
@@ -1077,11 +1084,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return null;
     }
 
-    public function getCurrentHouseholdParticipationShareHousehold(?DateTimeImmutable $at = null): ?HouseholdMember
+    public function getCurrentHouseholdParticipationShareHousehold(\DateTimeImmutable $at = null): ?HouseholdMember
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
-        $date = $at ?? new DateTimeImmutable('today');
+        $date = $at ?? new \DateTimeImmutable('today');
         $datef = $date->format('Y-m-d');
 
         if (
@@ -1121,7 +1128,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->currentPersonAddress->getAddress();
     }
 
-    public function getDeathdate(): ?DateTimeInterface
+    public function getDeathdate(): ?\DateTimeInterface
     {
         return $this->deathdate;
     }
@@ -1236,20 +1243,20 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     public function getLabel()
     {
-        return $this->getFirstName() . ' ' . $this->getLastName();
+        return $this->getFirstName().' '.$this->getLastName();
     }
 
     /**
      * @deprecated Use @see{Person::getCurrentPersonAddress} or @see{Person::getCurrentHouseholdAddress} instead
      *
-     * @throws Exception
-     *
      * @return false|mixed|null
+     *
+     * @throws \Exception
      */
-    public function getLastAddress(?DateTime $from = null)
+    public function getLastAddress(\DateTime $from = null)
     {
         return $this->getCurrentHouseholdAddress(
-            null !== $from ? DateTimeImmutable::createFromMutable($from) : null
+            null !== $from ? \DateTimeImmutable::createFromMutable($from) : null
         );
     }
 
@@ -1268,7 +1275,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->maritalStatusComment;
     }
 
-    public function getMaritalStatusDate(): ?DateTimeInterface
+    public function getMaritalStatusDate(): ?\DateTimeInterface
     {
         return $this->maritalStatusDate;
     }
@@ -1298,7 +1305,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     public function getOpenedAccompanyingPeriod(): ?AccompanyingPeriod
     {
-        if ($this->isOpen() === false) {
+        if (false === $this->isOpen()) {
             return null;
         }
 
@@ -1324,7 +1331,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $criteria = Criteria::create();
         $criteria
             ->andWhere(Criteria::expr()->eq('endDate', null))
-            ->orWhere(Criteria::expr()->gt('endDate', new DateTime('now')));
+            ->orWhere(Criteria::expr()->gt('endDate', new \DateTime('now')));
 
         return $this->getAccompanyingPeriodParticipations()
             ->matching($criteria)
@@ -1364,7 +1371,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->spokenLanguages;
     }
 
-    public function getUpdatedAt(): ?DateTimeInterface
+    public function getUpdatedAt(): ?\DateTimeInterface
     {
         return $this->updatedAt;
     }
@@ -1374,7 +1381,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->updatedBy;
     }
 
-    public function hasCurrentHouseholdAddress(?DateTimeImmutable $at = null): bool
+    public function hasCurrentHouseholdAddress(\DateTimeImmutable $at = null): bool
     {
         return null !== $this->getCurrentHouseholdAddress($at);
     }
@@ -1390,7 +1397,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         foreach ($this->addresses as $ad) {
             $validDate = $ad->getValidFrom()->format('Y-m-d');
 
-            if (in_array($validDate, $validYMDDates, true)) {
+            if (\in_array($validDate, $validYMDDates, true)) {
                 return true;
             }
             $validYMDDates[] = $validDate;
@@ -1461,7 +1468,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return false;
     }
 
-    public function isSharingHousehold(?DateTimeImmutable $at = null): bool
+    public function isSharingHousehold(\DateTimeImmutable $at = null): bool
     {
         return null !== $this->getCurrentHousehold($at);
     }
@@ -1490,7 +1497,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $participation = $this->participationsContainAccompanyingPeriod($accompanyingPeriod);
 
         if (!null === $participation) {
-            $participation->setEndDate(new DateTime());
+            $participation->setEndDate(new \DateTime());
             $this->accompanyingPeriodParticipations->removeElement($participation);
         }
     }
@@ -1555,7 +1562,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     }
 
     /**
-     * @param DateTime $birthdate
+     * @param \DateTime $birthdate
      */
     public function setBirthdate($birthdate): self
     {
@@ -1571,7 +1578,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     public function setCenter(?Center $center): self
     {
-        $modification = new DateTimeImmutable('now');
+        $modification = new \DateTimeImmutable('now');
 
         foreach ($this->centerHistory as $centerHistory) {
             if (null === $centerHistory->getEndDate()) {
@@ -1601,6 +1608,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
             $this->centerHistory[] = $newCenterHistory;
             $newCenterHistory->setPerson($this);
         }
+
         return $this;
     }
 
@@ -1611,7 +1619,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setCivility(?Civility $civility = null): self
+    public function setCivility(Civility $civility = null): self
     {
         $this->civility = $civility;
 
@@ -1629,14 +1637,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setCountryOfBirth(?Country $countryOfBirth = null): self
+    public function setCountryOfBirth(Country $countryOfBirth = null): self
     {
         $this->countryOfBirth = $countryOfBirth;
 
         return $this;
     }
 
-    public function setCreatedAt(DateTimeInterface $datetime): self
+    public function setCreatedAt(\DateTimeInterface $datetime): self
     {
         $this->createdAt = $datetime;
 
@@ -1650,7 +1658,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setDeathdate(?DateTimeInterface $deathdate): self
+    public function setDeathdate(?\DateTimeInterface $deathdate): self
     {
         $this->deathdate = $deathdate;
 
@@ -1699,7 +1707,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setMaritalStatus(?MaritalStatus $maritalStatus = null): self
+    public function setMaritalStatus(MaritalStatus $maritalStatus = null): self
     {
         $this->maritalStatus = $maritalStatus;
 
@@ -1713,7 +1721,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setMaritalStatusDate(?DateTimeInterface $maritalStatusDate): self
+    public function setMaritalStatusDate(?\DateTimeInterface $maritalStatusDate): self
     {
         $this->maritalStatusDate = $maritalStatusDate;
 
@@ -1740,7 +1748,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setNationality(?Country $nationality = null): self
+    public function setNationality(Country $nationality = null): self
     {
         $this->nationality = $nationality;
 
@@ -1789,7 +1797,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setUpdatedAt(DateTimeInterface $datetime): self
+    public function setUpdatedAt(\DateTimeInterface $datetime): self
     {
         $this->updatedAt = $datetime;
 
@@ -1810,7 +1818,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         }
 
         $criteria = Criteria::create();
-        $now = new DateTimeImmutable('now');
+        $now = new \DateTimeImmutable('now');
         $criteria->where(Criteria::expr()->lte('startDate', $now))
             ->andWhere(Criteria::expr()->orX(
                 Criteria::expr()->isNull('endDate'),
@@ -1822,7 +1830,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return match ($histories->count()) {
             0 => null,
             1 => $histories->first(),
-            default => throw new UnexpectedValueException('It should not contains more than one center at a time'),
+            default => throw new \UnexpectedValueException('It should not contains more than one center at a time'),
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php
index 6de73de0d..551f8fd03 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Entity\Person;
 
 use Chill\MainBundle\Entity\Center;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -23,7 +22,9 @@ use Doctrine\ORM\Mapping as ORM;
  * using a SQL view.
  *
  * @ORM\Entity(readOnly=true)
+ *
  * @ORM\Table(name="view_chill_person_person_center_history_current")
+ *
  * @psalm-internal Chill\PersonBundle\Entity
  */
 class PersonCenterCurrent
@@ -36,10 +37,11 @@ class PersonCenterCurrent
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -52,7 +54,7 @@ class PersonCenterCurrent
     /**
      * @ORM\Column(type="date_immutable", nullable=false)
      */
-    private DateTimeImmutable $startDate;
+    private \DateTimeImmutable $startDate;
 
     /**
      * Populate the properties person, center, start and end date from history.
@@ -75,7 +77,7 @@ class PersonCenterCurrent
         return $this->center;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -93,7 +95,7 @@ class PersonCenterCurrent
         return $this->person;
     }
 
-    public function getStartDate(): DateTimeImmutable
+    public function getStartDate(): \DateTimeImmutable
     {
         return $this->startDate;
     }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php
index 8521c290c..04cad642b 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php
@@ -17,13 +17,13 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Center;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Associate a Person with a Center. The association may change on date intervals.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_person_center_history")
  */
 class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterface
@@ -35,11 +35,13 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -48,11 +50,11 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
         /**
          * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="centerHistory")
          */
-        private ?\Chill\PersonBundle\Entity\Person $person = null,
+        private ?Person $person = null,
         /**
          * @ORM\ManyToOne(targetEntity=Center::class)
          */
-        private ?\Chill\MainBundle\Entity\Center $center = null,
+        private ?Center $center = null,
         /**
          * @ORM\Column(type="date_immutable", nullable=false)
          */
@@ -64,7 +66,7 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
         return $this->center;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -79,7 +81,7 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
         return $this->person;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -91,7 +93,7 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
         return $this;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): self
+    public function setEndDate(?\DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
 
@@ -105,7 +107,7 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
         return $this;
     }
 
-    public function setStartDate(?DateTimeImmutable $startDate): self
+    public function setStartDate(?\DateTimeImmutable $startDate): self
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
index 52d6a34af..1ec28f423 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Entity\Person;
 
 use Chill\MainBundle\Entity\Address;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -26,6 +25,7 @@ use Doctrine\ORM\Mapping as ORM;
  * household membership and address validity. See @see{PersonHouseholdAddress}
  *
  * @ORM\Entity(readOnly=true)
+ *
  * @ORM\Table("view_chill_person_current_address")
  */
 class PersonCurrentAddress
@@ -37,7 +37,9 @@ class PersonCurrentAddress
 
     /**
      * @ORM\Id
+     *
      * @ORM\OneToOne(targetEntity=Person::class, inversedBy="currentPersonAddress")
+     *
      * @ORM\JoinColumn(name="person_id", referencedColumnName="id")
      */
     protected Person $person;
@@ -45,12 +47,12 @@ class PersonCurrentAddress
     /**
      * @ORM\Column(name="valid_from", type="date_immutable")
      */
-    protected DateTimeImmutable $validFrom;
+    protected \DateTimeImmutable $validFrom;
 
     /**
      * @ORM\Column(name="valid_to", type="date_immutable")
      */
-    protected ?DateTimeImmutable $validTo = null;
+    protected ?\DateTimeImmutable $validTo = null;
 
     public function getAddress(): Address
     {
@@ -66,7 +68,7 @@ class PersonCurrentAddress
      * This date is the intersection of household membership
      * and address validity.
      */
-    public function getValidFrom(): DateTimeImmutable
+    public function getValidFrom(): \DateTimeImmutable
     {
         return $this->validFrom;
     }
@@ -75,7 +77,7 @@ class PersonCurrentAddress
      * This date is the intersection of household membership
      * and address validity.
      */
-    public function getValidTo(): ?DateTimeImmutable
+    public function getValidTo(): ?\DateTimeImmutable
     {
         return $this->validTo;
     }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index 87e7620c9..c5c2c8d08 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -26,7 +26,9 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_resource")
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "personResource": personResource::class
  * })
@@ -39,27 +41,34 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private CommentEmbeddable $comment;
 
     /**
      * @ORM\Column(type="text", nullable=true)
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?string $freeText = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=PersonResourceKind::class, inversedBy="personResources")
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?PersonResourceKind $kind = null;
@@ -68,7 +77,9 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
      * The person which host the owner of this resource.
      *
      * @ORM\ManyToOne(targetEntity=Person::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?Person $person = null;
@@ -77,14 +88,18 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
      * The person linked with this resource.
      *
      * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="resources")
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Groups({"read"})
      */
     private ?Person $personOwner = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class, inversedBy="personResources")
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?ThirdParty $thirdParty = null;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
index cf70fa206..f036e4b4a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
@@ -16,14 +16,18 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_resource_kind")
  */
 class PersonResourceKind
 {
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?int $id = null;
@@ -35,7 +39,9 @@ class PersonResourceKind
 
     /**
      * @ORM\Column(type="json", length=255)
+     *
      * @Serializer\Groups({"docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $title;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
index 9ff2a29e2..acd312190 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
@@ -16,20 +16,22 @@ use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Context;
 use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity(repositoryClass=ResidentialAddressRepository::class)
+ *
  * @ORM\Table(name="chill_person_residential_address")
  */
 class ResidentialAddress
 {
     /**
      * @ORM\ManyToOne(targetEntity=Address::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read"})
      */
     private ?Address $address = null;
@@ -41,43 +43,53 @@ class ResidentialAddress
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
+     *
      * @Groups({"read"})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read"})
+     *
      * @Context(normalizationContext={"groups": {"minimal"}})
      */
     private ?Person $hostPerson = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read"})
      */
     private ?ThirdParty $hostThirdParty = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class)
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private Person $person;
 
     /**
      * @ORM\Column(type="datetime_immutable")
+     *
      * @Groups({"read"})
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     public function __construct()
     {
@@ -94,7 +106,7 @@ class ResidentialAddress
         return $this->comment;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -119,7 +131,7 @@ class ResidentialAddress
         return $this->person;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -138,7 +150,7 @@ class ResidentialAddress
         return $this;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): self
+    public function setEndDate(?\DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
 
@@ -166,7 +178,7 @@ class ResidentialAddress
         return $this;
     }
 
-    public function setStartDate(DateTimeImmutable $startDate): self
+    public function setStartDate(\DateTimeImmutable $startDate): self
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php b/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
index d899366a8..d899cee68 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
@@ -18,31 +18,30 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * PersonAltName.
  *
  * @ORM\Table(name="chill_person_alt_name")
+ *
  * @ORM\Entity
  */
 class PersonAltName
 {
     /**
-     * @var int
-     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\Id
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="key", type="string", length=255)
+     *
      * @Groups({"write"})
      */
     private ?string $key = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="label", type="text")
+     *
      * @Groups({"write"})
      */
     private ?string $label = null;
@@ -121,7 +120,7 @@ class PersonAltName
     /**
      * @return $this
      */
-    public function setPerson(?Person $person = null)
+    public function setPerson(Person $person = null)
     {
         $this->person = $person;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
index 12a96896f..ad0f4236f 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
  * PersonNotDuplicate.
  *
  * @ORM\Table(name="chill_person_not_duplicate")
+ *
  * @ORM\Entity
  */
 class PersonNotDuplicate
@@ -31,10 +32,10 @@ class PersonNotDuplicate
     /**
      * The person's id.
      *
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -56,7 +57,7 @@ class PersonNotDuplicate
 
     public function __construct()
     {
-        $this->date = new DateTime();
+        $this->date = new \DateTime();
     }
 
     public function getDate()
@@ -84,7 +85,7 @@ class PersonNotDuplicate
         return $this->user;
     }
 
-    public function setDate(DateTime $date)
+    public function setDate(\DateTime $date)
     {
         $this->date = $date;
     }
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
index 068260b45..c994e487b 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
@@ -19,8 +19,10 @@ use libphonenumber\PhoneNumber;
  * Person Phones.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_phone",
  *     indexes={
+ *
  *         @ORM\Index(name="phonenumber", columns={"phonenumber"})
  *     })
  */
@@ -29,7 +31,7 @@ class PersonPhone
     /**
      * @ORM\Column(type="datetime", nullable=false)
      */
-    private DateTime $date;
+    private \DateTime $date;
 
     /**
      * @ORM\Column(type="text", nullable=true)
@@ -38,7 +40,9 @@ class PersonPhone
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -63,10 +67,10 @@ class PersonPhone
 
     public function __construct()
     {
-        $this->date = new DateTime();
+        $this->date = new \DateTime();
     }
 
-    public function getDate(): DateTime
+    public function getDate(): \DateTime
     {
         return $this->date;
     }
@@ -102,7 +106,7 @@ class PersonPhone
             && null === $this->getPhonenumber();
     }
 
-    public function setDate(DateTime $date): void
+    public function setDate(\DateTime $date): void
     {
         $this->date = $date;
     }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php
index cd36db8aa..a8c542622 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php
@@ -17,7 +17,9 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_relations")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "relation": Relation::class
  * })
@@ -26,28 +28,36 @@ class Relation
 {
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="boolean", nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
     private bool $isActive = true;
 
     /**
      * @ORM\Column(type="json", nullable=true)
+     *
      * @Serializer\Groups({"read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $reverseTitle = [];
 
     /**
      * @ORM\Column(type="json", nullable=true)
+     *
      * @Serializer\Groups({"read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $title = [];
diff --git a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
index a89b56ad3..f736913ae 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
@@ -16,8 +16,6 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicate;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping\DiscriminatorColumn;
 use RuntimeException;
@@ -27,11 +25,15 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_relationships")
+ *
  * @DiscriminatorColumn(name="relation_id", type="integer")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "relationship": Relationship::class
  * })
+ *
  * @RelationshipNoDuplicate
  */
 class Relationship implements TrackCreationInterface, TrackUpdateInterface
@@ -39,52 +41,67 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime_immutable")
      */
-    private ?DateTimeImmutable $createdAt = null;
+    private ?\DateTimeImmutable $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private ?User $createdBy = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Assert\NotNull
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private ?Person $fromPerson = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Relation::class)
+     *
      * @ORM\JoinColumn(nullable=false, name="relation_id", referencedColumnName="id")
+     *
      * @Assert\NotNull
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private ?Relation $relation = null;
 
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Assert\Type(
      *     type="bool",
      *     message="This must be of type boolean"
      * )
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private bool $reverse;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Assert\NotNull
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private ?Person $toPerson = null;
@@ -92,14 +109,14 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      */
     private ?User $updatedBy = null;
 
-    public function getCreatedAt(): ?DateTimeImmutable
+    public function getCreatedAt(): ?\DateTimeImmutable
     {
         return $this->createdAt;
     }
@@ -130,7 +147,7 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
     public function getOpposite(Person $counterpart): Person
     {
         if ($this->fromPerson !== $counterpart && $this->toPerson !== $counterpart) {
-            throw new RuntimeException('the counterpart is neither the from nor to person for this relationship');
+            throw new \RuntimeException('the counterpart is neither the from nor to person for this relationship');
         }
 
         if ($this->fromPerson === $counterpart) {
@@ -155,7 +172,7 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
         return $this->toPerson;
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -165,7 +182,7 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
         return $this->updatedBy;
     }
 
-    public function setCreatedAt(DateTimeInterface $createdAt): self
+    public function setCreatedAt(\DateTimeInterface $createdAt): self
     {
         $this->createdAt = $createdAt;
 
@@ -207,7 +224,7 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setUpdatedAt(?DateTimeInterface $updatedAt): self
+    public function setUpdatedAt(?\DateTimeInterface $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
index 3f033f34e..4ec5bcf78 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
@@ -19,7 +19,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_social_work_evaluation")
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "social_work_evaluation": Evaluation::class
  * })
@@ -33,26 +35,32 @@ class Evaluation
 
     /**
      * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read"})
      */
-    private ?DateInterval $delay = null;
+    private ?\DateInterval $delay = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read"})
      */
-    private ?DateInterval $notificationDelay = null;
+    private ?\DateInterval $notificationDelay = null;
 
     /**
      * @var Collection<SocialAction>
+     *
      * @ORM\ManyToMany(
      *     targetEntity=SocialAction::class,
      *     mappedBy="evaluations"
@@ -62,13 +70,16 @@ class Evaluation
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $title = [];
 
     /**
      * @ORM\Column(type="text", nullable=true)
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?string $url = null;
@@ -90,7 +101,7 @@ class Evaluation
         return $this;
     }
 
-    public function getDelay(): ?DateInterval
+    public function getDelay(): ?\DateInterval
     {
         return $this->delay;
     }
@@ -100,7 +111,7 @@ class Evaluation
         return $this->id;
     }
 
-    public function getNotificationDelay(): ?DateInterval
+    public function getNotificationDelay(): ?\DateInterval
     {
         return $this->notificationDelay;
     }
@@ -146,14 +157,14 @@ class Evaluation
         return $this;
     }
 
-    public function setDelay(?DateInterval $delay): self
+    public function setDelay(?\DateInterval $delay): self
     {
         $this->delay = $delay;
 
         return $this;
     }
 
-    public function setNotificationDelay(?DateInterval $notificationDelay): self
+    public function setNotificationDelay(?\DateInterval $notificationDelay): self
     {
         $this->notificationDelay = $notificationDelay;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
index ad42a05db..856e565eb 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Entity\SocialWork;
 
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -19,7 +18,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_social_work_goal")
+ *
  * @Serializer\DiscriminatorMap(
  *     typeProperty="type",
  *     mapping={
@@ -36,28 +37,36 @@ class Goal
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @var Collection<Result>
+     *
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="goals")
+     *
      * @ORM\JoinTable(name="chill_person_social_work_goal_result")
      */
     private Collection $results;
 
     /**
      * @var Collection<SocialAction>
+     *
      * @ORM\ManyToMany(targetEntity=SocialAction::class, mappedBy="goals")
      */
     private Collection $socialActions;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $title = [];
@@ -86,7 +95,7 @@ class Goal
         return $this;
     }
 
-    public function getDesactivationDate(): ?DateTimeInterface
+    public function getDesactivationDate(): ?\DateTimeInterface
     {
         return $this->desactivationDate;
     }
@@ -131,7 +140,7 @@ class Goal
         return $this;
     }
 
-    public function setDesactivationDate(?DateTimeInterface $desactivationDate): self
+    public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self
     {
         $this->desactivationDate = $desactivationDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
index aa7638ca3..c8afb0456 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Entity\SocialWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
 use DateTime;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -22,7 +21,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_social_work_result")
+ *
  * @Serializer\DiscriminatorMap(
  *     typeProperty="type",
  *     mapping={
@@ -34,12 +35,14 @@ class Result
 {
     /**
      * @var Collection<AccompanyingPeriodWorkGoal>
+     *
      * @ORM\ManyToMany(targetEntity=AccompanyingPeriodWorkGoal::class, mappedBy="results")
      */
     private Collection $accompanyingPeriodWorkGoals;
 
     /**
      * @var Collection<AccompanyingPeriodWork>
+     *
      * @ORM\ManyToMany(targetEntity=AccompanyingPeriodWork::class, mappedBy="results")
      */
     private Collection $accompanyingPeriodWorks;
@@ -47,31 +50,38 @@ class Result
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private ?DateTime $desactivationDate = null;
+    private ?\DateTime $desactivationDate = null;
 
     /**
      * @var Collection<Goal>
+     *
      * @ORM\ManyToMany(targetEntity=Goal::class, mappedBy="results")
      */
     private Collection $goals;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @var Collection<SocialAction>
+     *
      * @ORM\ManyToMany(targetEntity=SocialAction::class, mappedBy="results")
      */
     private Collection $socialActions;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $title = [];
@@ -136,7 +146,7 @@ class Result
         return $this->accompanyingPeriodWorks;
     }
 
-    public function getDesactivationDate(): ?DateTimeInterface
+    public function getDesactivationDate(): ?\DateTimeInterface
     {
         return $this->desactivationDate;
     }
@@ -195,7 +205,7 @@ class Result
         return $this;
     }
 
-    public function setDesactivationDate(?DateTimeInterface $desactivationDate): self
+    public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self
     {
         $this->desactivationDate = $desactivationDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
index f98964fcb..8361399f5 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Entity\SocialWork;
 
 use DateInterval;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ReadableCollection;
@@ -21,7 +20,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_social_action")
+ *
  * @Serializer\DiscriminatorMap(
  *     typeProperty="type",
  *     mapping={
@@ -33,6 +34,7 @@ class SocialAction
 {
     /**
      * @var Collection<SocialAction>
+     *
      * @ORM\OneToMany(targetEntity=SocialAction::class, mappedBy="parent")
      */
     private Collection $children;
@@ -49,21 +51,27 @@ class SocialAction
 
     /**
      * @var Collection<Evaluation>
+     *
      * @ORM\ManyToMany(targetEntity=Evaluation::class, inversedBy="socialActions")
+     *
      * @ORM\JoinTable(name="chill_person_social_work_evaluation_action")
      */
     private Collection $evaluations;
 
     /**
      * @var Collection<Goal>
+     *
      * @ORM\ManyToMany(targetEntity=Goal::class, inversedBy="socialActions")
+     *
      * @ORM\JoinTable(name="chill_person_social_action_goal")
      */
     private Collection $goals;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -85,7 +93,9 @@ class SocialAction
 
     /**
      * @var Collection<Result>
+     *
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="socialActions")
+     *
      * @ORM\JoinTable(name="chill_person_social_action_result")
      */
     private Collection $results;
@@ -187,12 +197,12 @@ class SocialAction
         return $this->children;
     }
 
-    public function getDefaultNotificationDelay(): ?DateInterval
+    public function getDefaultNotificationDelay(): ?\DateInterval
     {
         return $this->defaultNotificationDelay;
     }
 
-    public function getDesactivationDate(): ?DateTimeInterface
+    public function getDesactivationDate(): ?\DateTimeInterface
     {
         return $this->desactivationDate;
     }
@@ -369,14 +379,14 @@ class SocialAction
         return $this;
     }
 
-    public function setDefaultNotificationDelay(DateInterval $defaultNotificationDelay): self
+    public function setDefaultNotificationDelay(\DateInterval $defaultNotificationDelay): self
     {
         $this->defaultNotificationDelay = $defaultNotificationDelay;
 
         return $this;
     }
 
-    public function setDesactivationDate(?DateTimeInterface $desactivationDate): self
+    public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self
     {
         $this->desactivationDate = $desactivationDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
index 000d83397..12e1c1742 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Entity\SocialWork;
 
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -20,7 +19,9 @@ use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_social_issue")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "social_issue": SocialIssue::class
  * })
@@ -29,6 +30,7 @@ class SocialIssue
 {
     /**
      * @var Collection<SocialIssue>
+     *
      * @ORM\OneToMany(targetEntity=SocialIssue::class, mappedBy="parent")
      */
     private Collection $children;
@@ -40,7 +42,9 @@ class SocialIssue
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -57,12 +61,14 @@ class SocialIssue
 
     /**
      * @var Collection<SocialAction>
+     *
      * @ORM\OneToMany(targetEntity=SocialAction::class, mappedBy="issue")
      */
     private Collection $socialActions;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Groups({"read"})
      */
     private array $title = [];
@@ -76,7 +82,6 @@ class SocialIssue
     /**
      * @internal use @see{SocialIssue::setParent} instead
      *
-     *
      * @return $this
      */
     public function addChild(self $child): self
@@ -163,7 +168,7 @@ class SocialIssue
         return $this->children;
     }
 
-    public function getDesactivationDate(): ?DateTimeInterface
+    public function getDesactivationDate(): ?\DateTimeInterface
     {
         return $this->desactivationDate;
     }
@@ -255,7 +260,7 @@ class SocialIssue
 
     /**
      * @return Collection<SocialAction> All the descendant social actions of all
-     * the descendants of the entity
+     *                                  the descendants of the entity
      */
     public function getRecursiveSocialActions(): Collection
     {
@@ -336,7 +341,7 @@ class SocialIssue
         return $this;
     }
 
-    public function setDesactivationDate(?DateTimeInterface $desactivationDate): self
+    public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self
     {
         $this->desactivationDate = $desactivationDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php b/src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php
index 47f3dbbe7..cf15018fd 100644
--- a/src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php
+++ b/src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php
@@ -15,8 +15,6 @@ use Chill\MainBundle\Entity\Address;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
-use DateTimeImmutable;
 use Symfony\Contracts\EventDispatcher\Event;
 
 class PersonAddressMoveEvent extends Event
@@ -42,7 +40,7 @@ class PersonAddressMoveEvent extends Event
      * * or the date of the move
      * * or the date when the household leaving take place (the end date of the previous membership)
      */
-    public function getMoveDate(): DateTimeImmutable
+    public function getMoveDate(): \DateTimeImmutable
     {
         if ($this->personLeaveWithoutHousehold()) {
             return $this->getPreviousMembership()->getEndDate();
@@ -53,7 +51,7 @@ class PersonAddressMoveEvent extends Event
         }
 
         // person is changing address without household
-        return DateTimeImmutable::createFromMutable($this->getNextAddress()->getValidFrom());
+        return \DateTimeImmutable::createFromMutable($this->getNextAddress()->getValidFrom());
     }
 
     public function getNextAddress(): ?Address
@@ -61,8 +59,7 @@ class PersonAddressMoveEvent extends Event
         if (null !== $this->getNextMembership()) {
             return $this->getNextMembership()->getHousehold()
                 ->getCurrentAddress(
-                    $this->getMoveDate() === null ? null :
-                            DateTime::createFromImmutable($this->getMoveDate())
+                    \DateTime::createFromImmutable($this->getMoveDate())
                 );
         }
 
@@ -93,8 +90,7 @@ class PersonAddressMoveEvent extends Event
         if (null !== $this->getPreviousMembership()) {
             return $this->getPreviousMembership()->getHousehold()
                 ->getCurrentAddress(
-                    null === $this->getMoveDate() ? null :
-                        DateTime::createFromImmutable($this->getMoveDate())
+                    \DateTime::createFromImmutable($this->getMoveDate())
                 );
         }
 
@@ -166,7 +162,7 @@ class PersonAddressMoveEvent extends Event
     /**
      * Will the change affect this date ?
      */
-    public function willChangeBeActiveAt(DateTimeImmutable $date): bool
+    public function willChangeBeActiveAt(\DateTimeImmutable $date): bool
     {
         if ($this->getMoveDate() < $date && $this->personLeaveWithoutHousehold()) {
             return true;
diff --git a/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php b/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php
index 1d1fcb4b0..e94c6e923 100644
--- a/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php
+++ b/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php
@@ -14,8 +14,6 @@ namespace Chill\PersonBundle\EventListener;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonAltName;
 
-use const MB_CASE_TITLE;
-
 class PersonEventListener
 {
     public function prePersistAltName(PersonAltName $altname)
@@ -26,7 +24,7 @@ class PersonEventListener
 
     public function prePersistPerson(Person $person): void
     {
-        $firstnameCaps = mb_convert_case(mb_strtolower($person->getFirstName()), MB_CASE_TITLE, 'UTF-8');
+        $firstnameCaps = mb_convert_case(mb_strtolower($person->getFirstName()), \MB_CASE_TITLE, 'UTF-8');
         $firstnameCaps = ucwords(strtolower($firstnameCaps), " \t\r\n\f\v'-");
         $person->setFirstName($firstnameCaps);
 
diff --git a/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php b/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
index 730aa84d3..d0e610687 100644
--- a/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
+++ b/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
@@ -12,29 +12,25 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export;
 
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
-
-use function in_array;
 
 class AbstractAccompanyingPeriodExportElement
 {
     /**
      * Add the accompanying period alias to the query.
      *
-     * @throws LogicException if the "person" alias is not present and attaching accompanying period is not possible
+     * @throws \LogicException if the "person" alias is not present and attaching accompanying period is not possible
      */
     protected function addJoinAccompanyingPeriod(QueryBuilder $query): void
     {
-        if (false === in_array('person', $query->getAllAliases(), true)) {
-            throw new LogicException("the alias 'person' does not exists in "
-                . 'query builder');
+        if (false === \in_array('person', $query->getAllAliases(), true)) {
+            throw new \LogicException("the alias 'person' does not exists in ".'query builder');
         }
 
-        if (!in_array('acppart', $query->getAllAliases(), true)) {
+        if (!\in_array('acppart', $query->getAllAliases(), true)) {
             $query->join('person.accompanyingPeriodParticipations', 'acppart');
         }
 
-        if (!in_array('acp', $query->getAllAliases(), true)) {
+        if (!\in_array('acp', $query->getAllAliases(), true)) {
             $query->join('acppart.accompanyingPeriod', 'acp');
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
index d6d96a789..522b2ecdd 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class AdministrativeLocationAggregator implements AggregatorInterface
 {
@@ -30,7 +29,7 @@ class AdministrativeLocationAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acploc', $qb->getAllAliases(), true)) {
+        if (!\in_array('acploc', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.administrativeLocation', 'acploc');
         }
 
@@ -47,6 +46,7 @@ class AdministrativeLocationAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -65,7 +65,7 @@ class AdministrativeLocationAggregator implements AggregatorInterface
 
             $l = $this->locationRepository->find($value);
 
-            return $l->getName() . ' (' . $this->translatableStringHelper->localize($l->getLocationType()->getTitle()) . ')';
+            return $l->getName().' ('.$this->translatableStringHelper->localize($l->getLocationType()->getTitle()).')';
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php
index 104b934ca..8f4797302 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php
@@ -26,7 +26,7 @@ class ByActionNumberAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data): void
     {
-        $qb->addSelect('(SELECT COUNT(acp_by_action_action.id) FROM ' . AccompanyingPeriodWork::class . ' acp_by_action_action WHERE acp_by_action_action.accompanyingPeriod = acp) AS acp_by_action_number_aggregator')
+        $qb->addSelect('(SELECT COUNT(acp_by_action_action.id) FROM '.AccompanyingPeriodWork::class.' acp_by_action_action WHERE acp_by_action_action.accompanyingPeriod = acp) AS acp_by_action_number_aggregator')
             ->addGroupBy('acp_by_action_number_aggregator');
     }
 
@@ -39,6 +39,7 @@ class ByActionNumberAggregator implements AggregatorInterface
     {
         // No form needed
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
index a892e522a..259d5fb66 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
@@ -42,6 +42,7 @@ class ClosingMotiveAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php
index c5cb2f03c..0e3e5f735 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php
@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -42,6 +41,7 @@ class ConfidentialAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -57,7 +57,7 @@ class ConfidentialAggregator implements AggregatorInterface
             return match ($value) {
                 true => $this->translator->trans('is confidential'),
                 false => $this->translator->trans('is not confidential'),
-                default => throw new LogicException(sprintf('The value %s is not valid', $value)),
+                default => throw new \LogicException(sprintf('The value %s is not valid', $value)),
             };
         };
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php
index 8dee2e5f0..32afe5247 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php
@@ -41,16 +41,16 @@ class CreatorJobAggregator implements AggregatorInterface
 
         $qb
             ->leftJoin(
-                "acp.userHistories",
+                'acp.userHistories',
                 "{$p}_userHistory",
                 Join::WITH,
                 $qb->expr()->andX(
-                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", "acp.id"),
+                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
                     $qb->expr()->andX(
-                        $qb->expr()->gte("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.startDate"),
+                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
                         $qb->expr()->orX(
                             $qb->expr()->isNull("{$p}_userHistory.endDate"),
-                            $qb->expr()->lt("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.endDate")
+                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
                         )
                     )
                 )
@@ -105,7 +105,7 @@ class CreatorJobAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
index 22fafa4c2..5d0b0e87f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
@@ -13,9 +13,7 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
-use DateTimeImmutable;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -42,11 +40,11 @@ final readonly class DurationAggregator implements AggregatorInterface
             'week' => $qb->addSelect('(COALESCE(acp.closingDate, :now) - acp.openingDate) / 7  AS duration_aggregator'),
             'month' => $qb->addSelect('(EXTRACT (MONTH FROM AGE(COALESCE(acp.closingDate, :now), acp.openingDate)) * 12 +
                     EXTRACT (MONTH FROM AGE(COALESCE(acp.closingDate, :now), acp.openingDate))) AS duration_aggregator'),
-            default => throw new LogicException('precision not supported: ' . $data['precision']),
+            default => throw new \LogicException('precision not supported: '.$data['precision']),
         };
 
         $qb
-            ->setParameter('now', new DateTimeImmutable('now'))
+            ->setParameter('now', new \DateTimeImmutable('now'))
             ->addGroupBy('duration_aggregator')
             ->addOrderBy('duration_aggregator');
     }
@@ -61,11 +59,12 @@ final readonly class DurationAggregator implements AggregatorInterface
         $builder->add('precision', ChoiceType::class, [
             'choices' => array_combine(self::CHOICES, self::CHOICES),
             'label' => 'export.aggregator.course.duration.Precision',
-            'choice_label' => static fn (string $c) => 'export.aggregator.course.duration.' . $c,
+            'choice_label' => static fn (string $c) => 'export.aggregator.course.duration.'.$c,
             'multiple' => false,
             'expanded' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -75,7 +74,7 @@ final readonly class DurationAggregator implements AggregatorInterface
     {
         return static function ($value) use ($data) {
             if ('_header' === $value) {
-                return 'export.aggregator.course.duration.' . $data['precision'];
+                return 'export.aggregator.course.duration.'.$data['precision'];
             }
 
             if (null === $value) {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php
index 0440894a7..0217166d2 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php
@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -42,6 +41,7 @@ class EmergencyAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -57,7 +57,7 @@ class EmergencyAggregator implements AggregatorInterface
             return match ($value) {
                 true => $this->translator->trans('is emergency'),
                 false => $this->translator->trans('is not emergency'),
-                default => throw new LogicException(sprintf('The value %s is not valid', $value)),
+                default => throw new \LogicException(sprintf('The value %s is not valid', $value)),
             };
         };
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php
index fb84afe58..a90896ccd 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php
@@ -17,7 +17,6 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class EvaluationAggregator implements AggregatorInterface
 {
@@ -30,11 +29,11 @@ final readonly class EvaluationAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpw', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpw', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.works', 'acpw');
         }
 
-        if (!in_array('workeval', $qb->getAllAliases(), true)) {
+        if (!\in_array('workeval', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.accompanyingPeriodWorkEvaluations', 'workeval');
         }
 
@@ -51,6 +50,7 @@ final readonly class EvaluationAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
index 7f23bd103..25205d46a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
@@ -25,7 +25,6 @@ use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use UnexpectedValueException;
 
 final readonly class GeographicalUnitStatAggregator implements AggregatorInterface
 {
@@ -118,6 +117,7 @@ final readonly class GeographicalUnitStatAggregator implements AggregatorInterfa
                 'expanded' => true,
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
@@ -148,7 +148,7 @@ final readonly class GeographicalUnitStatAggregator implements AggregatorInterfa
 
                 return $value;
             },
-            default => throw new UnexpectedValueException('this value should not happens'),
+            default => throw new \UnexpectedValueException('this value should not happens'),
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
index 6d45183bd..de42039c1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -42,6 +41,7 @@ class IntensityAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -57,7 +57,7 @@ class IntensityAggregator implements AggregatorInterface
             return match ($value) {
                 'occasional' => $this->translator->trans('is occasional'),
                 'regular' => $this->translator->trans('is regular'),
-                default => throw new LogicException(sprintf('The value %s is not valid', $value)),
+                default => throw new \LogicException(sprintf('The value %s is not valid', $value)),
             };
         };
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobWorkingOnCourseAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobWorkingOnCourseAggregator.php
index b42bb0cd5..69f443300 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobWorkingOnCourseAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobWorkingOnCourseAggregator.php
@@ -42,11 +42,11 @@ final readonly class JobWorkingOnCourseAggregator implements AggregatorInterface
         $qb
             ->leftJoin(
                 AccompanyingPeriodInfo::class,
-                "acpinfo",
+                'acpinfo',
                 Join::WITH,
-                $qb->expr()->eq("IDENTITY(acpinfo.accompanyingPeriod)", "acp.id")
+                $qb->expr()->eq('IDENTITY(acpinfo.accompanyingPeriod)', 'acp.id')
             )
-            ->leftJoin("acpinfo.user", "{$p}_user")
+            ->leftJoin('acpinfo.user', "{$p}_user")
             ->leftJoin(
                 UserJobHistory::class,
                 "{$p}_history",
@@ -56,10 +56,10 @@ final readonly class JobWorkingOnCourseAggregator implements AggregatorInterface
             // job_at based on _info.infoDate
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", "acpinfo.infoDate"),
+                    $qb->expr()->lte("{$p}_history.startDate", 'acpinfo.infoDate'),
                     $qb->expr()->orX(
                         $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", "acpinfo.infoDate")
+                        $qb->expr()->gt("{$p}_history.endDate", 'acpinfo.infoDate')
                     )
                 )
             )
@@ -100,7 +100,7 @@ final readonly class JobWorkingOnCourseAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
index 5d17e6185..6061f36ca 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
@@ -19,7 +19,6 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final class OriginAggregator implements AggregatorInterface
 {
@@ -39,7 +38,7 @@ final class OriginAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acporigin', $qb->getAllAliases(), true)) {
+        if (!\in_array('acporigin', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.origin', 'acporigin');
         }
 
@@ -56,6 +55,7 @@ final class OriginAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
index 353b76505..823b10d86 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
@@ -37,17 +37,17 @@ final readonly class ReferrerAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb
-            ->addSelect('IDENTITY(' . self::A . '.user) AS referrer_aggregator')
+            ->addSelect('IDENTITY('.self::A.'.user) AS referrer_aggregator')
             ->addGroupBy('referrer_aggregator')
             ->leftJoin('acp.userHistories', self::A)
             ->andWhere(
                 $qb->expr()->orX(
                     $qb->expr()->isNull(self::A),
                     $qb->expr()->andX(
-                        $qb->expr()->lte(self::A . '.startDate', ':' . self::P),
+                        $qb->expr()->lte(self::A.'.startDate', ':'.self::P),
                         $qb->expr()->orX(
-                            $qb->expr()->isNull(self::A . '.endDate'),
-                            $qb->expr()->gt(self::A . '.endDate', ':' . self::P)
+                            $qb->expr()->isNull(self::A.'.endDate'),
+                            $qb->expr()->gt(self::A.'.endDate', ':'.self::P)
                         )
                     )
                 )
@@ -71,6 +71,7 @@ final readonly class ReferrerAggregator implements AggregatorInterface
                 'required' => true,
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
index 664d3f77e..9f58b6539 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 readonly class ReferrerScopeAggregator implements AggregatorInterface
@@ -41,16 +40,16 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface
 
         $qb
             ->leftJoin(
-                "acp.userHistories",
+                'acp.userHistories',
                 "{$p}_userHistory",
                 Join::WITH,
                 $qb->expr()->andX(
-                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", "acp.id"),
+                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
                     $qb->expr()->andX(
-                        $qb->expr()->gte("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.startDate"),
+                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
                         $qb->expr()->orX(
                             $qb->expr()->isNull("{$p}_userHistory.endDate"),
-                            $qb->expr()->lt("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.endDate")
+                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
                         )
                     )
                 )
@@ -100,7 +99,7 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface
             $scope = $this->scopeRepository->find($value);
 
             if (null === $scope) {
-                throw new LogicException('no scope found with this id: ' . $value);
+                throw new \LogicException('no scope found with this id: '.$value);
             }
 
             return $this->translatableStringHelper->localize($scope->getName());
@@ -109,7 +108,7 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
index 734067b09..ec168ceaf 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
@@ -16,7 +16,6 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 final readonly class RequestorAggregator implements AggregatorInterface
 {
@@ -29,7 +28,7 @@ final readonly class RequestorAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acppart', $qb->getAllAliases(), true)) {
+        if (!\in_array('acppart', $qb->getAllAliases(), true)) {
             $qb->join('acp.participations', 'acppart');
         }
 
@@ -63,6 +62,7 @@ final readonly class RequestorAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
index c8f73f635..06dbc906d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class ScopeAggregator implements AggregatorInterface
 {
@@ -30,7 +29,7 @@ final readonly class ScopeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpscope', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpscope', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.scopes', 'acpscope');
         }
 
@@ -47,6 +46,7 @@ final readonly class ScopeAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeWorkingOnCourseAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeWorkingOnCourseAggregator.php
index f0dcff515..8b3466158 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeWorkingOnCourseAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeWorkingOnCourseAggregator.php
@@ -42,11 +42,11 @@ final readonly class ScopeWorkingOnCourseAggregator implements AggregatorInterfa
         $qb
             ->leftJoin(
                 AccompanyingPeriodInfo::class,
-                "acpinfo",
+                'acpinfo',
                 Join::WITH,
-                $qb->expr()->eq("IDENTITY(acpinfo.accompanyingPeriod)", "acp.id")
+                $qb->expr()->eq('IDENTITY(acpinfo.accompanyingPeriod)', 'acp.id')
             )
-            ->leftJoin("acpinfo.user", "{$p}_user")
+            ->leftJoin('acpinfo.user', "{$p}_user")
             ->leftJoin(
                 UserScopeHistory::class,
                 "{$p}_history",
@@ -56,10 +56,10 @@ final readonly class ScopeWorkingOnCourseAggregator implements AggregatorInterfa
             // scope_at based on _info.infoDate
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", "acpinfo.infoDate"),
+                    $qb->expr()->lte("{$p}_history.startDate", 'acpinfo.infoDate'),
                     $qb->expr()->orX(
                         $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", "acpinfo.infoDate")
+                        $qb->expr()->gt("{$p}_history.endDate", 'acpinfo.infoDate')
                     )
                 )
             )
@@ -100,7 +100,7 @@ final readonly class ScopeWorkingOnCourseAggregator implements AggregatorInterfa
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX. '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php
index ac272ac35..7abad2602 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php
@@ -17,7 +17,6 @@ use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class SocialActionAggregator implements AggregatorInterface
 {
@@ -30,7 +29,7 @@ final readonly class SocialActionAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpw', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpw', $qb->getAllAliases(), true)) {
             // here, we will only see accompanying period linked with a socialAction
             $qb->join('acp.works', 'acpw');
         }
@@ -48,6 +47,7 @@ final readonly class SocialActionAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
index b596ab83b..8c0cbfbd5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
@@ -17,7 +17,6 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class SocialIssueAggregator implements AggregatorInterface
 {
@@ -30,7 +29,7 @@ final readonly class SocialIssueAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpsocialissue', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpsocialissue', $qb->getAllAliases(), true)) {
             // we will see accompanying period linked with social issues
             $qb->join('acp.socialIssues', 'acpsocialissue');
         }
@@ -48,6 +47,7 @@ final readonly class SocialIssueAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
index 99d34586b..dd5c26371 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
@@ -20,7 +20,6 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 final readonly class StepAggregator implements AggregatorInterface
 {
@@ -37,20 +36,20 @@ final readonly class StepAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array(self::A, $qb->getAllAliases(), true)) {
+        if (!\in_array(self::A, $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.stepHistories', self::A);
         }
 
         $qb
-            ->addSelect(self::A . '.step AS step_aggregator')
+            ->addSelect(self::A.'.step AS step_aggregator')
             ->andWhere(
                 $qb->expr()->orX(
-                    $qb->expr()->isNull(self::A . '.step'),
+                    $qb->expr()->isNull(self::A.'.step'),
                     $qb->expr()->andX(
-                        $qb->expr()->lte(self::A . '.startDate', ':' . self::P),
+                        $qb->expr()->lte(self::A.'.startDate', ':'.self::P),
                         $qb->expr()->orX(
-                            $qb->expr()->isNull(self::A . '.endDate'),
-                            $qb->expr()->lt(self::A . '.endDate', ':' . self::P)
+                            $qb->expr()->isNull(self::A.'.endDate'),
+                            $qb->expr()->lt(self::A.'.endDate', ':'.self::P)
                         )
                     )
                 )
@@ -68,6 +67,7 @@ final readonly class StepAggregator implements AggregatorInterface
     {
         $builder->add('on_date', PickRollingDateType::class, []);
     }
+
     public function getFormDefaultData(): array
     {
         return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php
index ff3c0a3b2..0702edf6f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php
@@ -40,16 +40,16 @@ final readonly class UserJobAggregator implements AggregatorInterface
 
         $qb
             ->leftJoin(
-                "acp.userHistories",
+                'acp.userHistories',
                 "{$p}_userHistory",
                 Join::WITH,
                 $qb->expr()->andX(
-                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", "acp.id"),
+                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
                     $qb->expr()->andX(
-                        $qb->expr()->gte("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.startDate"),
+                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
                         $qb->expr()->orX(
                             $qb->expr()->isNull("{$p}_userHistory.endDate"),
-                            $qb->expr()->lt("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.endDate")
+                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
                         )
                     )
                 )
@@ -108,7 +108,7 @@ final readonly class UserJobAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserWorkingOnCourseAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserWorkingOnCourseAggregator.php
index b36795cdd..b27477fd8 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserWorkingOnCourseAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserWorkingOnCourseAggregator.php
@@ -88,7 +88,7 @@ final readonly class UserWorkingOnCourseAggregator implements AggregatorInterfac
             $qb->leftJoin('acpinfo.user', 'acpinfo_user');
         }
 
-        $qb->addSelect('acpinfo_user.id AS ' . self::COLUMN_NAME);
+        $qb->addSelect('acpinfo_user.id AS '.self::COLUMN_NAME);
         $qb->addGroupBy('acpinfo_user.id');
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php
index 9ea50a990..07c182421 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php
@@ -14,10 +14,8 @@ namespace Chill\PersonBundle\Export\Aggregator\EvaluationAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class ByEndDateAggregator implements AggregatorInterface
 {
@@ -40,7 +38,7 @@ final class ByEndDateAggregator implements AggregatorInterface
             'week' => 'YYYY-IW',
             'month' => 'YYYY-MM',
             'year' => 'YYYY',
-            default => throw new LogicException(sprintf("The frequency data '%s' is invalid.", $data['frequency'])),
+            default => throw new \LogicException(sprintf("The frequency data '%s' is invalid.", $data['frequency'])),
         };
 
         $qb->addSelect(sprintf("TO_CHAR(workeval.endDate, '%s') AS eval_by_end_date_aggregator", $fmt));
@@ -62,6 +60,7 @@ final class ByEndDateAggregator implements AggregatorInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['frequency' => self::DEFAULT_CHOICE];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php
index e68709244..9193dc5a9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php
@@ -14,10 +14,8 @@ namespace Chill\PersonBundle\Export\Aggregator\EvaluationAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class ByMaxDateAggregator implements AggregatorInterface
 {
@@ -40,7 +38,7 @@ final class ByMaxDateAggregator implements AggregatorInterface
             'week' => 'YYYY-IW',
             'month' => 'YYYY-MM',
             'year' => 'YYYY',
-            default => throw new LogicException(sprintf("The frequency data '%s' is invalid.", $data['frequency'])),
+            default => throw new \LogicException(sprintf("The frequency data '%s' is invalid.", $data['frequency'])),
         };
 
         $qb->addSelect(sprintf("TO_CHAR(workeval.maxDate, '%s') AS eval_by_max_date_aggregator", $fmt));
@@ -62,6 +60,7 @@ final class ByMaxDateAggregator implements AggregatorInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['frequency' => self::DEFAULT_CHOICE];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php
index 1fae7fe05..e797d5ae7 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php
@@ -14,10 +14,8 @@ namespace Chill\PersonBundle\Export\Aggregator\EvaluationAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class ByStartDateAggregator implements AggregatorInterface
 {
@@ -40,7 +38,7 @@ final class ByStartDateAggregator implements AggregatorInterface
             'week' => 'YYYY-IW',
             'month' => 'YYYY-MM',
             'year' => 'YYYY',
-            default => throw new LogicException(sprintf("The frequency data '%s' is invalid.", $data['frequency'])),
+            default => throw new \LogicException(sprintf("The frequency data '%s' is invalid.", $data['frequency'])),
         };
 
         $qb->addSelect(sprintf("TO_CHAR(workeval.startDate, '%s') AS eval_by_start_date_aggregator", $fmt));
@@ -62,6 +60,7 @@ final class ByStartDateAggregator implements AggregatorInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['frequency' => self::DEFAULT_CHOICE];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
index 0697f00bf..9ff2ad50a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
@@ -42,6 +42,7 @@ class EvaluationTypeAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/HavingEndDateAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/HavingEndDateAggregator.php
index 7030a6e93..4dfddab81 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/HavingEndDateAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/HavingEndDateAggregator.php
@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Export\Aggregator\EvaluationAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -43,6 +42,7 @@ class HavingEndDateAggregator implements AggregatorInterface
     {
         // No form needed
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -58,7 +58,7 @@ class HavingEndDateAggregator implements AggregatorInterface
             return match ($value) {
                 true => $this->translator->trans('export.aggregator.eval.by_end_date.enddate is specified'),
                 false => $this->translator->trans('export.aggregator.eval.by_end_date.enddate is not specified'),
-                default => throw new LogicException(sprintf('The value %s is not valid', $value)),
+                default => throw new \LogicException(sprintf('The value %s is not valid', $value)),
             };
         };
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
index 3f3cbe553..b73b2e600 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
@@ -20,7 +20,6 @@ use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 class ChildrenNumberAggregator implements AggregatorInterface
 {
@@ -33,7 +32,7 @@ class ChildrenNumberAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('composition_children', $qb->getAllAliases(), true)) {
+        if (!\in_array('composition_children', $qb->getAllAliases(), true)) {
             $clause = $qb->expr()->andX(
                 $qb->expr()->lte('composition_children.startDate', ':ondate_composition_children'),
                 $qb->expr()->orX(
@@ -64,6 +63,7 @@ class ChildrenNumberAggregator implements AggregatorInterface
     {
         $builder->add('on_date', PickRollingDateType::class, []);
     }
+
     public function getFormDefaultData(): array
     {
         return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
index ae512b478..3dc3a1398 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
@@ -21,7 +21,6 @@ use Chill\PersonBundle\Repository\Household\HouseholdCompositionTypeRepository;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class CompositionAggregator implements AggregatorInterface
 {
@@ -34,7 +33,7 @@ class CompositionAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('composition_type', $qb->getAllAliases(), true)) {
+        if (!\in_array('composition_type', $qb->getAllAliases(), true)) {
             $clause = $qb->expr()->andX(
                 $qb->expr()->lte('composition_type.startDate', ':ondate_composition_type'),
                 $qb->expr()->orX(
@@ -65,6 +64,7 @@ class CompositionAggregator implements AggregatorInterface
     {
         $builder->add('on_date', PickRollingDateType::class, []);
     }
+
     public function getFormDefaultData(): array
     {
         return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
index 772087487..2ca286b57 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
@@ -49,6 +49,7 @@ final readonly class AgeAggregator implements AggregatorInterface, ExportElement
             'label' => 'Calculate age in relation to this date',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_age_calculation' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/ByHouseholdCompositionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/ByHouseholdCompositionAggregator.php
index ed12c0844..af1018f6e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/ByHouseholdCompositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/ByHouseholdCompositionAggregator.php
@@ -82,6 +82,7 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
             'label' => 'export.aggregator.person.by_household_composition.Calc date',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
@@ -108,7 +109,7 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
 
     public function getQueryKeys($data)
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle()
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php
index c6d8cfae0..4881241f4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Export\Declarations;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -40,11 +39,11 @@ final readonly class CenterAggregator implements AggregatorInterface
     public function getFormDefaultData(): array
     {
         return [
-            'at_date' => new RollingDate(RollingDate::T_TODAY)
+            'at_date' => new RollingDate(RollingDate::T_TODAY),
         ];
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function (null|int|string $value) {
             if (null === $value || '' === $value) {
@@ -91,7 +90,7 @@ final readonly class CenterAggregator implements AggregatorInterface
             );
         $qb->setParameter($atDate, $this->rollingDateConverter->convert($data['at_date']));
 
-        $qb->addSelect("IDENTITY({$alias}.center) AS " . self::COLUMN_NAME);
+        $qb->addSelect("IDENTITY({$alias}.center) AS ".self::COLUMN_NAME);
         $qb->addGroupBy(self::COLUMN_NAME);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
index 53222b1ac..b8d204dc5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
@@ -18,12 +18,10 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Util\CountriesInfo;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 final readonly class CountryOfBirthAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
@@ -41,15 +39,15 @@ final readonly class CountryOfBirthAggregator implements AggregatorInterface, Ex
             $qb->addSelect('countryOfBirth.countryCode as country_of_birth_aggregator');
         } elseif ('continent' === $data['group_by_level']) {
             $clause = 'CASE '
-                    . 'WHEN countryOfBirth.countryCode IN(:cob_africa_codes) THEN \'AF\' '
-                    . 'WHEN countryOfBirth.countryCode IN(:cob_asia_codes) THEN \'AS\' '
-                    . 'WHEN countryOfBirth.countryCode IN(:cob_europe_codes) THEN \'EU\' '
-                    . 'WHEN countryOfBirth.countryCode IN(:cob_north_america_codes) THEN \'NA\' '
-                    . 'WHEN countryOfBirth.countryCode IN(:cob_south_america_codes) THEN \'SA\' '
-                    . 'WHEN countryOfBirth.countryCode IN(:cob_oceania_codes) THEN \'OC\' '
-                    . 'WHEN countryOfBirth.countryCode IN(:cob_antartica_codes) THEN \'AN\' '
-                    . 'ELSE \'\' '
-                    . 'END as country_of_birth_aggregator ';
+                    .'WHEN countryOfBirth.countryCode IN(:cob_africa_codes) THEN \'AF\' '
+                    .'WHEN countryOfBirth.countryCode IN(:cob_asia_codes) THEN \'AS\' '
+                    .'WHEN countryOfBirth.countryCode IN(:cob_europe_codes) THEN \'EU\' '
+                    .'WHEN countryOfBirth.countryCode IN(:cob_north_america_codes) THEN \'NA\' '
+                    .'WHEN countryOfBirth.countryCode IN(:cob_south_america_codes) THEN \'SA\' '
+                    .'WHEN countryOfBirth.countryCode IN(:cob_oceania_codes) THEN \'OC\' '
+                    .'WHEN countryOfBirth.countryCode IN(:cob_antartica_codes) THEN \'AN\' '
+                    .'ELSE \'\' '
+                    .'END as country_of_birth_aggregator ';
             $qb->addSelect($clause);
             $params =
                     [
@@ -66,11 +64,10 @@ final readonly class CountryOfBirthAggregator implements AggregatorInterface, Ex
                 $qb->setParameter($k, $v);
             }
         } else {
-            throw new LogicException("The group_by_level '" . $data['group_by_level']
-                    . ' is not known.');
+            throw new \LogicException("The group_by_level '".$data['group_by_level'].' is not known.');
         }
 
-        if (!in_array('countryOfBirth', $qb->getAllAliases(), true)) {
+        if (!\in_array('countryOfBirth', $qb->getAllAliases(), true)) {
             $qb->leftJoin('person.countryOfBirth', 'countryOfBirth');
         }
 
@@ -94,6 +91,7 @@ final readonly class CountryOfBirthAggregator implements AggregatorInterface, Ex
             'multiple' => false,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
index 98d77167d..0181c6e7b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -41,6 +40,7 @@ final readonly class GenderAggregator implements AggregatorInterface
     }
 
     public function buildForm(FormBuilderInterface $builder) {}
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -70,7 +70,7 @@ final readonly class GenderAggregator implements AggregatorInterface
                     return $this->translator->trans('Gender');
 
                 default:
-                    throw new LogicException(sprintf('The value %s is not valid', $value));
+                    throw new \LogicException(sprintf('The value %s is not valid', $value));
             }
         };
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
index b0c69638b..5b885eca4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
@@ -20,7 +20,6 @@ use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -90,6 +89,7 @@ class GeographicalUnitAggregator implements AggregatorInterface
                 'expanded' => true,
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
@@ -125,7 +125,7 @@ class GeographicalUnitAggregator implements AggregatorInterface
 
                 return $value;
             },
-            default => throw new LogicException('key not supported'),
+            default => throw new \LogicException('key not supported'),
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
index af00eedaa..eb1e52d9b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
@@ -25,7 +25,6 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 final readonly class HouseholdPositionAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
@@ -38,11 +37,11 @@ final readonly class HouseholdPositionAggregator implements AggregatorInterface,
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('householdmember', $qb->getAllAliases(), true)) {
+        if (!\in_array('householdmember', $qb->getAllAliases(), true)) {
             $qb->join(HouseholdMember::class, 'householdmember', Expr\Join::WITH, 'householdmember.person = person');
         }
 
-        if (!in_array('center', $qb->getAllAliases(), true)) {
+        if (!\in_array('center', $qb->getAllAliases(), true)) {
             $qb->join('person.center', 'center');
         }
 
@@ -74,6 +73,7 @@ final readonly class HouseholdPositionAggregator implements AggregatorInterface,
             'label' => 'Household position in relation to this date',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_position' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
index b1811470f..1555a5a12 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
@@ -17,7 +17,6 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\MaritalStatusRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class MaritalStatusAggregator implements AggregatorInterface
 {
@@ -30,7 +29,7 @@ final readonly class MaritalStatusAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('personmarital', $qb->getAllAliases(), true)) {
+        if (!\in_array('personmarital', $qb->getAllAliases(), true)) {
             $qb->join('person.maritalStatus', 'personmarital');
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
index ec9a6dc6e..9daca5b34 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Repository\CountryRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Util\CountriesInfo;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -39,15 +38,15 @@ final readonly class NationalityAggregator implements AggregatorInterface, Expor
             $qb->addSelect('nationality.countryCode as nationality_aggregator');
         } elseif ('continent' === $data['group_by_level']) {
             $clause = 'CASE '
-                    . 'WHEN nationality.countryCode IN(:africa_codes) THEN \'AF\' '
-                    . 'WHEN nationality.countryCode IN(:asia_codes) THEN \'AS\' '
-                    . 'WHEN nationality.countryCode IN(:europe_codes) THEN \'EU\' '
-                    . 'WHEN nationality.countryCode IN(:north_america_codes) THEN \'NA\' '
-                    . 'WHEN nationality.countryCode IN(:south_america_codes) THEN \'SA\' '
-                    . 'WHEN nationality.countryCode IN(:oceania_codes) THEN \'OC\' '
-                    . 'WHEN nationality.countryCode IN(:antartica_codes) THEN \'AN\' '
-                    . 'ELSE \'\' '
-                    . 'END as nationality_aggregator ';
+                    .'WHEN nationality.countryCode IN(:africa_codes) THEN \'AF\' '
+                    .'WHEN nationality.countryCode IN(:asia_codes) THEN \'AS\' '
+                    .'WHEN nationality.countryCode IN(:europe_codes) THEN \'EU\' '
+                    .'WHEN nationality.countryCode IN(:north_america_codes) THEN \'NA\' '
+                    .'WHEN nationality.countryCode IN(:south_america_codes) THEN \'SA\' '
+                    .'WHEN nationality.countryCode IN(:oceania_codes) THEN \'OC\' '
+                    .'WHEN nationality.countryCode IN(:antartica_codes) THEN \'AN\' '
+                    .'ELSE \'\' '
+                    .'END as nationality_aggregator ';
             $qb->addSelect($clause);
             $params =
                     [
@@ -64,8 +63,7 @@ final readonly class NationalityAggregator implements AggregatorInterface, Expor
                 $qb->setParameter($k, $v);
             }
         } else {
-            throw new LogicException("The group_by_level '" . $data['group_by_level']
-                    . ' is not known.');
+            throw new \LogicException("The group_by_level '".$data['group_by_level'].' is not known.');
         }
 
         $qb->leftJoin('person.nationality', 'nationality');
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
index b28df8990..9abf5c1e7 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
@@ -18,9 +18,7 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class ActionTypeAggregator implements AggregatorInterface
 {
@@ -33,11 +31,11 @@ final readonly class ActionTypeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpwsocialaction', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpwsocialaction', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.socialAction', 'acpwsocialaction');
         }
 
-        if (!in_array('acpwsocialissue', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpwsocialissue', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpwsocialaction.issue', 'acpwsocialissue');
         }
 
@@ -57,6 +55,7 @@ final readonly class ActionTypeAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -87,7 +86,7 @@ final readonly class ActionTypeAggregator implements AggregatorInterface
 
                 return $this->socialIssueRender->renderString($si, []);
             },
-            default => throw new LogicException('this key is not supported: ' . $key),
+            default => throw new \LogicException('this key is not supported: '.$key),
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php
index e27752668..a9f8e020a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php
@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -46,6 +45,7 @@ class CurrentActionAggregator implements AggregatorInterface
     {
         // No form needed
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -61,7 +61,7 @@ class CurrentActionAggregator implements AggregatorInterface
             return match ($value) {
                 true => $this->translator->trans('export.aggregator.course_work.by_current_action.Current action'),
                 false => $this->translator->trans('export.aggregator.course_work.by_current_action.Not current action'),
-                default => throw new LogicException(sprintf('The value %s is not valid', $value)),
+                default => throw new \LogicException(sprintf('The value %s is not valid', $value)),
             };
         };
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
index 79ba02dfa..ce1e381f2 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
@@ -17,7 +17,6 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class GoalAggregator implements AggregatorInterface
 {
@@ -30,7 +29,7 @@ final readonly class GoalAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('goal', $qb->getAllAliases(), true)) {
+        if (!\in_array('goal', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.goals', 'goal');
         }
 
@@ -47,6 +46,7 @@ final readonly class GoalAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php
index 04257e9a4..e1549f315 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php
@@ -17,9 +17,7 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
 use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class GoalResultAggregator implements AggregatorInterface
 {
@@ -32,11 +30,11 @@ class GoalResultAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('goal', $qb->getAllAliases(), true)) {
+        if (!\in_array('goal', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.goals', 'goal');
         }
 
-        if (!in_array('goalresult', $qb->getAllAliases(), true)) {
+        if (!\in_array('goalresult', $qb->getAllAliases(), true)) {
             $qb->leftJoin('goal.results', 'goalresult');
         }
 
@@ -54,6 +52,7 @@ class GoalResultAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -90,7 +89,7 @@ class GoalResultAggregator implements AggregatorInterface
                     );
 
                 default:
-                    throw new LogicException();
+                    throw new \LogicException();
             }
         };
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
index c95d4ef37..c8336b09b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
@@ -11,21 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Repository\UserJobRepository;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverter;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class JobAggregator implements AggregatorInterface
 {
@@ -50,7 +44,7 @@ final readonly class JobAggregator implements AggregatorInterface
                 UserJob::class,
                 "{$p}_job",
                 Expr\Join::WITH,
-                'EXISTS (SELECT 1 FROM ' . AccompanyingPeriodWorkReferrerHistory::class . " {$p}_ref_history
+                'EXISTS (SELECT 1 FROM '.AccompanyingPeriodWorkReferrerHistory::class." {$p}_ref_history
                 JOIN {$p}_ref_history.user {$p}_ref_history_user JOIN {$p}_ref_history_user.jobHistories {$p}_job_history
                 WHERE {$p}_ref_history.accompanyingPeriodWork = acpw AND IDENTITY({$p}_job_history.job) = {$p}_job.id AND {$p}_job_history.startDate <= {$p}_ref_history.startDate
                 AND ({$p}_job_history.endDate IS NULL or {$p}_job_history.endDate >= {$p}_ref_history.startDate))"
@@ -94,7 +88,7 @@ final readonly class JobAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
index 99f766ebc..c97229048 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
@@ -20,7 +20,6 @@ use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class ReferrerAggregator implements AggregatorInterface
 {
@@ -42,7 +41,7 @@ final readonly class ReferrerAggregator implements AggregatorInterface
         $p = self::PREFIX;
 
         $qb
-            ->leftJoin('acpw.referrersHistory', $p . "_acpwusers_history")
+            ->leftJoin('acpw.referrersHistory', $p.'_acpwusers_history')
             ->andWhere("{$p}_acpwusers_history.startDate <= :{$p}_calc_date AND ({$p}_acpwusers_history.endDate IS NULL or {$p}_acpwusers_history.endDate > :{$p}_calc_date)");
 
         $qb->setParameter("{$p}_calc_date", $this->rollingDateConverter->convert(
@@ -60,7 +59,7 @@ final readonly class ReferrerAggregator implements AggregatorInterface
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('referrer_at', PickRollingDateType::class, [
-            'label' => 'export.aggregator.course_work.by_treating_agent.Calc date'
+            'label' => 'export.aggregator.course_work.by_treating_agent.Calc date',
         ]);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
index c5cc79ff3..63a037f21 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
@@ -17,7 +17,6 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class ResultAggregator implements AggregatorInterface
 {
@@ -30,7 +29,7 @@ final readonly class ResultAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('result', $qb->getAllAliases(), true)) {
+        if (!\in_array('result', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.results', 'result');
         }
 
@@ -47,6 +46,7 @@ final readonly class ResultAggregator implements AggregatorInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
index 6fc158dad..dfffaa9e4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
@@ -12,20 +12,14 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\User\UserScopeHistory;
-use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Repository\ScopeRepository;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverter;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class ScopeAggregator implements AggregatorInterface
 {
@@ -50,7 +44,7 @@ final readonly class ScopeAggregator implements AggregatorInterface
                 Scope::class,
                 "{$p}_scope",
                 Expr\Join::WITH,
-                'EXISTS (SELECT 1 FROM ' . AccompanyingPeriodWorkReferrerHistory::class . " {$p}_ref_history
+                'EXISTS (SELECT 1 FROM '.AccompanyingPeriodWorkReferrerHistory::class." {$p}_ref_history
                 JOIN {$p}_ref_history.user {$p}_ref_history_user JOIN {$p}_ref_history_user.scopeHistories {$p}_scope_history
                 WHERE {$p}_ref_history.accompanyingPeriodWork = acpw AND IDENTITY({$p}_scope_history.scope) = {$p}_scope.id AND {$p}_scope_history.startDate <= {$p}_ref_history.startDate
                 AND ({$p}_scope_history.endDate IS NULL or {$p}_scope_history.endDate >= {$p}_ref_history.startDate))"
@@ -94,7 +88,7 @@ final readonly class ScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
index 64a2bf53e..a710cccf7 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
@@ -23,7 +23,6 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
@@ -40,6 +39,7 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
     {
         // Nothing to add here
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -63,7 +63,7 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         $labels = array_combine($values, $values);
@@ -104,7 +104,7 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
             ->leftJoin('acppart.person', 'person')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php
index 8c4052090..e1e771222 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php
@@ -22,7 +22,6 @@ use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInterface
@@ -33,6 +32,7 @@ class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInter
     {
         // No form necessary?
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -56,7 +56,7 @@ class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInter
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         $labels = array_combine($values, $values);
@@ -98,7 +98,7 @@ class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInter
             ->join('acppart.person', 'person')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php b/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
index 398e3c1dd..ad32e0a03 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
@@ -21,7 +21,6 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountEvaluation implements ExportInterface, GroupedExportInterface
@@ -29,6 +28,7 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
     public function __construct(private readonly EntityManagerInterface $entityManager) {}
 
     public function buildForm(FormBuilderInterface $builder) {}
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -52,7 +52,7 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         $labels = array_combine($values, $values);
@@ -95,7 +95,7 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
             ->join('acppart.person', 'person')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
index 4837cf44a..9d4d22085 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
@@ -23,7 +23,6 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountHousehold implements ExportInterface, GroupedExportInterface
@@ -36,10 +35,11 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
     {
         $builder
             ->add('calc_date', PickRollingDateType::class, [
-                'label' => self::TR_PREFIX . 'Date of calculation of household members',
+                'label' => self::TR_PREFIX.'Date of calculation of household members',
                 'required' => false,
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -52,7 +52,7 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
 
     public function getDescription(): string
     {
-        return self::TR_PREFIX . 'Count household with accompanying course by various parameters.';
+        return self::TR_PREFIX.'Count household with accompanying course by various parameters.';
     }
 
     public function getGroup(): string
@@ -65,9 +65,9 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
         return static function ($value) use ($key) {
             if ('_header' === $value) {
                 return match ($key) {
-                    'household_export_result' => self::TR_PREFIX . 'Count households',
-                    'acp_export_result' => self::TR_PREFIX . 'Count accompanying periods',
-                    default => throw new LogicException('Key not supported: ' . $key),
+                    'household_export_result' => self::TR_PREFIX.'Count households',
+                    'acp_export_result' => self::TR_PREFIX.'Count accompanying periods',
+                    default => throw new \LogicException('Key not supported: '.$key),
                 };
             }
 
@@ -91,7 +91,7 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
 
     public function getTitle(): string
     {
-        return self::TR_PREFIX . 'Count households with accompanying course';
+        return self::TR_PREFIX.'Count households with accompanying course';
     }
 
     public function getType(): string
@@ -114,7 +114,7 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
             ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
index 3537f63ee..a9635791a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
@@ -20,7 +20,6 @@ use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountPerson implements ExportInterface, GroupedExportInterface
@@ -55,7 +54,7 @@ class CountPerson implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         $labels = array_combine($values, $values);
@@ -98,7 +97,7 @@ class CountPerson implements ExportInterface, GroupedExportInterface
         $qb->select('COUNT(DISTINCT person.id) AS export_result')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
                 )
             )
             ->setParameter('authorized_centers', $centers);
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php b/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
index e9fbd8f2b..a582d987f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
@@ -22,9 +22,7 @@ use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExportInterface
 {
@@ -40,6 +38,7 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
     {
         // TODO: Implement buildForm() method.
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -63,7 +62,7 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         $labels = array_combine($values, $values);
@@ -98,17 +97,17 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
 
         $qb = $this->repository->createQueryBuilder('acp');
 
-        if (!in_array('acppart', $qb->getAllAliases(), true)) {
+        if (!\in_array('acppart', $qb->getAllAliases(), true)) {
             $qb->join('acp.participations', 'acppart');
         }
 
-        if (!in_array('partperson', $qb->getAllAliases(), true)) {
+        if (!\in_array('partperson', $qb->getAllAliases(), true)) {
             $qb->join('acppart.person', 'person');
         }
 
         $qb->andWhere(
             $qb->expr()->exists(
-                'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                'SELECT 1 FROM '.PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
             )
         )->setParameter('authorized_centers', $centers);
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
index 5595263d6..cd6eb2e81 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
@@ -11,41 +11,22 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Export;
 
-use Chill\MainBundle\Entity\Address;
-use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\MainBundle\Export\Helper\DateTimeHelper;
-use Chill\MainBundle\Export\Helper\ExportAddressHelper;
-use Chill\MainBundle\Export\Helper\UserHelper;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Export\Helper\ListAccompanyingPeriodHelper;
-use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
-use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
-use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
-use DateTimeImmutable;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-use function strlen;
 
 final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
 {
@@ -64,10 +45,11 @@ final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExp
                 'required' => true,
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [
-            'calc_date' => new RollingDate(RollingDate::T_TODAY)
+            'calc_date' => new RollingDate(RollingDate::T_TODAY),
         ];
     }
 
@@ -122,8 +104,8 @@ final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExp
             ->andWhere('acp.step != :list_acp_step')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php
index 585eec2d9..6c9b5d202 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php
@@ -41,7 +41,6 @@ use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Export\Helper\LabelThirdPartyHelper;
-use DateTimeImmutable;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
@@ -71,7 +70,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
         'personsName',
         'thirdParties',
         'handlingThierParty',
-        //'acpwReferrers',
+        // 'acpwReferrers',
         'referrers',
         'createdAt',
         'createdBy',
@@ -103,6 +102,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
                 'required' => true,
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -126,10 +126,10 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         return match ($key) {
-            'startDate', 'endDate', 'createdAt', 'updatedAt' => $this->dateTimeHelper->getLabel('export.list.acpw.' . $key),
+            'startDate', 'endDate', 'createdAt', 'updatedAt' => $this->dateTimeHelper->getLabel('export.list.acpw.'.$key),
             'socialAction' => function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.list.acpw.' . $key;
+                    return 'export.list.acpw.'.$key;
                 }
 
                 if (null === $value) {
@@ -143,7 +143,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
             },
             'socialIssue' => function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.list.acpw.' . $key;
+                    return 'export.list.acpw.'.$key;
                 }
 
                 if (null === $value) {
@@ -155,17 +155,17 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
                     []
                 );
             },
-            'createdBy', 'updatedBy', 'acp_user' => $this->userHelper->getLabel($key, $values, 'export.list.acpw.' . $key),
-            'referrers' => $this->userHelper->getLabel($key, $values, 'export.list.acpw.' . $key),
-            //'acpwReferrers' => $this->userHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key),
-            'personsName' => $this->personHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key),
-            'handlingThierParty' => $this->thirdPartyHelper->getLabel($key, $values, 'export.list.acpw.' . $key),
-            'thirdParties' => $this->thirdPartyHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key),
-            'personsId', 'goalsId', 'goalResultsId', 'resultsId', 'evaluationsId' => $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key),
-            'goalsTitle', 'goalResultsTitle', 'resultsTitle', 'evaluationsTitle' => $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key),
+            'createdBy', 'updatedBy', 'acp_user' => $this->userHelper->getLabel($key, $values, 'export.list.acpw.'.$key),
+            'referrers' => $this->userHelper->getLabel($key, $values, 'export.list.acpw.'.$key),
+            // 'acpwReferrers' => $this->userHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key),
+            'personsName' => $this->personHelper->getLabelMulti($key, $values, 'export.list.acpw.'.$key),
+            'handlingThierParty' => $this->thirdPartyHelper->getLabel($key, $values, 'export.list.acpw.'.$key),
+            'thirdParties' => $this->thirdPartyHelper->getLabelMulti($key, $values, 'export.list.acpw.'.$key),
+            'personsId', 'goalsId', 'goalResultsId', 'resultsId', 'evaluationsId' => $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.acpw.'.$key),
+            'goalsTitle', 'goalResultsTitle', 'resultsTitle', 'evaluationsTitle' => $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, 'export.list.acpw.'.$key),
             default => static function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.list.acpw.' . $key;
+                    return 'export.list.acpw.'.$key;
                 }
 
                 if (null === $value) {
@@ -216,7 +216,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
             ->andWhere('acppart.startDate <= :calc_date AND (acppart.endDate > :calc_date OR acppart.endDate IS NULL)')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
@@ -245,7 +245,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
         ];
     }
 
-    private function addSelectClauses(QueryBuilder $qb, DateTimeImmutable $calcDate): void
+    private function addSelectClauses(QueryBuilder $qb, \DateTimeImmutable $calcDate): void
     {
         // add regular fields
         foreach ([
@@ -281,14 +281,14 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
 
         // persons
         $qb
-            ->addSelect('(SELECT AGGREGATE(person_acpw_member.id) FROM ' . Person::class . ' person_acpw_member '
-                . 'WHERE person_acpw_member MEMBER OF acpw.persons) AS personsId')
-            ->addSelect('(SELECT AGGREGATE(person1_acpw_member.id) FROM ' . Person::class . ' person1_acpw_member '
-                . 'WHERE person1_acpw_member MEMBER OF acpw.persons) AS personsName');
+            ->addSelect('(SELECT AGGREGATE(person_acpw_member.id) FROM '.Person::class.' person_acpw_member '
+                .'WHERE person_acpw_member MEMBER OF acpw.persons) AS personsId')
+            ->addSelect('(SELECT AGGREGATE(person1_acpw_member.id) FROM '.Person::class.' person1_acpw_member '
+                .'WHERE person1_acpw_member MEMBER OF acpw.persons) AS personsName');
 
         // referrers => at date XXXX
         $qb
-            ->addSelect('(SELECT JSON_BUILD_OBJECT(\'uid\', IDENTITY(history.user), \'d\', history.startDate) FROM ' . UserHistory::class . ' history ' .
+            ->addSelect('(SELECT JSON_BUILD_OBJECT(\'uid\', IDENTITY(history.user), \'d\', history.startDate) FROM '.UserHistory::class.' history '.
             'WHERE history.accompanyingPeriod = acp AND history.startDate <= :calcDate AND (history.endDate IS NULL OR history.endDate > :calcDate)) AS referrers');
 
         /*
@@ -304,39 +304,39 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
 
         // thirdparties
         $qb
-            ->addSelect('(SELECT AGGREGATE(tp.id) FROM ' . ThirdParty::class . ' tp '
-                . 'WHERE tp MEMBER OF acpw.thirdParties) AS thirdParties');
+            ->addSelect('(SELECT AGGREGATE(tp.id) FROM '.ThirdParty::class.' tp '
+                .'WHERE tp MEMBER OF acpw.thirdParties) AS thirdParties');
 
         // goals
         $qb
-            ->addSelect('(SELECT AGGREGATE(IDENTITY(goal.goal)) FROM ' . AccompanyingPeriodWorkGoal::class . ' goal '
-                . 'WHERE goal MEMBER OF acpw.goals) AS goalsId')
-            ->addSelect('(SELECT AGGREGATE(g.title) FROM ' . AccompanyingPeriodWorkGoal::class . ' goal1 '
-                . 'LEFT JOIN ' . Goal::class . ' g WITH goal1.goal = g.id WHERE goal1 MEMBER OF acpw.goals) AS goalsTitle');
+            ->addSelect('(SELECT AGGREGATE(IDENTITY(goal.goal)) FROM '.AccompanyingPeriodWorkGoal::class.' goal '
+                .'WHERE goal MEMBER OF acpw.goals) AS goalsId')
+            ->addSelect('(SELECT AGGREGATE(g.title) FROM '.AccompanyingPeriodWorkGoal::class.' goal1 '
+                .'LEFT JOIN '.Goal::class.' g WITH goal1.goal = g.id WHERE goal1 MEMBER OF acpw.goals) AS goalsTitle');
 
         // goals results
         $qb
-            ->addSelect('(SELECT AGGREGATE(wr.id) FROM ' . Result::class . ' wr '
-                . 'JOIN ' . AccompanyingPeriodWorkGoal::class . ' wg WITH wr MEMBER OF wg.results '
-                . 'WHERE wg MEMBER OF acpw.goals) AS goalResultsId')
-            ->addSelect('(SELECT AGGREGATE(wr1.title) FROM ' . Result::class . ' wr1 '
-                . 'JOIN ' . AccompanyingPeriodWorkGoal::class . ' wg1 WITH wr1 MEMBER OF wg1.results '
-                . 'WHERE wg1 MEMBER OF acpw.goals) AS goalResultsTitle');
+            ->addSelect('(SELECT AGGREGATE(wr.id) FROM '.Result::class.' wr '
+                .'JOIN '.AccompanyingPeriodWorkGoal::class.' wg WITH wr MEMBER OF wg.results '
+                .'WHERE wg MEMBER OF acpw.goals) AS goalResultsId')
+            ->addSelect('(SELECT AGGREGATE(wr1.title) FROM '.Result::class.' wr1 '
+                .'JOIN '.AccompanyingPeriodWorkGoal::class.' wg1 WITH wr1 MEMBER OF wg1.results '
+                .'WHERE wg1 MEMBER OF acpw.goals) AS goalResultsTitle');
 
         // results
         $qb
-            ->addSelect('(SELECT AGGREGATE(result.id) FROM ' . Result::class . ' result '
-                . 'WHERE result MEMBER OF acpw.results ) AS resultsId ')
-            ->addSelect('(SELECT AGGREGATE (result1.title) FROM ' . Result::class . ' result1 '
-                . 'WHERE result1 MEMBER OF acpw.results ) AS resultsTitle ');
+            ->addSelect('(SELECT AGGREGATE(result.id) FROM '.Result::class.' result '
+                .'WHERE result MEMBER OF acpw.results ) AS resultsId ')
+            ->addSelect('(SELECT AGGREGATE (result1.title) FROM '.Result::class.' result1 '
+                .'WHERE result1 MEMBER OF acpw.results ) AS resultsTitle ');
 
         // evaluations
         $qb
-            ->addSelect('(SELECT AGGREGATE(IDENTITY(we.evaluation)) FROM ' . AccompanyingPeriodWorkEvaluation::class . ' we '
-                . 'WHERE we MEMBER OF acpw.accompanyingPeriodWorkEvaluations ) AS evaluationsId ')
-            ->addSelect('(SELECT AGGREGATE(ev.title) FROM ' . AccompanyingPeriodWorkEvaluation::class . ' we1 '
-                . 'LEFT JOIN ' . Evaluation::class . ' ev WITH we1.evaluation = ev.id '
-                . 'WHERE we1 MEMBER OF acpw.accompanyingPeriodWorkEvaluations ) AS evaluationsTitle ');
+            ->addSelect('(SELECT AGGREGATE(IDENTITY(we.evaluation)) FROM '.AccompanyingPeriodWorkEvaluation::class.' we '
+                .'WHERE we MEMBER OF acpw.accompanyingPeriodWorkEvaluations ) AS evaluationsId ')
+            ->addSelect('(SELECT AGGREGATE(ev.title) FROM '.AccompanyingPeriodWorkEvaluation::class.' we1 '
+                .'LEFT JOIN '.Evaluation::class.' ev WITH we1.evaluation = ev.id '
+                .'WHERE we1 MEMBER OF acpw.accompanyingPeriodWorkEvaluations ) AS evaluationsTitle ');
 
         $qb->setParameter('calcDate', $calcDate);
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php b/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php
index 5bb188331..653075dbc 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php
@@ -20,7 +20,7 @@ use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
 use Chill\MainBundle\Export\Helper\UserHelper;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
-//use Chill\MainBundle\Service\RollingDate\RollingDateConverter;
+// use Chill\MainBundle\Service\RollingDate\RollingDateConverter;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
@@ -34,7 +34,6 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
-use DateTimeImmutable;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
@@ -80,6 +79,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
                 'required' => true,
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -103,10 +103,10 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         return match ($key) {
-            'startDate', 'endDate', 'maxDate', 'acpw_startDate', 'acpw_endDate', 'createdAt', 'updatedAt' => $this->dateTimeHelper->getLabel('export.list.eval.' . $key),
+            'startDate', 'endDate', 'maxDate', 'acpw_startDate', 'acpw_endDate', 'createdAt', 'updatedAt' => $this->dateTimeHelper->getLabel('export.list.eval.'.$key),
             'acpw_socialaction' => function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.list.eval.' . $key;
+                    return 'export.list.eval.'.$key;
                 }
 
                 if (null === $value || '' === $value) {
@@ -120,7 +120,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
             },
             'acpw_socialissue' => function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.list.eval.' . $key;
+                    return 'export.list.eval.'.$key;
                 }
 
                 if (null === $value || '' === $value) {
@@ -132,15 +132,15 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
                     []
                 );
             },
-            'createdBy', 'updatedBy', 'acpw_acp_user' => $this->userHelper->getLabel($key, $values, 'export.list.eval.' . $key),
-            'acpw_referrers' => $this->userHelper->getLabelMulti($key, $values, 'export.list.eval.' . $key),
-            'acpw_persons_id' => $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.eval.' . $key),
-            'acpw_persons' => $this->personHelper->getLabelMulti($key, $values, 'export.list.eval.' . $key),
+            'createdBy', 'updatedBy', 'acpw_acp_user' => $this->userHelper->getLabel($key, $values, 'export.list.eval.'.$key),
+            'acpw_referrers' => $this->userHelper->getLabelMulti($key, $values, 'export.list.eval.'.$key),
+            'acpw_persons_id' => $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.eval.'.$key),
+            'acpw_persons' => $this->personHelper->getLabelMulti($key, $values, 'export.list.eval.'.$key),
             'eval_title' => $this->translatableStringExportLabelHelper
-                ->getLabel($key, $values, 'export.list.eval.' . $key),
+                ->getLabel($key, $values, 'export.list.eval.'.$key),
             default => static function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.list.eval.' . $key;
+                    return 'export.list.eval.'.$key;
                 }
 
                 if (null === $value) {
@@ -192,7 +192,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
             ->andWhere('acppart.startDate <= :calc_date AND (acppart.endDate > :calc_date OR acppart.endDate IS NULL)')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                         AND acl_count_person_history.center IN (:authorized_centers)
                         '
                 )
@@ -222,7 +222,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
         ];
     }
 
-    private function addSelectClauses(QueryBuilder $qb, DateTimeImmutable $calc_date): void
+    private function addSelectClauses(QueryBuilder $qb, \DateTimeImmutable $calc_date): void
     {
         // add the regular fields
         foreach (['startDate', 'endDate', 'maxDate', 'warningInterval', 'comment', 'createdAt', 'updatedAt'] as $field) {
@@ -238,7 +238,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
         }
 
         foreach (['id', 'startDate', 'endDate', 'note'] as $field) {
-            $qb->addSelect(sprintf('acpw.%s AS %s', $field, 'acpw_' . $field));
+            $qb->addSelect(sprintf('acpw.%s AS %s', $field, 'acpw_'.$field));
         }
 
         // join socialaction
@@ -255,15 +255,15 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
 
         // referrers => at date XXXX
         $qb
-            ->addSelect('(SELECT JSON_BUILD_OBJECT(\'uid\', IDENTITY(history.user), \'d\', history.startDate) FROM ' . UserHistory::class . ' history ' .
+            ->addSelect('(SELECT JSON_BUILD_OBJECT(\'uid\', IDENTITY(history.user), \'d\', history.startDate) FROM '.UserHistory::class.' history '.
                 'WHERE history.accompanyingPeriod = acp AND history.startDate <= :calc_date AND (history.endDate IS NULL OR history.endDate > :calc_date)) AS referrers');
 
         // persons
         $qb
-            ->addSelect('(SELECT AGGREGATE(person_acpw_member.id) FROM ' . Person::class . ' person_acpw_member '
-                . 'WHERE person_acpw_member MEMBER OF acpw.persons) AS acpw_persons_id')
-            ->addSelect('(SELECT AGGREGATE(person1_acpw_member.id) FROM ' . Person::class . ' person1_acpw_member '
-                . 'WHERE person1_acpw_member MEMBER OF acpw.persons) AS acpw_persons');
+            ->addSelect('(SELECT AGGREGATE(person_acpw_member.id) FROM '.Person::class.' person_acpw_member '
+                .'WHERE person_acpw_member MEMBER OF acpw.persons) AS acpw_persons_id')
+            ->addSelect('(SELECT AGGREGATE(person1_acpw_member.id) FROM '.Person::class.' person1_acpw_member '
+                .'WHERE person1_acpw_member MEMBER OF acpw.persons) AS acpw_persons');
 
         // join evaluation
         $qb
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php b/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
index 81063666e..2d332969d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
@@ -26,12 +26,10 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
-use DateTimeImmutable;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function strlen;
 
 class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
 {
@@ -62,6 +60,7 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
                 'required' => true,
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -89,11 +88,11 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
         }
 
         return match ($key) {
-            'membersId', 'membersName' => $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.household.' . $key),
-            'compositionType' => $this->translatableStringHelper->getLabel($key, $values, 'export.list.household.' . $key),
+            'membersId', 'membersName' => $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.household.'.$key),
+            'compositionType' => $this->translatableStringHelper->getLabel($key, $values, 'export.list.household.'.$key),
             default => static function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.list.household.' . $key;
+                    return 'export.list.household.'.$key;
                 }
 
                 return (string) $value;
@@ -141,7 +140,7 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
             ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
@@ -169,36 +168,36 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
         ];
     }
 
-    private function addSelectClauses(QueryBuilder $qb, DateTimeImmutable $calcDate): void
+    private function addSelectClauses(QueryBuilder $qb, \DateTimeImmutable $calcDate): void
     {
         // members at date
         $qb
-            ->addSelect('(SELECT COUNT(members0) FROM ' . HouseholdMember::class . ' members0 '
-                . 'WHERE members0.startDate <= :calcDate AND (members0.endDate IS NULL OR members0.endDate > :calcDate) '
-                . 'AND members0 MEMBER OF household.members) AS membersCount')
+            ->addSelect('(SELECT COUNT(members0) FROM '.HouseholdMember::class.' members0 '
+                .'WHERE members0.startDate <= :calcDate AND (members0.endDate IS NULL OR members0.endDate > :calcDate) '
+                .'AND members0 MEMBER OF household.members) AS membersCount')
 
-            ->addSelect('(SELECT AGGREGATE(IDENTITY(members1.person)) FROM ' . HouseholdMember::class . ' members1 '
-                . 'WHERE members1.startDate <= :calcDate AND (members1.endDate IS NULL OR members1.endDate > :calcDate) '
-                . 'AND members1 MEMBER OF household.members) AS membersId')
+            ->addSelect('(SELECT AGGREGATE(IDENTITY(members1.person)) FROM '.HouseholdMember::class.' members1 '
+                .'WHERE members1.startDate <= :calcDate AND (members1.endDate IS NULL OR members1.endDate > :calcDate) '
+                .'AND members1 MEMBER OF household.members) AS membersId')
 
-            ->addSelect("(SELECT AGGREGATE(CONCAT(person2.firstName, ' ', person2.lastName)) FROM " . HouseholdMember::class . ' members2 '
-                . 'JOIN members2.person person2 '
-                . 'WHERE members2.startDate <= :calcDate AND (members2.endDate IS NULL OR members2.endDate > :calcDate) '
-                . 'AND members2 MEMBER OF household.members) AS membersName');
+            ->addSelect("(SELECT AGGREGATE(CONCAT(person2.firstName, ' ', person2.lastName)) FROM ".HouseholdMember::class.' members2 '
+                .'JOIN members2.person person2 '
+                .'WHERE members2.startDate <= :calcDate AND (members2.endDate IS NULL OR members2.endDate > :calcDate) '
+                .'AND members2 MEMBER OF household.members) AS membersName');
 
         // composition at date
         $qb
-            ->addSelect('(SELECT compo.numberOfChildren FROM ' . HouseholdComposition::class . ' compo '
-                . 'WHERE compo.startDate <= :calcDate AND (compo.endDate IS NULL OR compo.endDate > :calcDate) '
-                . 'AND compo MEMBER OF household.compositions) AS compositionNumberOfChildren')
+            ->addSelect('(SELECT compo.numberOfChildren FROM '.HouseholdComposition::class.' compo '
+                .'WHERE compo.startDate <= :calcDate AND (compo.endDate IS NULL OR compo.endDate > :calcDate) '
+                .'AND compo MEMBER OF household.compositions) AS compositionNumberOfChildren')
 
-            ->addSelect('(SELECT compo1.comment.comment FROM ' . HouseholdComposition::class . ' compo1 '
-                . 'WHERE compo1.startDate <= :calcDate AND (compo1.endDate IS NULL OR compo1.endDate > :calcDate) '
-                . 'AND compo1 MEMBER OF household.compositions) AS compositionComment')
+            ->addSelect('(SELECT compo1.comment.comment FROM '.HouseholdComposition::class.' compo1 '
+                .'WHERE compo1.startDate <= :calcDate AND (compo1.endDate IS NULL OR compo1.endDate > :calcDate) '
+                .'AND compo1 MEMBER OF household.compositions) AS compositionComment')
 
             ->addSelect('(
                 SELECT type2.label
-                FROM ' . HouseholdComposition::class . ' compo2
+                FROM '.HouseholdComposition::class.' compo2
                 JOIN compo2.householdCompositionType type2
                 WHERE compo2.startDate <= :calcDate AND (compo2.endDate IS NULL OR compo2.endDate > :calcDate)
                 AND compo2 MEMBER OF household.compositions
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
index 9201b0c50..8beda5ef5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
@@ -34,15 +34,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-use function addcslashes;
-use function array_key_exists;
-use function array_keys;
-use function array_merge;
-use function count;
-use function in_array;
-use function strlen;
-use function uniqid;
-
 /**
  * Render a list of people.
  */
@@ -84,7 +75,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
             },
             'constraints' => [new Callback([
                 'callback' => static function ($selected, ExecutionContextInterface $context) {
-                    if (count($selected) === 0) {
+                    if (0 === \count($selected)) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
@@ -100,6 +91,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
             'input' => 'datetime_immutable',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         $choices = array_combine(ListPersonHelper::FIELDS, ListPersonHelper::FIELDS);
@@ -110,7 +102,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
                 $cf->getSlug();
         }
 
-        return ['fields' => array_values($choices), 'address_date' => new DateTimeImmutable()];
+        return ['fields' => array_values($choices), 'address_date' => new \DateTimeImmutable()];
     }
 
     public function getAllowedFormattersTypes()
@@ -130,7 +122,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
 
     public function getLabels($key, array $values, $data)
     {
-        if (in_array($key, $this->listPersonHelper->getAllPossibleFields(), true)) {
+        if (\in_array($key, $this->listPersonHelper->getAllPossibleFields(), true)) {
             return $this->listPersonHelper->getLabels($key, $values, $data);
         }
 
@@ -142,18 +134,18 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
         $fields = [];
 
         foreach (ListPersonHelper::FIELDS as $key) {
-            if (!in_array($key, $data['fields'], true)) {
+            if (!\in_array($key, $data['fields'], true)) {
                 continue;
             }
 
             if (str_starts_with($key, 'address_fields')) {
-                $fields = array_merge($fields, $this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'address_fields'));
+                $fields = \array_merge($fields, $this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'address_fields'));
 
                 continue;
             }
 
             if ('lifecycleUpdate' === $key) {
-                $fields = array_merge($fields, ['createdAt', 'createdBy', 'updatedAt', 'updatedBy']);
+                $fields = \array_merge($fields, ['createdAt', 'createdBy', 'updatedAt', 'updatedBy']);
 
                 continue;
             }
@@ -162,7 +154,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
         }
 
         // add the key from slugs and return
-        return array_merge($fields, array_keys($this->slugs));
+        return \array_merge($fields, \array_keys($this->slugs));
     }
 
     public function getResult($query, $data)
@@ -188,9 +180,8 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         // throw an error if any fields are present
-        if (!array_key_exists('fields', $data)) {
-            throw new \Doctrine\DBAL\Exception\InvalidArgumentException('any fields '
-                . 'have been checked');
+        if (!\array_key_exists('fields', $data)) {
+            throw new \Doctrine\DBAL\Exception\InvalidArgumentException('any fields have been checked');
         }
 
         $qb = $this->entityManager->createQueryBuilder();
@@ -199,7 +190,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
             ->from(Person::class, 'person')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . Person\PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                    'SELECT 1 FROM '.Person\PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
                 )
             )
             ->setParameter('authorized_centers', $centers);
@@ -209,7 +200,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
         $this->listPersonHelper->addSelect($qb, $fields, $data['address_date']);
 
         foreach ($this->getCustomFields() as $cf) {
-            if (!in_array($cf->getSlug(), $fields, true)) {
+            if (!\in_array($cf->getSlug(), $fields, true)) {
                 continue;
             }
 
@@ -262,9 +253,9 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
         );
 
         // check if there is one field starting with address in data
-        if (count(array_intersect($data['fields'], $addressFields)) > 0) {
+        if (\count(array_intersect($data['fields'], $addressFields)) > 0) {
             // if a field address is checked, the date must not be empty
-            if (!$data['address_date'] instanceof DateTimeImmutable) {
+            if (!$data['address_date'] instanceof \DateTimeImmutable) {
                 $context
                     ->buildViolation('You must set this date if an address is checked')
                     ->atPath('address_date')
@@ -295,12 +286,12 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
     {
         return $this->entityManager
             ->createQuery('SELECT cf '
-                . 'FROM ChillCustomFieldsBundle:CustomField cf '
-                . 'JOIN cf.customFieldGroup g '
-                . 'WHERE cf.type != :title AND g.entity LIKE :entity')
+                .'FROM ChillCustomFieldsBundle:CustomField cf '
+                .'JOIN cf.customFieldGroup g '
+                .'WHERE cf.type != :title AND g.entity LIKE :entity')
             ->setParameters([
                 'title' => 'title',
-                'entity' => addcslashes(Person::class, '\\'),
+                'entity' => \addcslashes(Person::class, '\\'),
             ])
             ->getResult();
     }
@@ -340,7 +331,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
                     $label = $cfType->getChoices($cf)[$slugChoice];
 
                     return $this->translatableStringHelper->localize($cf->getName())
-                            . ' | ' . $label;
+                            .' | '.$label;
                 }
 
                 if ('_other' === $slugChoice && $cfType->isChecked($cf, $slugChoice, $decoded)) {
@@ -359,7 +350,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
      */
     private function slugToDQL(string $slug, string $type = 'default', array $additionalInfos = []): string
     {
-        $uid = 'slug_' . uniqid('', false);
+        $uid = 'slug_'.\uniqid('', false);
 
         $this->slugs[$uid] = [
             'slug' => $slug,
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
index 78427387c..1a1fd0316 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
@@ -54,8 +54,8 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
         $routeParameters
     ) {
         $this->entityManager = $em;
-        $this->baseUrl = $routeParameters['scheme'] .
-            '://' . $routeParameters['host'];
+        $this->baseUrl = $routeParameters['scheme'].
+            '://'.$routeParameters['host'];
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -64,6 +64,7 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
             'label' => 'Precision',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['precision' => self::PRECISION_DEFAULT_VALUE];
@@ -81,11 +82,11 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
                 $row['id1'],
                 $row['firstname1'],
                 $row['lastname1'],
-                $this->baseUrl . $this->router->generate('chill_person_view', ['person_id' => $row['id1']]),
+                $this->baseUrl.$this->router->generate('chill_person_view', ['person_id' => $row['id1']]),
                 $row['id2'],
                 $row['firstname2'],
                 $row['lastname2'],
-                $this->baseUrl . $this->router->generate('chill_person_view', ['person_id' => $row['id2']]),
+                $this->baseUrl.$this->router->generate('chill_person_view', ['person_id' => $row['id2']]),
             ];
         }
 
@@ -94,14 +95,14 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
 
         // Make links clickable
         for ($i = 1; $spreadsheet->getActiveSheet()->getHighestDataRow() >= $i; ++$i) {
-            $spreadsheet->getActiveSheet()->getCell('D' . $i)->getHyperlink()
-                ->setUrl($spreadsheet->getActiveSheet()->getCell('D' . $i)->getValue());
-            $spreadsheet->getActiveSheet()->getCell('H' . $i)->getHyperlink()
-                ->setUrl($spreadsheet->getActiveSheet()->getCell('H' . $i)->getValue());
+            $spreadsheet->getActiveSheet()->getCell('D'.$i)->getHyperlink()
+                ->setUrl($spreadsheet->getActiveSheet()->getCell('D'.$i)->getValue());
+            $spreadsheet->getActiveSheet()->getCell('H'.$i)->getHyperlink()
+                ->setUrl($spreadsheet->getActiveSheet()->getCell('H'.$i)->getValue());
         }
 
         $writer = new Xlsx($spreadsheet);
-        $temp_file = sys_get_temp_dir() . '/' . uniqid('export_') . '.xlsx';
+        $temp_file = sys_get_temp_dir().'/'.uniqid('export_').'.xlsx';
         $writer->save($temp_file);
 
         $response = new BinaryFileResponse($temp_file);
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonHavingAccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonHavingAccompanyingPeriod.php
index 4c0b6e61d..7cc2a4c35 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonHavingAccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonHavingAccompanyingPeriod.php
@@ -31,10 +31,6 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function array_key_exists;
-use function count;
-use function in_array;
-use function strlen;
 
 /**
  * List the persons, having an accompanying period.
@@ -64,7 +60,7 @@ class ListPersonHavingAccompanyingPeriod implements ExportElementValidatedInterf
             },
             'constraints' => [new Callback([
                 'callback' => static function ($selected, ExecutionContextInterface $context) {
-                    if (count($selected) === 0) {
+                    if (0 === \count($selected)) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
@@ -79,11 +75,12 @@ class ListPersonHavingAccompanyingPeriod implements ExportElementValidatedInterf
             'input' => 'datetime_immutable',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         $choices = array_combine(ListPersonHelper::FIELDS, ListPersonHelper::FIELDS);
 
-        return ['fields' => array_values($choices), 'address_date' => new DateTimeImmutable()];
+        return ['fields' => array_values($choices), 'address_date' => new \DateTimeImmutable()];
     }
 
     public function getAllowedFormattersTypes()
@@ -111,7 +108,7 @@ class ListPersonHavingAccompanyingPeriod implements ExportElementValidatedInterf
         $fields = [];
 
         foreach (ListPersonHelper::FIELDS as $key) {
-            if (!in_array($key, $data['fields'], true)) {
+            if (!\in_array($key, $data['fields'], true)) {
                 continue;
             }
 
@@ -156,9 +153,8 @@ class ListPersonHavingAccompanyingPeriod implements ExportElementValidatedInterf
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         // throw an error if any fields are present
-        if (!array_key_exists('fields', $data)) {
-            throw new \Doctrine\DBAL\Exception\InvalidArgumentException('any fields '
-                . 'have been checked');
+        if (!\array_key_exists('fields', $data)) {
+            throw new \Doctrine\DBAL\Exception\InvalidArgumentException('any fields have been checked');
         }
 
         $qb = $this->entityManager->createQueryBuilder();
@@ -166,10 +162,10 @@ class ListPersonHavingAccompanyingPeriod implements ExportElementValidatedInterf
         $qb->from(Person::class, 'person')
             ->join('person.accompanyingPeriodParticipations', 'acppart')
             ->join('acppart.accompanyingPeriod', 'acp')
-            ->andWhere($qb->expr()->neq('acp.step', "'" . AccompanyingPeriod::STEP_DRAFT . "'"))
+            ->andWhere($qb->expr()->neq('acp.step', "'".AccompanyingPeriod::STEP_DRAFT."'"))
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
                 )
             )->setParameter('authorized_centers', $centers);
 
@@ -206,9 +202,9 @@ class ListPersonHavingAccompanyingPeriod implements ExportElementValidatedInterf
         );
 
         // check if there is one field starting with address in data
-        if (count(array_intersect($data['fields'], $addressFields)) > 0) {
+        if (\count(array_intersect($data['fields'], $addressFields)) > 0) {
             // if a field address is checked, the date must not be empty
-            if (!$data['address_date'] instanceof DateTimeImmutable) {
+            if (!$data['address_date'] instanceof \DateTimeImmutable) {
                 $context
                     ->buildViolation('You must set this date if an address is checked')
                     ->atPath('address_date')
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriodDetails.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriodDetails.php
index a5a788c12..22be5ceca 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriodDetails.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriodDetails.php
@@ -12,12 +12,9 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\MainBundle\Export\Helper\ExportAddressHelper;
 use Chill\MainBundle\Export\ListInterface;
-use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
@@ -31,18 +28,10 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use DateTimeImmutable;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Constraints\Callback;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function array_key_exists;
-use function count;
-use function in_array;
-use function strlen;
 
 /**
- * List the persons having an accompanying period, with the accompanying period details
- *
+ * List the persons having an accompanying period, with the accompanying period details.
  */
 final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInterface, GroupedExportInterface
 {
@@ -60,6 +49,7 @@ final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInte
             'help' => 'Data regarding center, addresses, and so on will be computed at this date',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['address_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -82,7 +72,7 @@ final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInte
 
     public function getLabels($key, array $values, $data)
     {
-        if (in_array($key, $this->listPersonHelper->getAllKeys(), true)) {
+        if (\in_array($key, $this->listPersonHelper->getAllKeys(), true)) {
             return $this->listPersonHelper->getLabels($key, $values, $data);
         }
 
@@ -124,10 +114,10 @@ final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInte
         $qb->from(Person::class, 'person')
             ->join('person.accompanyingPeriodParticipations', 'acppart')
             ->join('acppart.accompanyingPeriod', 'acp')
-            ->andWhere($qb->expr()->neq('acp.step', "'" . AccompanyingPeriod::STEP_DRAFT . "'"))
+            ->andWhere($qb->expr()->neq('acp.step', "'".AccompanyingPeriod::STEP_DRAFT."'"))
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
                 )
             )->setParameter('authorized_centers', $centers);
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php b/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
index 19fb1e744..01cc94aa8 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
@@ -20,12 +20,10 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportInterface
@@ -44,9 +42,10 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
             'label' => 'Closingdate to apply',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
-        return ['closingdate' => new DateTime('now')];
+        return ['closingdate' => new \DateTime('now')];
     }
 
     public function getAllowedFormattersTypes(): array
@@ -73,7 +72,7 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
                     'count_acppart_export_result' => 'export.export.acp_stats.count_participations',
                     'count_acp_export_result' => 'export.export.acp_stats.count_acps',
                     'count_pers_export_result' => 'export.export.acp_stats.count_persons',
-                    default => throw new LogicException('key not supported: ' . $key),
+                    default => throw new \LogicException('key not supported: '.$key),
                 };
             }
 
@@ -126,7 +125,7 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
             ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
index fdc214f0a..6bcb4f8b8 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
@@ -64,6 +64,7 @@ class ActiveOnDateFilter implements FilterInterface
         $builder
             ->add('on_date', PickRollingDateType::class, []);
     }
+
     public function getFormDefaultData(): array
     {
         return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
index 65291d9df..3b7c4fe25 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
@@ -54,6 +54,7 @@ class ActiveOneDayBetweenDatesFilter implements FilterInterface
             ->add('date_from', PickRollingDateType::class, [])
             ->add('date_to', PickRollingDateType::class, []);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
index 42bc13144..915a2c9e6 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
@@ -47,6 +47,7 @@ class AdministrativeLocationFilter implements FilterInterface
             'multiple' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
index 7e02b20aa..7fb032050 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
@@ -58,6 +58,7 @@ class ClosingMotiveFilter implements FilterInterface
             'expanded' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
index f08e34eed..4c8baf147 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
@@ -64,6 +64,7 @@ class ConfidentialFilter implements FilterInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['accepted_confidentials' => self::DEFAULT_CHOICE];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorFilter.php
index 8a8a24013..a73f82f69 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorFilter.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class CreatorFilter implements FilterInterface
 {
@@ -28,7 +27,7 @@ class CreatorFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acp_creator', $qb->getAllAliases(), true)) {
+        if (!\in_array('acp_creator', $qb->getAllAliases(), true)) {
             $qb->join('acp.createdBy', 'acp_creator');
         }
 
@@ -50,6 +49,7 @@ class CreatorFilter implements FilterInterface
                 'label' => false,
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php
index 10467f911..cc7e21b08 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php
@@ -42,16 +42,16 @@ class CreatorJobFilter implements FilterInterface
 
         $qb
             ->join(
-                "acp.userHistories",
+                'acp.userHistories',
                 "{$p}_userHistory",
                 Join::WITH,
                 $qb->expr()->andX(
-                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", "acp.id"),
+                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
                     $qb->expr()->andX(
-                        $qb->expr()->gte("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.startDate"),
+                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
                         $qb->expr()->orX(
                             $qb->expr()->isNull("{$p}_userHistory.endDate"),
-                            $qb->expr()->lt("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.endDate")
+                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
                         )
                     )
                 )
@@ -74,7 +74,7 @@ class CreatorJobFilter implements FilterInterface
             ->andWhere($qb->expr()->in("{$p}_history.job", ":{$p}_jobs"))
             ->setParameter(
                 "{$p}_jobs",
-                $data["creator_job"],
+                $data['creator_job'],
             );
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
index 010722e4f..671b87407 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
@@ -64,6 +64,7 @@ class EmergencyFilter implements FilterInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['accepted_emergency' => self::DEFAULT_CHOICE];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
index 9453764b1..bec01c249 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
@@ -19,7 +19,6 @@ use Chill\PersonBundle\Repository\SocialWork\EvaluationRepositoryInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class EvaluationFilter implements FilterInterface
 {
@@ -32,15 +31,15 @@ class EvaluationFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpw', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpw', $qb->getAllAliases(), true)) {
             $qb->join('acp.works', 'acpw');
         }
 
-        if (!in_array('workeval', $qb->getAllAliases(), true)) {
+        if (!\in_array('workeval', $qb->getAllAliases(), true)) {
             $qb->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval');
         }
 
-        if (!in_array('eval', $qb->getAllAliases(), true)) {
+        if (!\in_array('eval', $qb->getAllAliases(), true)) {
             $qb->join('workeval.evaluation', 'eval');
         }
 
@@ -65,6 +64,7 @@ class EvaluationFilter implements FilterInterface
             'attr' => ['class' => 'select2'],
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
index d09e08a8f..695831f9c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
@@ -44,10 +44,10 @@ class GeographicalUnitStatFilter implements FilterInterface
         $subQueryDql =
             'SELECT
                 1
-            FROM ' . AccompanyingPeriod\AccompanyingPeriodLocationHistory::class . ' acp_geog_filter_location_history
-            LEFT JOIN ' . PersonHouseholdAddress::class . ' acp_geog_filter_address_person_location
+            FROM '.AccompanyingPeriod\AccompanyingPeriodLocationHistory::class.' acp_geog_filter_location_history
+            LEFT JOIN '.PersonHouseholdAddress::class.' acp_geog_filter_address_person_location
                 WITH IDENTITY(acp_geog_filter_location_history.personLocation) = IDENTITY(acp_geog_filter_address_person_location.person)
-            LEFT JOIN ' . Address::class . ' acp_geog_filter_address
+            LEFT JOIN '.Address::class.' acp_geog_filter_address
                 WITH COALESCE(IDENTITY(acp_geog_filter_address_person_location.address), IDENTITY(acp_geog_filter_location_history.addressLocation)) = acp_geog_filter_address.id
             LEFT JOIN acp_geog_filter_address.geographicalUnits acp_geog_filter_units
             WHERE
@@ -88,13 +88,14 @@ class GeographicalUnitStatFilter implements FilterInterface
                 'placeholder' => 'Select a geographical unit',
                 'choices' => $this->geographicalUnitRepository->findAll(),
                 'choice_value' => static fn (SimpleGeographicalUnitDTO $item) => $item->id,
-                'choice_label' => fn (SimpleGeographicalUnitDTO $item) => $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()) . ' > ' . $item->unitName,
+                'choice_label' => fn (SimpleGeographicalUnitDTO $item) => $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()).' > '.$item->unitName,
                 'attr' => [
                     'class' => 'select2',
                 ],
                 'multiple' => true,
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
@@ -107,7 +108,7 @@ class GeographicalUnitStatFilter implements FilterInterface
             '%units' => implode(
                 ', ',
                 array_map(
-                    fn (SimpleGeographicalUnitDTO $item) => $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()) . ' > ' . $item->unitName,
+                    fn (SimpleGeographicalUnitDTO $item) => $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()).' > '.$item->unitName,
                     $data['units']
                 )
             ),
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php
index 4820116c0..3ac083b32 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php
@@ -26,7 +26,7 @@ class HasNoActionFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data): void
     {
-        $qb->andWhere('NOT EXISTS (SELECT 1 FROM ' . AccompanyingPeriodWork::class . ' work WHERE work.accompanyingPeriod = acp)');
+        $qb->andWhere('NOT EXISTS (SELECT 1 FROM '.AccompanyingPeriodWork::class.' work WHERE work.accompanyingPeriod = acp)');
     }
 
     public function applyOn(): string
@@ -38,6 +38,7 @@ class HasNoActionFilter implements FilterInterface
     {
         // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php
index d8b709146..72bcce39e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php
@@ -34,7 +34,7 @@ class HasNoReferrerFilter implements FilterInterface
         $qb
             ->andWhere('
                 NOT EXISTS (
-                    SELECT 1 FROM ' . UserHistory::class . ' uh
+                    SELECT 1 FROM '.UserHistory::class.' uh
                     WHERE uh.startDate <= :has_no_referrer_filter_date
                     AND (
                         uh.endDate IS NULL
@@ -61,6 +61,7 @@ class HasNoReferrerFilter implements FilterInterface
                 'label' => 'Has no referrer on this date',
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilter.php
index 69c4f8415..88d1d6933 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilter.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -44,7 +43,7 @@ class HasTemporaryLocationFilter implements FilterInterface
         match ($data['having_temporarily']) {
             true => $qb->andWhere('acp_having_temporarily_location.addressLocation IS NOT NULL'),
             false => $qb->andWhere('acp_having_temporarily_location.personLocation IS NOT NULL'),
-            default => throw new LogicException('value not supported'),
+            default => throw new \LogicException('value not supported'),
         };
     }
 
@@ -65,13 +64,14 @@ class HasTemporaryLocationFilter implements FilterInterface
                 'choice_label' => static fn ($choice) => match ($choice) {
                     true => 'export.filter.course.having_temporarily.Having a temporarily location',
                     false => 'export.filter.course.having_temporarily.Having a person\'s location',
-                    default => throw new LogicException('this choice is not supported'),
+                    default => throw new \LogicException('this choice is not supported'),
                 },
             ])
             ->add('calc_date', PickRollingDateType::class, [
                 'label' => 'export.filter.course.having_temporarily.Calculation date',
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -82,7 +82,7 @@ class HasTemporaryLocationFilter implements FilterInterface
         return match ($data['having_temporarily']) {
             true => ['export.filter.course.having_temporarily.Having a temporarily location', []],
             false => ['export.filter.course.having_temporarily.Having a person\'s location', []],
-            default => throw new LogicException('value not supported'),
+            default => throw new \LogicException('value not supported'),
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HavingAnAccompanyingPeriodInfoWithinDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HavingAnAccompanyingPeriodInfoWithinDatesFilter.php
index f50fd6575..d6436f8b4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HavingAnAccompanyingPeriodInfoWithinDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HavingAnAccompanyingPeriodInfoWithinDatesFilter.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\DateIntervalType;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
@@ -24,7 +23,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * Filter accompanying course which have a row in AccompanyingPeriodInfo within the given
- * interval
+ * interval.
  */
 final readonly class HavingAnAccompanyingPeriodInfoWithinDatesFilter implements FilterInterface
 {
@@ -42,6 +41,7 @@ final readonly class HavingAnAccompanyingPeriodInfoWithinDatesFilter implements
                 'label' => 'export.filter.course.having_info_within_interval.end_date',
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['start_date' => new RollingDate(RollingDate::T_TODAY), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -59,7 +59,7 @@ final readonly class HavingAnAccompanyingPeriodInfoWithinDatesFilter implements
             [
                 '%startDate%' => $this->rollingDateConverter->convert($data['start_date'])->format('d-m-Y'),
                 '%endDate%' => $this->rollingDateConverter->convert($data['end_date'])->format('d-m-Y'),
-            ]
+            ],
         ];
     }
 
@@ -77,7 +77,7 @@ final readonly class HavingAnAccompanyingPeriodInfoWithinDatesFilter implements
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodInfo::class . " {$ai} WHERE {$ai}.infoDate BETWEEN :{$as} AND :{$ae} AND IDENTITY({$ai}.accompanyingPeriod) = acp.id"
+                    'SELECT 1 FROM '.AccompanyingPeriodInfo::class." {$ai} WHERE {$ai}.infoDate BETWEEN :{$as} AND :{$ae} AND IDENTITY({$ai}.accompanyingPeriod) = acp.id"
                 )
             )
             ->setParameter($as, $this->rollingDateConverter->convert($data['start_date']), Types::DATETIME_IMMUTABLE)
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
index ef21c1abf..3eb8bbb24 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
@@ -64,6 +64,7 @@ class IntensityFilter implements FilterInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['accepted_intensities' => self::DEFAULT_CHOICE];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php
index 7024d837d..5f0cf373b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php
@@ -26,7 +26,7 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Filter course where a user with the given job is "working" on it
+ * Filter course where a user with the given job is "working" on it.
  *
  * Makes use of AccompanyingPeriodInfo
  */
@@ -52,15 +52,15 @@ readonly class JobWorkingOnCourseFilter implements FilterInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    "SELECT 1 FROM " . AccompanyingPeriodInfo::class . " {$p}_info "
-                    . "JOIN {$p}_info.user {$p}_user "
-                    . "JOIN " . UserJobHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user "
-                    . "WHERE IDENTITY({$p}_info.accompanyingPeriod) = acp.id "
-                    . "AND {$p}_history.job IN (:{$p}_jobs) "
+                    'SELECT 1 FROM '.AccompanyingPeriodInfo::class." {$p}_info "
+                    ."JOIN {$p}_info.user {$p}_user "
+                    .'JOIN '.UserJobHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
+                    ."WHERE IDENTITY({$p}_info.accompanyingPeriod) = acp.id "
+                    ."AND {$p}_history.job IN (:{$p}_jobs) "
                     // job_at based on _info.infoDate
-                    . "AND {$p}_history.startDate <= {$p}_info.infoDate "
-                    . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > {$p}_info.infoDate) "
-                    . "AND {$p}_info.infoDate >= :{$p}_start and {$p}_info.infoDate < :{$p}_end"
+                    ."AND {$p}_history.startDate <= {$p}_info.infoDate "
+                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > {$p}_info.infoDate) "
+                    ."AND {$p}_info.infoDate >= :{$p}_start and {$p}_info.infoDate < :{$p}_end"
                 )
             )
             ->setParameter("{$p}_jobs", $data['jobs'])
@@ -94,16 +94,16 @@ readonly class JobWorkingOnCourseFilter implements FilterInterface
                 'expanded' => true,
             ])
             ->add('start_date', PickRollingDateType::class, [
-                'label' => 'export.filter.course.by_job_working.Job working after'
+                'label' => 'export.filter.course.by_job_working.Job working after',
             ])
             ->add('end_date', PickRollingDateType::class, [
-                'label' => 'export.filter.course.by_job_working.Job working before'
+                'label' => 'export.filter.course.by_job_working.Job working before',
             ])
-            //->add('job_at', PickRollingDateType::class, [
+            // ->add('job_at', PickRollingDateType::class, [
             //    'label' => 'bla',
             //    'help' => 'bli',
             //    'required' => false,
-            //])
+            // ])
         ;
     }
 
@@ -130,7 +130,7 @@ readonly class JobWorkingOnCourseFilter implements FilterInterface
             'jobs' => [],
             'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
             'end_date' => new RollingDate(RollingDate::T_TODAY),
-            //'job_at' => null,
+            // 'job_at' => null,
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
index b724d8144..1b85f6cd7 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
@@ -52,6 +52,7 @@ class OpenBetweenDatesFilter implements FilterInterface
             ->add('date_from', PickRollingDateType::class, [])
             ->add('date_to', PickRollingDateType::class, []);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_from' => new RollingDate(RollingDate::T_MONTH_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
index 19d91dbbd..617577cde 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
@@ -58,6 +58,7 @@ class OriginFilter implements FilterInterface
             'expanded' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
index 0b6e2bade..30f67f664 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -42,15 +41,15 @@ class ReferrerFilter implements FilterInterface
             ->join('acp.userHistories', self::A)
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte(self::A . '.startDate', ':' . self::P),
+                    $qb->expr()->lte(self::A.'.startDate', ':'.self::P),
                     $qb->expr()->orX(
-                        $qb->expr()->isNull(self::A . '.endDate'),
-                        $qb->expr()->gt(self::A . '.endDate', ':' . self::P)
+                        $qb->expr()->isNull(self::A.'.endDate'),
+                        $qb->expr()->gt(self::A.'.endDate', ':'.self::P)
                     )
                 )
             )
             ->andWhere(
-                $qb->expr()->in(self::A . '.user', ':' . self::PU)
+                $qb->expr()->in(self::A.'.user', ':'.self::PU)
             )
             ->setParameter(self::PU, $data['accepted_referrers'])
             ->setParameter(
@@ -75,6 +74,7 @@ class ReferrerFilter implements FilterInterface
                 'required' => true,
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY), 'accepted_referrers' => []];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
index a03e98492..0b7ce6994 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
@@ -16,11 +16,9 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
-use Exception;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 final readonly class RequestorFilter implements FilterInterface
 {
@@ -46,7 +44,7 @@ final readonly class RequestorFilter implements FilterInterface
 
         switch ($data['accepted_choices']) {
             case 'participation':
-                if (!in_array('acppart', $qb->getAllAliases(), true)) {
+                if (!\in_array('acppart', $qb->getAllAliases(), true)) {
                     $qb->join('acp.participations', 'acppart');
                 }
 
@@ -92,7 +90,7 @@ final readonly class RequestorFilter implements FilterInterface
                 break;
 
             default:
-                throw new Exception('Uncaught choice exception');
+                throw new \Exception('Uncaught choice exception');
         }
 
         if ($where instanceof Andx) {
@@ -118,6 +116,7 @@ final readonly class RequestorFilter implements FilterInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['accepted_choices' => self::DEFAULT_CHOICE];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php
index 491122968..36ec27357 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php
@@ -26,7 +26,7 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Filter course where a user with the given scope is "working" on it
+ * Filter course where a user with the given scope is "working" on it.
  *
  * Makes use of AccompanyingPeriodInfo
  */
@@ -52,25 +52,25 @@ readonly class ScopeWorkingOnCourseFilter implements FilterInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    "SELECT 1 FROM " . AccompanyingPeriodInfo::class . " {$p}_info  "
-                    . "JOIN {$p}_info.user {$p}_user "
-                    . "JOIN " . UserScopeHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user "
-                    . "WHERE IDENTITY({$p}_info.accompanyingPeriod) = acp.id "
-                    . "AND {$p}_history.scope IN ( :{$p}_scopes ) "
+                    'SELECT 1 FROM '.AccompanyingPeriodInfo::class." {$p}_info  "
+                    ."JOIN {$p}_info.user {$p}_user "
+                    .'JOIN '.UserScopeHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
+                    ."WHERE IDENTITY({$p}_info.accompanyingPeriod) = acp.id "
+                    ."AND {$p}_history.scope IN ( :{$p}_scopes ) "
                     // scope_at based on _info.infoDate
-                    . "AND {$p}_history.startDate <= {$p}_info.infoDate "
-                    . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > {$p}_info.infoDate) "
-                    . "AND {$p}_info.infoDate >= :{$p}_start AND {$p}_info.infoDate < :{$p}_end"
+                    ."AND {$p}_history.startDate <= {$p}_info.infoDate "
+                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > {$p}_info.infoDate) "
+                    ."AND {$p}_info.infoDate >= :{$p}_start AND {$p}_info.infoDate < :{$p}_end"
                 )
             )
-            ->setParameter("{$p}_scopes", $data["scopes"])
+            ->setParameter("{$p}_scopes", $data['scopes'])
             ->setParameter(
                 "{$p}_start",
-                $this->rollingDateConverter->convert($data["start_date"]),
+                $this->rollingDateConverter->convert($data['start_date']),
             )
             ->setParameter(
                 "{$p}_end",
-                $this->rollingDateConverter->convert($data["end_date"])
+                $this->rollingDateConverter->convert($data['end_date'])
             )
         ;
     }
@@ -94,10 +94,10 @@ readonly class ScopeWorkingOnCourseFilter implements FilterInterface
                 'expanded' => true,
             ])
             ->add('start_date', PickRollingDateType::class, [
-                'label' => 'export.filter.course.by_scope_working.Scope working after'
+                'label' => 'export.filter.course.by_scope_working.Scope working after',
             ])
             ->add('end_date', PickRollingDateType::class, [
-                'label' => 'export.filter.course.by_scope_working.Scope working before'
+                'label' => 'export.filter.course.by_scope_working.Scope working before',
             ])
         ;
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
index 71a7ff9f4..cba86c257 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
@@ -19,7 +19,6 @@ use Chill\PersonBundle\Form\Type\PickSocialActionType;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class SocialActionFilter implements FilterInterface
 {
@@ -35,8 +34,8 @@ final readonly class SocialActionFilter implements FilterInterface
         $qb->andWhere(
             $qb->expr()->exists(
                 sprintf(
-                    "SELECT 1 FROM %s acp_by_social_action_filter WHERE acp_by_social_action_filter.socialAction "
-                    . "IN (:acp_by_social_action_filter_actions) AND acp_by_social_action_filter.accompanyingPeriod = acp",
+                    'SELECT 1 FROM %s acp_by_social_action_filter WHERE acp_by_social_action_filter.socialAction '
+                    .'IN (:acp_by_social_action_filter_actions) AND acp_by_social_action_filter.accompanyingPeriod = acp',
                     AccompanyingPeriod\AccompanyingPeriodWork::class
                 )
             )
@@ -56,6 +55,7 @@ final readonly class SocialActionFilter implements FilterInterface
             'multiple' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
index 6871a300c..7b5bb81dc 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
@@ -19,7 +19,6 @@ use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 class SocialIssueFilter implements FilterInterface
 {
@@ -42,7 +41,7 @@ class SocialIssueFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpsocialissue', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpsocialissue', $qb->getAllAliases(), true)) {
             $qb->join('acp.socialIssues', 'acpsocialissue');
         }
 
@@ -66,6 +65,7 @@ class SocialIssueFilter implements FilterInterface
             'multiple' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterBetweenDates.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterBetweenDates.php
index f0120273a..9d49f820b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterBetweenDates.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterBetweenDates.php
@@ -21,7 +21,6 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 class StepFilterBetweenDates implements FilterInterface
 {
@@ -56,8 +55,8 @@ class StepFilterBetweenDates implements FilterInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    "SELECT 1 FROM " . AccompanyingPeriod\AccompanyingPeriodStepHistory::class . " {$alias} " .
-                    "WHERE {$alias}.step IN (:{$steps}) AND OVERLAPSI ({$alias}.startDate, {$alias}.endDate),(:{$from}, :{$to}) = TRUE " .
+                    'SELECT 1 FROM '.AccompanyingPeriod\AccompanyingPeriodStepHistory::class." {$alias} ".
+                    "WHERE {$alias}.step IN (:{$steps}) AND OVERLAPSI ({$alias}.startDate, {$alias}.endDate),(:{$from}, :{$to}) = TRUE ".
                     "AND {$alias}.period = acp"
                 )
             )
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterOnDate.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterOnDate.php
index e79af75e3..bca812b86 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterOnDate.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterOnDate.php
@@ -21,7 +21,6 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 class StepFilterOnDate implements FilterInterface
 {
@@ -52,22 +51,22 @@ class StepFilterOnDate implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array(self::A, $qb->getAllAliases(), true)) {
+        if (!\in_array(self::A, $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.stepHistories', self::A);
         }
 
         $qb
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte(self::A . '.startDate', ':' . self::P),
+                    $qb->expr()->lte(self::A.'.startDate', ':'.self::P),
                     $qb->expr()->orX(
-                        $qb->expr()->isNull(self::A . '.endDate'),
-                        $qb->expr()->lt(self::A . '.endDate', ':' . self::P)
+                        $qb->expr()->isNull(self::A.'.endDate'),
+                        $qb->expr()->lt(self::A.'.endDate', ':'.self::P)
                     )
                 )
             )
             ->andWhere(
-                $qb->expr()->in(self::A . '.step', ':acp_filter_by_step_steps')
+                $qb->expr()->in(self::A.'.step', ':acp_filter_by_step_steps')
             )
             ->setParameter(self::P, $this->rollingDateConverter->convert($data['calc_date']))
             ->setParameter('acp_filter_by_step_steps', $data['accepted_steps_multi']);
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php
index dc55fd454..df8afefa9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php
@@ -42,16 +42,16 @@ class UserJobFilter implements FilterInterface
 
         $qb
             ->leftJoin(
-                "acp.userHistories",
+                'acp.userHistories',
                 "{$p}_userHistory",
                 Join::WITH,
                 $qb->expr()->andX(
-                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", "acp.id"),
+                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
                     $qb->expr()->andX(
-                        $qb->expr()->gte("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.startDate"),
+                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
                         $qb->expr()->orX(
                             $qb->expr()->isNull("{$p}_userHistory.endDate"),
-                            $qb->expr()->lt("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.endDate")
+                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
                         )
                     )
                 )
@@ -65,7 +65,7 @@ class UserJobFilter implements FilterInterface
                     $qb->expr()->andX(
                         $qb->expr()->lte("{$p}_jobHistory.startDate", "{$p}_userHistory.startDate"),
                         $qb->expr()->orX(
-                            $qb->expr()->isNull("{$p}_jobHistory" . ".endDate"),
+                            $qb->expr()->isNull("{$p}_jobHistory".'.endDate'),
                             $qb->expr()->gt("{$p}_jobHistory.endDate", "{$p}_userHistory.startDate")
                         )
                     )
@@ -74,7 +74,7 @@ class UserJobFilter implements FilterInterface
             ->andWhere($qb->expr()->in("{$p}_jobHistory.job", ":{$p}_job"))
             ->setParameter(
                 "{$p}_job",
-                $data["jobs"],
+                $data['jobs'],
             )
         ;
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php
index 3e53f49f1..f9ee7dcd9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php
@@ -42,16 +42,16 @@ class UserScopeFilter implements FilterInterface
 
         $qb
             ->join(
-                "acp.userHistories",
+                'acp.userHistories',
                 "{$p}_userHistory",
                 Join::WITH,
                 $qb->expr()->andX(
-                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", "acp.id"),
+                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
                     $qb->expr()->andX(
-                        $qb->expr()->gte("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.startDate"),
+                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
                         $qb->expr()->orX(
                             $qb->expr()->isNull("{$p}_userHistory.endDate"),
-                            $qb->expr()->lt("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.endDate")
+                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
                         )
                     )
                 )
@@ -74,7 +74,7 @@ class UserScopeFilter implements FilterInterface
             ->andWhere($qb->expr()->in("{$p}_scopeHistory.scope", ":{$p}_scopes"))
             ->setParameter(
                 "{$p}_scopes",
-                $data["scopes"],
+                $data['scopes'],
             )
         ;
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserWorkingOnCourseFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserWorkingOnCourseFilter.php
index 0147890ad..e73ef234a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserWorkingOnCourseFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserWorkingOnCourseFilter.php
@@ -24,7 +24,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Filter course where a user is "working" on it
+ * Filter course where a user is "working" on it.
  *
  * Makes use of AccompanyingPeriodInfo
  */
@@ -42,10 +42,10 @@ readonly class UserWorkingOnCourseFilter implements FilterInterface
                 'multiple' => true,
             ])
             ->add('start_date', PickRollingDateType::class, [
-                'label' => 'export.filter.course.by_user_working.User working after'
+                'label' => 'export.filter.course.by_user_working.User working after',
             ])
             ->add('end_date', PickRollingDateType::class, [
-                'label' => 'export.filter.course.by_user_working.User working before'
+                'label' => 'export.filter.course.by_user_working.User working before',
             ])
         ;
     }
@@ -96,7 +96,7 @@ readonly class UserWorkingOnCourseFilter implements FilterInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    "SELECT 1 FROM " . AccompanyingPeriod\AccompanyingPeriodInfo::class . " {$ai_alias}  " .
+                    'SELECT 1 FROM '.AccompanyingPeriod\AccompanyingPeriodInfo::class." {$ai_alias}  ".
                     "WHERE {$ai_alias}.user IN (:{$ai_users}) AND IDENTITY({$ai_alias}.accompanyingPeriod) = acp.id AND {$ai_alias}.infoDate >= :{$start} and {$ai_alias}.infoDate < :{$end}"
                 )
             )
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
index de9b39ff8..a0d8d0033 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
@@ -57,6 +57,7 @@ class ByEndDateFilter implements FilterInterface
                 'label' => 'end period date',
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['start_date' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
index 93cd2500f..401cd79a5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
@@ -57,6 +57,7 @@ class ByStartDateFilter implements FilterInterface
                 'label' => 'end period date',
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['start_date' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php
index 8841c7b9e..360b47f2d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php
@@ -35,8 +35,9 @@ class CurrentEvaluationsFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder): void
     {
-        //no form needed
+        // no form needed
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
index a8b7e8519..eed856985 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
@@ -58,6 +58,7 @@ final readonly class EvaluationTypeFilter implements FilterInterface
             'expanded' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
index 68ec39b7f..6094d56ee 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
@@ -56,6 +56,7 @@ class MaxDateFilter implements FilterInterface
             'expanded' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
index b13d059c3..733e41480 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
@@ -77,6 +77,7 @@ readonly class CompositionFilter implements FilterInterface
             ])
             ->add('on_date', PickRollingDateType::class, []);
     }
+
     public function getFormDefaultData(): array
     {
         return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php
index dc655d4ee..6430b5e99 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
@@ -35,7 +34,7 @@ class AddressRefStatusFilter implements \Chill\MainBundle\Export\FilterInterface
     {
         $subQuery =
             'SELECT 1
-            FROM ' . PersonHouseholdAddress::class . ' person_filter_having_address_to_review_person_household_address
+            FROM '.PersonHouseholdAddress::class.' person_filter_having_address_to_review_person_household_address
             JOIN person_filter_having_address_to_review_person_household_address.address person_filter_having_address_to_review_address
             WHERE
                 person_filter_having_address_to_review_person_household_address.validFrom <= :person_filter_having_address_to_review_date
@@ -75,9 +74,10 @@ class AddressRefStatusFilter implements \Chill\MainBundle\Export\FilterInterface
                 'choices' => [Address::ADDR_REFERENCE_STATUS_TO_REVIEW, Address::ADDR_REFERENCE_STATUS_REVIEWED, Address::ADDR_REFERENCE_STATUS_MATCH],
                 'choice_label' => fn (string $item) => 'export.filter.person.by_address_ref_status.'.$item,
                 'multiple' => true,
-                'expanded' => true
+                'expanded' => true,
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY), 'ref_statuses' => [Address::ADDR_REFERENCE_STATUS_TO_REVIEW]];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
index cc839b998..aa97ad54c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Export\Declarations;
-use DateInterval;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
@@ -41,8 +40,8 @@ class AgeFilter implements ExportElementValidatedInterface, FilterInterface
         $max = $data['max_age'] ?? 150;
         $calc = $this->rollingDateConverter->convert($data['date_calc']);
 
-        $minDate = $calc->sub(new DateInterval('P' . $max . 'Y'));
-        $maxDate = $calc->sub(new DateInterval('P' . $min . 'Y'));
+        $minDate = $calc->sub(new \DateInterval('P'.$max.'Y'));
+        $maxDate = $calc->sub(new \DateInterval('P'.$min.'Y'));
 
         $clause = $qb->expr()->andX(
             $qb->expr()->gte(
@@ -99,7 +98,7 @@ class AgeFilter implements ExportElementValidatedInterface, FilterInterface
     public function describeAction($data, $format = 'string')
     {
         return ['Filtered by person\'s age: '
-        . 'between %min_age% and %max_age%', [
+        .'between %min_age% and %max_age%', [
             '%min_age%' => $data['min_age'],
             '%max_age%' => $data['max_age'],
         ], ];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
index 2be2643fc..dd14c71ef 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
@@ -72,6 +72,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
             'label' => 'Born before this date',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
@@ -80,7 +81,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
     public function describeAction($data, $format = 'string')
     {
         return ['Filtered by person\'s birthdate: '
-            . 'between %date_from% and %date_to%', [
+            .'between %date_from% and %date_to%', [
                 '%date_from%' => $this->rollingDateConverter->convert($data['date_from'])->format('d-m-Y'),
                 '%date_to%' => $this->rollingDateConverter->convert($data['date_to'])->format('d-m-Y'),
             ], ];
@@ -98,13 +99,13 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
 
         if (null === $date_from) {
             $context->buildViolation('The "date from" should not be empty')
-                //->atPath('date_from')
+                // ->atPath('date_from')
                 ->addViolation();
         }
 
         if (null === $date_to) {
             $context->buildViolation('The "date to" should not be empty')
-                //->atPath('date_to')
+                // ->atPath('date_to')
                 ->addViolation();
         }
 
@@ -113,7 +114,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
             && $date_from >= $date_to
         ) {
             $context->buildViolation('The date "date to" should be after the '
-                . 'date given in "date from" field')
+                .'date given in "date from" field')
                 ->addViolation();
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ByHouseholdCompositionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ByHouseholdCompositionFilter.php
index bd3b57470..fdd799ab9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ByHouseholdCompositionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ByHouseholdCompositionFilter.php
@@ -42,11 +42,11 @@ class ByHouseholdCompositionFilter implements FilterInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . HouseholdMember::class . " {$p}_hm  " .
-                    'JOIN ' . HouseholdComposition::class . " {$p}_compo WITH {$p}_hm.household = {$p}_compo.household  " .
-                    "WHERE {$p}_hm.person = person AND {$p}_hm.shareHousehold = 'TRUE' " .
-                    "AND ({$p}_hm.startDate <= :{$p}_date AND ({$p}_hm.endDate IS NULL OR {$p}_hm.endDate > :{$p}_date)) " .
-                    "AND ({$p}_compo.startDate <= :{$p}_date AND ({$p}_compo.endDate IS NULL OR {$p}_compo.endDate > :{$p}_date)) " .
+                    'SELECT 1 FROM '.HouseholdMember::class." {$p}_hm  ".
+                    'JOIN '.HouseholdComposition::class." {$p}_compo WITH {$p}_hm.household = {$p}_compo.household  ".
+                    "WHERE {$p}_hm.person = person AND {$p}_hm.shareHousehold = 'TRUE' ".
+                    "AND ({$p}_hm.startDate <= :{$p}_date AND ({$p}_hm.endDate IS NULL OR {$p}_hm.endDate > :{$p}_date)) ".
+                    "AND ({$p}_compo.startDate <= :{$p}_date AND ({$p}_compo.endDate IS NULL OR {$p}_compo.endDate > :{$p}_date)) ".
                     "AND {$p}_compo.householdCompositionType IN (:{$p}_accepted)"
                 )
             )
@@ -74,6 +74,7 @@ class ByHouseholdCompositionFilter implements FilterInterface
                 'label' => 'export.filter.person.by_composition.Date calc',
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
index 6fe4c57ef..82cda25ed 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
@@ -98,6 +98,7 @@ class DeadOrAliveFilter implements FilterInterface
             'label' => 'Filter in relation to this date',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
@@ -106,7 +107,7 @@ class DeadOrAliveFilter implements FilterInterface
     public function describeAction($data, $format = 'string')
     {
         return ['Filtered by a state of %deadOrAlive%: '
-        . 'at this date %date_calc%', [
+        .'at this date %date_calc%', [
             '%date_calc%' => $this->rollingDateConverter->convert($data['date_calc'])->format('d-m-Y'),
             '%deadOrAlive%' => $data['person_state'],
         ], ];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
index 70925d869..1bc32d9bb 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
@@ -72,6 +72,7 @@ class DeathdateFilter implements ExportElementValidatedInterface, FilterInterfac
             'label' => 'Deathdate before',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
@@ -80,7 +81,7 @@ class DeathdateFilter implements ExportElementValidatedInterface, FilterInterfac
     public function describeAction($data, $format = 'string')
     {
         return ['Filtered by person\'s deathdate: '
-            . 'between %date_from% and %date_to%', [
+            .'between %date_from% and %date_to%', [
                 '%date_from%' => $this->rollingDateConverter->convert($data['date_from'])->format('d-m-Y'),
                 '%date_to%' => $this->rollingDateConverter->convert($data['date_to'])->format('d-m-Y'),
             ], ];
@@ -98,13 +99,13 @@ class DeathdateFilter implements ExportElementValidatedInterface, FilterInterfac
 
         if (null === $date_from) {
             $context->buildViolation('The "date from" should not be empty')
-                //->atPath('date_from')
+                // ->atPath('date_from')
                 ->addViolation();
         }
 
         if (null === $date_to) {
             $context->buildViolation('The "date to" should not be empty')
-                //->atPath('date_to')
+                // ->atPath('date_to')
                 ->addViolation();
         }
 
@@ -113,7 +114,7 @@ class DeathdateFilter implements ExportElementValidatedInterface, FilterInterfac
             && $date_from >= $date_to
         ) {
             $context->buildViolation('The date "date to" should be after the '
-                . 'date given in "date from" field')
+                .'date given in "date from" field')
                 ->addViolation();
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
index 182006bbc..12ab0ad02 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
@@ -22,12 +22,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_filter;
-use function count;
-use function implode;
-use function in_array;
-use function is_array;
-
 class GenderFilter implements
     ExportElementValidatedInterface,
     FilterInterface
@@ -52,7 +46,7 @@ class GenderFilter implements
         $where = $qb->getDQLPart('where');
         $isIn = $qb->expr()->in('person.gender', ':person_gender');
 
-        if (!in_array('null', $data['accepted_genders'], true)) {
+        if (!\in_array('null', $data['accepted_genders'], true)) {
             $clause = $isIn;
         } else {
             $clause = $qb->expr()->orX($isIn, $qb->expr()->isNull('person.gender'));
@@ -65,7 +59,7 @@ class GenderFilter implements
         }
 
         $qb->add('where', $where);
-        $qb->setParameter('person_gender', array_filter(
+        $qb->setParameter('person_gender', \array_filter(
             $data['accepted_genders'],
             static fn ($el) => 'null' !== $el
         ));
@@ -89,6 +83,7 @@ class GenderFilter implements
             'expanded' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -108,7 +103,7 @@ class GenderFilter implements
 
         return [
             'Filtering by genders: only %genders%',
-            ['%genders%' => implode(', ', $genders)],
+            ['%genders%' => \implode(', ', $genders)],
         ];
     }
 
@@ -124,7 +119,7 @@ class GenderFilter implements
 
     public function validateForm($data, ExecutionContextInterface $context)
     {
-        if (!is_array($data['accepted_genders']) || count($data['accepted_genders']) === 0) {
+        if (!\is_array($data['accepted_genders']) || 0 === \count($data['accepted_genders'])) {
             $context->buildViolation('You should select an option')
                 ->addViolation();
         }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
index 1a77f6742..d54842b47 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
@@ -37,7 +37,7 @@ class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
     {
         $subQuery =
             'SELECT 1
-            FROM ' . PersonHouseholdAddress::class . ' person_filter_geog_person_household_address
+            FROM '.PersonHouseholdAddress::class.' person_filter_geog_person_household_address
             JOIN person_filter_geog_person_household_address.address person_filter_geog_address
             JOIN person_filter_geog_address.geographicalUnits person_filter_geog_unit
             WHERE
@@ -79,13 +79,14 @@ class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
                 'placeholder' => 'Select a geographical unit',
                 'choices' => $this->geographicalUnitRepository->findAll(),
                 'choice_value' => static fn (SimpleGeographicalUnitDTO $item) => $item->id,
-                'choice_label' => fn (SimpleGeographicalUnitDTO $item) => $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()) . ' > ' . $item->unitName,
+                'choice_label' => fn (SimpleGeographicalUnitDTO $item) => $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()).' > '.$item->unitName,
                 'attr' => [
                     'class' => 'select2',
                 ],
                 'multiple' => true,
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
@@ -100,7 +101,7 @@ class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
                 '%units%' => implode(
                     ', ',
                     array_map(
-                        fn (SimpleGeographicalUnitDTO $item) => $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()) . ' > ' . $item->unitName,
+                        fn (SimpleGeographicalUnitDTO $item) => $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()).' > '.$item->unitName,
                         $data['units']
                     )
                 ),
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
index 2b11eb33c..6c4cdf802 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
@@ -50,6 +50,7 @@ class MaritalStatusFilter implements FilterInterface
             'expanded' => true,
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
index ba3a8bb1e..4c83fafe3 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
@@ -59,6 +59,7 @@ class NationalityFilter implements
             'placeholder' => 'Choose countries',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
index 62d702a03..ea8e01baf 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
@@ -23,7 +23,6 @@ use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class ResidentialAddressAtThirdpartyFilter implements FilterInterface
 {
@@ -36,19 +35,19 @@ class ResidentialAddressAtThirdpartyFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('resaddr', $qb->getAllAliases(), true)) {
+        if (!\in_array('resaddr', $qb->getAllAliases(), true)) {
             $qb->join(ResidentialAddress::class, 'resaddr', Expr\Join::WITH, 'resaddr.person = person');
         }
 
-        if (!in_array('center', $qb->getAllAliases(), true)) {
+        if (!\in_array('center', $qb->getAllAliases(), true)) {
             $qb->join('person.center', 'center');
         }
 
-        if (!in_array('tparty', $qb->getAllAliases(), true)) {
+        if (!\in_array('tparty', $qb->getAllAliases(), true)) {
             $qb->join('resaddr.hostThirdParty', 'tparty');
         }
 
-        if (!in_array('tpartycat', $qb->getAllAliases(), true)) {
+        if (!\in_array('tpartycat', $qb->getAllAliases(), true)) {
             $qb->join('tparty.categories', 'tpartycat');
         }
 
@@ -99,6 +98,7 @@ class ResidentialAddressAtThirdpartyFilter implements FilterInterface
             'label' => 'Date during which residential address was valid',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
index a544ee397..3c2d7a3a6 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
@@ -20,7 +20,6 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
-use function in_array;
 
 class ResidentialAddressAtUserFilter implements FilterInterface
 {
@@ -33,11 +32,11 @@ class ResidentialAddressAtUserFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('resaddr', $qb->getAllAliases(), true)) {
+        if (!\in_array('resaddr', $qb->getAllAliases(), true)) {
             $qb->join(ResidentialAddress::class, 'resaddr', Expr\Join::WITH, 'resaddr.person = person');
         }
 
-        if (!in_array('center', $qb->getAllAliases(), true)) {
+        if (!\in_array('center', $qb->getAllAliases(), true)) {
             $qb->join('person.center', 'center');
         }
 
@@ -78,6 +77,7 @@ class ResidentialAddressAtUserFilter implements FilterInterface
             'label' => 'Date during which residential address was valid',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutHouseholdComposition.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutHouseholdComposition.php
index a05b5b29d..c34c7eb40 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutHouseholdComposition.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutHouseholdComposition.php
@@ -39,10 +39,10 @@ class WithoutHouseholdComposition implements FilterInterface
             ->andWhere(
                 $qb->expr()->not(
                     $qb->expr()->exists(
-                        'SELECT 1 FROM ' . HouseholdMember::class . " {$p}_hm  " .
-                        'JOIN ' . HouseholdComposition::class . " {$p}_compo WITH {$p}_hm.household = {$p}_compo.household  " .
-                        "WHERE {$p}_hm.person = person AND {$p}_hm.shareHousehold = 'TRUE' " .
-                        "AND ({$p}_hm.startDate <= :{$p}_date AND ({$p}_hm.endDate IS NULL OR {$p}_hm.endDate > :{$p}_date)) " .
+                        'SELECT 1 FROM '.HouseholdMember::class." {$p}_hm  ".
+                        'JOIN '.HouseholdComposition::class." {$p}_compo WITH {$p}_hm.household = {$p}_compo.household  ".
+                        "WHERE {$p}_hm.person = person AND {$p}_hm.shareHousehold = 'TRUE' ".
+                        "AND ({$p}_hm.startDate <= :{$p}_date AND ({$p}_hm.endDate IS NULL OR {$p}_hm.endDate > :{$p}_date)) ".
                         "AND ({$p}_compo.startDate <= :{$p}_date AND ({$p}_compo.endDate IS NULL OR {$p}_compo.endDate > :{$p}_date)) "
                     )
                 )
@@ -62,6 +62,7 @@ class WithoutHouseholdComposition implements FilterInterface
                 'label' => 'export.filter.person.by_no_composition.Date calc',
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php
index 4e50f2ed7..373572e54 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php
@@ -40,6 +40,7 @@ final readonly class AccompanyingPeriodWorkEndDateBetweenDateFilter implements F
                 'help' => 'export.filter.work.end_between_dates.keep_null_help',
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['start_date' => new RollingDate(RollingDate::T_TODAY), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -57,7 +58,7 @@ final readonly class AccompanyingPeriodWorkEndDateBetweenDateFilter implements F
             [
                 '%startDate%' => null !== $data['start_date'] ? $this->rollingDateConverter->convert($data['start_date'])->format('d-m-Y') : '',
                 '%endDate%' => null !== $data['end_date'] ? $this->rollingDateConverter->convert($data['end_date'])->format('d-m-Y') : '',
-            ]
+            ],
         ];
     }
 
@@ -80,7 +81,7 @@ final readonly class AccompanyingPeriodWorkEndDateBetweenDateFilter implements F
                 $qb->expr()->lte('acpw.endDate', ':'.$ae),
                 $qb->expr()->isNotNull('acpw.endDate')
             ),
-            default => throw new \LogicException("This value is not supported"),
+            default => throw new \LogicException('This value is not supported'),
         };
         $end = match ($data['keep_null']) {
             true => $qb->expr()->orX(
@@ -91,7 +92,7 @@ final readonly class AccompanyingPeriodWorkEndDateBetweenDateFilter implements F
                 $qb->expr()->gt('acpw.endDate', ':'.$as),
                 $qb->expr()->isNotNull('acpw.endDate')
             ),
-            default => throw new \LogicException("This value is not supported"),
+            default => throw new \LogicException('This value is not supported'),
         };
 
         if (null !== $data['start_date']) {
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkStartDateBetweenDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkStartDateBetweenDateFilter.php
index 5e56b9898..880543355 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkStartDateBetweenDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkStartDateBetweenDateFilter.php
@@ -40,6 +40,7 @@ final readonly class AccompanyingPeriodWorkStartDateBetweenDateFilter implements
                 'help' => 'export.filter.work.start_between_dates.keep_null_help',
             ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['start_date' => new RollingDate(RollingDate::T_TODAY), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -57,7 +58,7 @@ final readonly class AccompanyingPeriodWorkStartDateBetweenDateFilter implements
             [
                 '%startDate%' => null !== $data['start_date'] ? $this->rollingDateConverter->convert($data['start_date'])->format('d-m-Y') : '',
                 '%endDate%' => null !== $data['end_date'] ? $this->rollingDateConverter->convert($data['end_date'])->format('d-m-Y') : '',
-            ]
+            ],
         ];
     }
 
@@ -80,7 +81,7 @@ final readonly class AccompanyingPeriodWorkStartDateBetweenDateFilter implements
                 $qb->expr()->lte('acpw.startDate', ':'.$ae),
                 $qb->expr()->isNotNull('acpw.startDate')
             ),
-            default => throw new \LogicException("This value is not supported"),
+            default => throw new \LogicException('This value is not supported'),
         };
         $end = match ($data['keep_null']) {
             true => $qb->expr()->orX(
@@ -91,7 +92,7 @@ final readonly class AccompanyingPeriodWorkStartDateBetweenDateFilter implements
                 $qb->expr()->gt('acpw.startDate', ':'.$as),
                 $qb->expr()->isNotNull('acpw.startDate')
             ),
-            default => throw new \LogicException("This value is not supported"),
+            default => throw new \LogicException('This value is not supported'),
         };
 
         if (null !== $data['start_date']) {
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php
index 09551a3c5..b11d2a93c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php
@@ -35,8 +35,9 @@ class CurrentActionFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder): void
     {
-        //no form
+        // no form
     }
+
     public function getFormDefaultData(): array
     {
         return [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
index c0de87d65..d3e54f2a5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
@@ -11,22 +11,16 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters;
 
-use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverter;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory;
 use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 class JobFilter implements FilterInterface
 {
@@ -47,13 +41,13 @@ class JobFilter implements FilterInterface
         $p = self::PREFIX;
 
         $qb->andWhere(
-            'EXISTS (SELECT 1 FROM ' . AccompanyingPeriodWorkReferrerHistory::class . " {$p}_ref_history
+            'EXISTS (SELECT 1 FROM '.AccompanyingPeriodWorkReferrerHistory::class." {$p}_ref_history
                 JOIN {$p}_ref_history.user {$p}_ref_history_user JOIN {$p}_ref_history_user.jobHistories {$p}_job_history
                 WHERE {$p}_ref_history.accompanyingPeriodWork = acpw AND {$p}_job_history.job IN (:{$p}_job) AND {$p}_job_history.startDate <= {$p}_ref_history.startDate
                 AND ({$p}_job_history.endDate IS NULL or {$p}_job_history.endDate >= {$p}_ref_history.startDate))"
         );
 
-        $qb->setParameter("{$p}_job", $data["job"]);
+        $qb->setParameter("{$p}_job", $data['job']);
     }
 
     public function applyOn(): string
@@ -94,7 +88,7 @@ class JobFilter implements FilterInterface
     {
         return [
             'job' => [],
-            'job_at' => new RollingDate(RollingDate::T_TODAY)
+            'job_at' => new RollingDate(RollingDate::T_TODAY),
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
index 2410a5d08..4d456fdb2 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
@@ -16,12 +16,9 @@ use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final readonly class ReferrerFilter implements FilterInterface
 {
@@ -39,7 +36,7 @@ final readonly class ReferrerFilter implements FilterInterface
         $p = self::PREFIX;
 
         $qb
-            ->leftJoin('acpw.referrersHistory', $p . "_acpwusers_history")
+            ->leftJoin('acpw.referrersHistory', $p.'_acpwusers_history')
             ->andWhere("{$p}_acpwusers_history.startDate <= :{$p}_calc_date AND ({$p}_acpwusers_history.endDate IS NULL or {$p}_acpwusers_history.endDate > :{$p}_calc_date)")
             ->andWhere("{$p}_acpwusers_history.user IN (:{$p}_agents)");
 
@@ -61,7 +58,7 @@ final readonly class ReferrerFilter implements FilterInterface
         $builder
             ->add('accepted_agents', PickUserDynamicType::class, [
                 'multiple' => true,
-                'label' => 'export.filter.work.by_treating_agent.Accepted agents'
+                'label' => 'export.filter.work.by_treating_agent.Accepted agents',
             ])
             ->add('agent_at', PickRollingDateType::class, [
                 'label' => 'export.filter.work.by_treating_agent.Calc date',
@@ -69,6 +66,7 @@ final readonly class ReferrerFilter implements FilterInterface
             ])
         ;
     }
+
     public function getFormDefaultData(): array
     {
         return [
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
index ce9b4e585..d4867a884 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
@@ -12,15 +12,11 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverter;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory;
 use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -45,12 +41,12 @@ class ScopeFilter implements FilterInterface
         $p = self::PREFIX;
 
         $qb->andWhere(
-            'EXISTS (SELECT 1 FROM ' . AccompanyingPeriodWorkReferrerHistory::class . " {$p}_ref_history
+            'EXISTS (SELECT 1 FROM '.AccompanyingPeriodWorkReferrerHistory::class." {$p}_ref_history
                 JOIN {$p}_ref_history.user {$p}_ref_history_user JOIN {$p}_ref_history_user.scopeHistories {$p}_scope_history
                 WHERE {$p}_ref_history.accompanyingPeriodWork = acpw AND {$p}_scope_history.scope IN (:{$p}_scope) AND {$p}_scope_history.startDate <= {$p}_ref_history.startDate
                 AND ({$p}_scope_history.endDate IS NULL or {$p}_scope_history.endDate >= {$p}_ref_history.startDate))"
         )
-            ->setParameter("{$p}_scope", $data["scope"]);
+            ->setParameter("{$p}_scope", $data['scope']);
     }
 
     public function applyOn()
@@ -91,7 +87,7 @@ class ScopeFilter implements FilterInterface
     {
         return [
             'scope' => [],
-            'scope_at' => new RollingDate(RollingDate::T_TODAY)
+            'scope_at' => new RollingDate(RollingDate::T_TODAY),
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
index 630ccd657..3476bc33e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
@@ -23,8 +23,6 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
-use function count;
-use function in_array;
 
 class SocialWorkTypeFilter implements FilterInterface
 {
@@ -37,14 +35,14 @@ class SocialWorkTypeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (count($data['actionType']) > 0) {
+        if (\count($data['actionType']) > 0) {
             $qb
                 ->andWhere($qb->expr()->in('acpw.socialAction', ':actionType'))
                 ->setParameter('actionType', $data['actionType']);
         }
 
-        if (count($data['goal']) > 0) {
-            if (!in_array('acpw_goal', $qb->getAllAliases(), true)) {
+        if (\count($data['goal']) > 0) {
+            if (!\in_array('acpw_goal', $qb->getAllAliases(), true)) {
                 $qb->join('acpw.goals', 'acpw_goal');
             }
 
@@ -55,10 +53,10 @@ class SocialWorkTypeFilter implements FilterInterface
                 $andX->add($qb->expr()->eq('acpw_goal.goal', $goalId = ':goal_'.uniqid()));
                 $qb->setParameter($goalId, $goal);
 
-                if (count($data['result']) > 0) {
+                if (\count($data['result']) > 0) {
                     $orXResult = $qb->expr()->orX();
                     foreach ($data['result'] as $result) {
-                        /** @var Result $result */
+                        /* @var Result $result */
                         $orXResult->add($qb->expr()->isMemberOf($resultId = ':result_'.uniqid(), 'acpw_goal.results'));
                         $qb->setParameter($resultId, $result);
                     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Helper/LabelPersonHelper.php b/src/Bundle/ChillPersonBundle/Export/Helper/LabelPersonHelper.php
index 4739eb1a1..7e752395c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Helper/LabelPersonHelper.php
+++ b/src/Bundle/ChillPersonBundle/Export/Helper/LabelPersonHelper.php
@@ -13,8 +13,6 @@ namespace Chill\PersonBundle\Export\Helper;
 
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
-use function count;
-use const SORT_NUMERIC;
 
 class LabelPersonHelper
 {
@@ -33,7 +31,7 @@ class LabelPersonHelper
 
             $decoded = json_decode((string) $value, null, 512, JSON_THROW_ON_ERROR);
 
-            if (0 === count($decoded)) {
+            if (0 === \count($decoded)) {
                 return '';
             }
 
@@ -52,7 +50,7 @@ class LabelPersonHelper
                         },
                         array_unique(
                             array_filter($decoded, static fn (?int $id) => null !== $id),
-                            SORT_NUMERIC
+                            \SORT_NUMERIC
                         )
                     )
                 );
diff --git a/src/Bundle/ChillPersonBundle/Export/Helper/ListAccompanyingPeriodHelper.php b/src/Bundle/ChillPersonBundle/Export/Helper/ListAccompanyingPeriodHelper.php
index 1531b0489..30233bb39 100644
--- a/src/Bundle/ChillPersonBundle/Export/Helper/ListAccompanyingPeriodHelper.php
+++ b/src/Bundle/ChillPersonBundle/Export/Helper/ListAccompanyingPeriodHelper.php
@@ -96,10 +96,10 @@ final readonly class ListAccompanyingPeriodHelper
         }
 
         return match ($key) {
-            'stepSince', 'openingDate', 'closingDate', 'referrerSince', 'acpCreatedAt', 'acpUpdatedAt' => $this->dateTimeHelper->getLabel('export.list.acp.' . $key),
+            'stepSince', 'openingDate', 'closingDate', 'referrerSince', 'acpCreatedAt', 'acpUpdatedAt' => $this->dateTimeHelper->getLabel('export.list.acp.'.$key),
             'origin', 'closingMotive', 'job' => function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.list.acp.' . $key;
+                    return 'export.list.acp.'.$key;
                 }
 
                 if (null === $value) {
@@ -108,10 +108,10 @@ final readonly class ListAccompanyingPeriodHelper
 
                 return $this->translatableStringHelper->localize(json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR));
             },
-            'acpCreatedBy', 'acpUpdatedBy', 'referrer' => $this->userHelper->getLabel($key, $values, 'export.list.acp.' . $key),
+            'acpCreatedBy', 'acpUpdatedBy', 'referrer' => $this->userHelper->getLabel($key, $values, 'export.list.acp.'.$key),
             'locationPersonName', 'requestorPerson' => function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.list.acp.' . $key;
+                    return 'export.list.acp.'.$key;
                 }
 
                 if (null === $value || null === $person = $this->personRepository->find($value)) {
@@ -122,7 +122,7 @@ final readonly class ListAccompanyingPeriodHelper
             },
             'requestorThirdParty' => function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.list.acp.' . $key;
+                    return 'export.list.acp.'.$key;
                 }
 
                 if (null === $value || null === $thirdparty = $this->thirdPartyRepository->find($value)) {
@@ -133,7 +133,7 @@ final readonly class ListAccompanyingPeriodHelper
             },
             'scopes' => function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.list.acp.' . $key;
+                    return 'export.list.acp.'.$key;
                 }
 
                 if (null === $value) {
@@ -150,7 +150,7 @@ final readonly class ListAccompanyingPeriodHelper
             },
             'socialIssues' => function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.list.acp.' . $key;
+                    return 'export.list.acp.'.$key;
                 }
 
                 if (null === $value) {
@@ -184,7 +184,7 @@ final readonly class ListAccompanyingPeriodHelper
             },
             default => static function ($value) use ($key) {
                 if ('_header' === $value) {
-                    return 'export.list.acp.' . $key;
+                    return 'export.list.acp.'.$key;
                 }
 
                 if (null === $value) {
@@ -286,9 +286,9 @@ final readonly class ListAccompanyingPeriodHelper
 
         $qb
             // scopes
-            ->addSelect('(SELECT AGGREGATE(scope.name) FROM ' . Scope::class . ' scope WHERE scope MEMBER OF acp.scopes) AS scopes')
+            ->addSelect('(SELECT AGGREGATE(scope.name) FROM '.Scope::class.' scope WHERE scope MEMBER OF acp.scopes) AS scopes')
             // social issues
-            ->addSelect('(SELECT AGGREGATE(socialIssue.id) FROM ' . SocialIssue::class . ' socialIssue WHERE socialIssue MEMBER OF acp.socialIssues) AS socialIssues');
+            ->addSelect('(SELECT AGGREGATE(socialIssue.id) FROM '.SocialIssue::class.' socialIssue WHERE socialIssue MEMBER OF acp.socialIssues) AS socialIssues');
 
         // add parameter
         $qb->setParameter('calcDate', $calcDate);
diff --git a/src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php b/src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php
index 4c1d1f620..576885f2d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php
+++ b/src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php
@@ -21,16 +21,11 @@ use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\MaritalStatusRepositoryInterface;
-use DateTime;
 use DateTimeImmutable;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use Exception;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
-use RuntimeException;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
-use function strlen;
 
 /**
  * Helper for list person: provide:.
@@ -88,7 +83,7 @@ class ListPersonHelper
         return [
             ...array_filter(
                 ListPersonHelper::FIELDS,
-                fn (string $key) => !in_array($key, ['address_fields', 'lifecycleUpdate'], true)
+                fn (string $key) => !\in_array($key, ['address_fields', 'lifecycleUpdate'], true)
             ),
             ...$this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'address_fields'),
             ...['createdAt', 'createdBy', 'updatedAt', 'updatedBy'],
@@ -98,10 +93,10 @@ class ListPersonHelper
     /**
      * @param array<value-of<self::FIELDS>> $fields
      */
-    public function addSelect(QueryBuilder $qb, array $fields, DateTimeImmutable $computedDate): void
+    public function addSelect(QueryBuilder $qb, array $fields, \DateTimeImmutable $computedDate): void
     {
         foreach (ListPersonHelper::FIELDS as $f) {
-            if (!in_array($f, $fields, true)) {
+            if (!\in_array($f, $fields, true)) {
                 continue;
             }
 
@@ -125,7 +120,7 @@ class ListPersonHelper
                     break;
 
                 case 'spokenLanguages':
-                    $qb->addSelect('(SELECT AGGREGATE(language.id) FROM ' . Language::class . ' language WHERE language MEMBER OF person.spokenLanguages) AS spokenLanguages');
+                    $qb->addSelect('(SELECT AGGREGATE(language.id) FROM '.Language::class.' language WHERE language MEMBER OF person.spokenLanguages) AS spokenLanguages');
 
                     break;
 
@@ -241,18 +236,17 @@ class ListPersonHelper
                     }
 
                     // warning: won't work with DateTimeImmutable as we reset time a few lines later
-                    $date = DateTime::createFromFormat('Y-m-d', $value);
+                    $date = \DateTime::createFromFormat('Y-m-d', $value);
                     $hasTime = false;
 
                     if (false === $date) {
-                        $date = DateTime::createFromFormat('Y-m-d H:i:s', $value);
+                        $date = \DateTime::createFromFormat('Y-m-d H:i:s', $value);
                         $hasTime = true;
                     }
 
                     // check that the creation could occurs.
                     if (false === $date) {
-                        throw new Exception(sprintf('The value %s could '
-                            . 'not be converted to %s', $value, DateTime::class));
+                        throw new \Exception(sprintf('The value %s could not be converted to %s', $value, \DateTime::class));
                     }
 
                     if (!$hasTime) {
@@ -370,8 +364,8 @@ class ListPersonHelper
                 };
 
             default:
-                if (!in_array($key, self::getAllPossibleFields(), true)) {
-                    throw new RuntimeException("this key is not supported by this helper: {$key}");
+                if (!\in_array($key, self::getAllPossibleFields(), true)) {
+                    throw new \RuntimeException("this key is not supported by this helper: {$key}");
                 }
 
                 // for fields which are associated with person
@@ -385,9 +379,9 @@ class ListPersonHelper
         }
     }
 
-    private function addCurrentAddressAt(QueryBuilder $qb, DateTimeImmutable $date): void
+    private function addCurrentAddressAt(QueryBuilder $qb, \DateTimeImmutable $date): void
     {
-        if (!(in_array('personHouseholdAddress', $qb->getAllAliases(), true))) {
+        if (!\in_array('personHouseholdAddress', $qb->getAllAliases(), true)) {
             $qb
                 ->leftJoin('person.householdAddresses', 'personHouseholdAddress')
                 ->andWhere(
diff --git a/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php b/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
index 09b940a17..77c27c86d 100644
--- a/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
+++ b/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
@@ -22,7 +22,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Role\Role;
 
 /**
  * Class AccompanyingPeriodType.
@@ -49,7 +48,7 @@ class AccompanyingPeriodType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        //if the period_action is close, date opening should not be seen
+        // if the period_action is close, date opening should not be seen
         if ('close' !== $options['period_action']) {
             $builder
                 ->add('openingDate', DateType::class, [
diff --git a/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php b/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
index 684914618..8031de926 100644
--- a/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+++ b/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
@@ -13,14 +13,9 @@ namespace Chill\PersonBundle\Form\ChoiceLoader;
 
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
-use RuntimeException;
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 
-use function call_user_func;
-use function count;
-use function in_array;
-
 /**
  * Allow to load a list of person.
  */
@@ -32,7 +27,7 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
 
     public function __construct(
         protected PersonRepository $personRepository,
-        ?array $centers = null
+        array $centers = null
     ) {
         if (null !== $centers) {
             $this->centers = $centers;
@@ -46,7 +41,7 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
     {
         return new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
             $this->lazyLoadedPersons,
-            static fn (Person $p) => call_user_func($value, $p)
+            static fn (Person $p) => \call_user_func($value, $p)
         );
     }
 
@@ -68,9 +63,9 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
 
             if (
                 $this->hasCenterFilter()
-                && !in_array($person->getCenter(), $this->centers, true)
+                && !\in_array($person->getCenter(), $this->centers, true)
             ) {
-                throw new RuntimeException('chosen a person not in correct center');
+                throw new \RuntimeException('chosen a person not in correct center');
             }
 
             $choices[] = $person;
@@ -95,7 +90,7 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
                 continue;
             }
 
-            $id = call_user_func($value, $choice);
+            $id = \call_user_func($value, $choice);
             $values[] = $id;
             $this->lazyLoadedPersons[$id] = $choice;
         }
@@ -108,6 +103,6 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
      */
     protected function hasCenterFilter()
     {
-        return count($this->centers) > 0;
+        return \count($this->centers) > 0;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php b/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php
index b89fd63a6..fd7ef3ecb 100644
--- a/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php
+++ b/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php
@@ -53,7 +53,7 @@ class ClosingMotiveType extends AbstractType
             ->add('isCanceledAccompanyingPeriod', CheckboxType::class, [
                 'label' => $this->translator->trans('Consider canceled'),
                 'required' => false,
-                'help' => $this->translator->trans('Canceled parcours help')
+                'help' => $this->translator->trans('Canceled parcours help'),
             ]);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php b/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
index 5b12430c8..0fc25eefe 100644
--- a/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
+++ b/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
@@ -17,9 +17,6 @@ use Doctrine\Common\Collections\Collection;
 use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
-use function array_key_exists;
-use function is_array;
-
 class PersonAltNameDataMapper implements DataMapperInterface
 {
     public function mapDataToForms($viewData, $forms)
@@ -35,12 +32,12 @@ class PersonAltNameDataMapper implements DataMapperInterface
         $mapIndexToKey = [];
 
         foreach ($viewData->getIterator() as $key => $altName) {
-            /** @var PersonAltName $altName */
+            /* @var PersonAltName $altName */
             $mapIndexToKey[$altName->getKey()] = $key;
         }
 
         foreach ($forms as $key => $form) {
-            if (array_key_exists($key, $mapIndexToKey)) {
+            if (\array_key_exists($key, $mapIndexToKey)) {
                 $form->setData($viewData->get($mapIndexToKey[$key])->getLabel());
             }
         }
@@ -48,13 +45,13 @@ class PersonAltNameDataMapper implements DataMapperInterface
 
     /**
      * @param FormInterface[] $forms
-     * @param Collection $viewData
+     * @param Collection      $viewData
      */
     public function mapFormsToData($forms, &$viewData)
     {
         $mapIndexToKey = [];
 
-        if (is_array($viewData)) {
+        if (\is_array($viewData)) {
             $dataIterator = $viewData;
         } else {
             $dataIterator = $viewData instanceof ArrayCollection ?
@@ -62,14 +59,14 @@ class PersonAltNameDataMapper implements DataMapperInterface
         }
 
         foreach ($dataIterator as $key => $altName) {
-            /** @var PersonAltName $altName */
+            /* @var PersonAltName $altName */
             $mapIndexToKey[$altName->getKey()] = $key;
         }
 
         foreach ($forms as $key => $form) {
             $isEmpty = empty($form->getData());
 
-            if (array_key_exists($key, $mapIndexToKey)) {
+            if (\array_key_exists($key, $mapIndexToKey)) {
                 if ($isEmpty) {
                     $viewData->remove($mapIndexToKey[$key]);
                 } else {
@@ -81,7 +78,7 @@ class PersonAltNameDataMapper implements DataMapperInterface
                         ->setKey($key)
                         ->setLabel($form->getData());
 
-                    if (is_array($viewData)) {
+                    if (\is_array($viewData)) {
                         $viewData[] = $altName;
                     } else {
                         $viewData->add($altName);
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonType.php b/src/Bundle/ChillPersonBundle/Form/PersonType.php
index 0443902a1..c971495b6 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonType.php
@@ -20,7 +20,6 @@ use Chill\MainBundle\Form\Type\CommentType;
 use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\MainBundle\Form\Type\Select2CountryType;
 use Chill\MainBundle\Form\Type\Select2LanguageType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Person;
@@ -29,7 +28,6 @@ use Chill\PersonBundle\Form\Type\GenderType;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
 use Chill\PersonBundle\Form\Type\PersonPhoneType;
 use Chill\PersonBundle\Form\Type\Select2MaritalStatusType;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -156,7 +154,7 @@ class PersonType extends AbstractType
             'allow_delete' => true,
             'by_reference' => false,
             'label' => false,
-            'delete_empty' => static fn (?PersonPhone $pp = null) => null === $pp || $pp->isEmpty(),
+            'delete_empty' => static fn (PersonPhone $pp = null) => null === $pp || $pp->isEmpty(),
             'error_bubbling' => false,
             'empty_collection_explain' => 'No additional phone numbers',
         ]);
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
index 86f2a50ec..d29b4cd41 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
@@ -18,7 +18,6 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\ChoiceLoader\PersonChoiceLoader;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Search\PersonSearch;
-use RuntimeException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\Options;
@@ -29,9 +28,6 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function in_array;
-use function is_array;
-
 /**
  * This type allow to pick a person.
  *
@@ -113,7 +109,7 @@ class PickPersonType extends AbstractType
         // add the default options
         $resolver->setDefaults([
             'class' => Person::class,
-            'choice_label' => static fn (Person $p) => $p->getFirstname() . ' ' . $p->getLastname(),
+            'choice_label' => static fn (Person $p) => $p->getFirstname().' '.$p->getLastname(),
             'placeholder' => 'Pick a person',
             'choice_attr' => static fn (Person $p) => [
                 'data-center' => $p->getCenter()->getId(),
@@ -146,18 +142,17 @@ class PickPersonType extends AbstractType
             $selectedCenters = $centers;
         } else {
             $selectedCenters = [];
-            $optionsCenters = is_array($options['centers']) ?
+            $optionsCenters = \is_array($options['centers']) ?
                     $options['centers'] : [$options['centers']];
 
             foreach ($optionsCenters as $c) {
                 // check that every member of the array is a center
                 if (!$c instanceof Center) {
-                    throw new RuntimeException('Every member of the "centers" '
-                            . 'option must be an instance of ' . Center::class);
+                    throw new \RuntimeException('Every member of the "centers" option must be an instance of '.Center::class);
                 }
 
                 if (
-                    !in_array($c->getId(), array_map(
+                    !\in_array($c->getId(), array_map(
                         static fn (Center $c) => $c->getId(),
                         $centers
                     ), true)
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php b/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
index ae31999ae..b820aa86f 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
@@ -20,9 +20,6 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-use const SORT_FLAG_CASE;
-use const SORT_STRING;
-
 /**
  * A type to select the marital status.
  */
@@ -45,7 +42,7 @@ class Select2MaritalStatusType extends AbstractType
             $choices[$ms->getId()] = $this->translatableStringHelper->localize($ms->getName());
         }
 
-        asort($choices, SORT_STRING | SORT_FLAG_CASE);
+        asort($choices, \SORT_STRING | \SORT_FLAG_CASE);
 
         $resolver->setDefaults([
             'class' => MaritalStatus::class,
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
index aa49f2cd5..3f89202e1 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
@@ -16,15 +16,11 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
-use DateTimeImmutable;
 use Doctrine\Common\Collections\Criteria;
-use LogicException;
 use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
-use function in_array;
-use function spl_object_hash;
 
 class MembersEditor
 {
@@ -44,22 +40,22 @@ class MembersEditor
 
     public function __construct(
         private readonly ValidatorInterface $validator,
-        private readonly ?\Chill\PersonBundle\Entity\Household\Household $household,
+        private readonly ?Household $household,
         private readonly EventDispatcherInterface $eventDispatcher
     ) {}
 
     /**
-     * Add a person to the household
+     * Add a person to the household.
      *
      * The person is added to the household associated with this editor's instance.
      *
      * If the person is also a member of another household, or the same household at the same position, the person
      * is not associated any more with the previous household.
      */
-    public function addMovement(DateTimeImmutable $date, Person $person, ?Position $position, ?bool $holder = false, ?string $comment = null): self
+    public function addMovement(\DateTimeImmutable $date, Person $person, ?Position $position, ?bool $holder = false, string $comment = null): self
     {
         if (null === $this->household) {
-            throw new LogicException('You must define a household first');
+            throw new \LogicException('You must define a household first');
         }
 
         $membership = (new HouseholdMember())
@@ -89,10 +85,10 @@ class MembersEditor
 
                 ++$counter;
 
-                if ($participation->getEndDate() === null || $participation->getEndDate() > $date) {
+                if (null === $participation->getEndDate() || $participation->getEndDate() > $date) {
                     $participation->setEndDate($date);
                     $this->membershipsAffected[] = $participation;
-                    $this->oldMembershipsHashes[] = spl_object_hash($participation);
+                    $this->oldMembershipsHashes[] = \spl_object_hash($participation);
 
                     if ($participation->getHousehold() !== $this->household) {
                         $event->setPreviousMembership($participation);
@@ -108,7 +104,7 @@ class MembersEditor
 
             foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
                 if ($participation->getHousehold() === $this->household
-                    && $participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate()
+                    && null === $participation->getEndDate() || $participation->getEndDate() > $membership->getStartDate()
                     && $participation->getStartDate() <= $membership->getStartDate()
                 ) {
                     $participation->setEndDate($membership->getStartDate());
@@ -122,7 +118,7 @@ class MembersEditor
                 }
 
                 if ($participation->getHousehold() === $this->household
-                    && ($participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate())
+                    && (null === $participation->getEndDate() || $participation->getEndDate() > $membership->getStartDate())
                     && $participation->getStartDate() <= $membership->getStartDate()
                 ) {
                     if ($participation->getShareHousehold()) {
@@ -165,7 +161,7 @@ class MembersEditor
      * @return $this
      */
     public function leaveMovement(
-        DateTimeImmutable $date,
+        \DateTimeImmutable $date,
         Person $person
     ): self {
         $criteria = new Criteria();
@@ -209,7 +205,7 @@ class MembersEditor
         }
 
         foreach ($this->membershipsAffected as $m) {
-            if (in_array(spl_object_hash($m), $this->oldMembershipsHashes, true)) {
+            if (\in_array(\spl_object_hash($m), $this->oldMembershipsHashes, true)) {
                 $list->addAll($this->validator->validate($m, null, [self::VALIDATION_GROUP_AFFECTED]));
             } else {
                 $list->addAll($this->validator->validate($m, null, [self::VALIDATION_GROUP_CREATED,
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php b/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
index 071866b96..7f98fe120 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
@@ -19,7 +19,7 @@ class MembersEditorFactory
 {
     public function __construct(private readonly EventDispatcherInterface $eventDispatcher, private readonly ValidatorInterface $validator) {}
 
-    public function createEditor(?Household $household = null): MembersEditor
+    public function createEditor(Household $household = null): MembersEditor
     {
         return new MembersEditor($this->validator, $household, $this->eventDispatcher);
     }
diff --git a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
index 93e855a18..d30adaf5d 100644
--- a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
@@ -60,7 +60,7 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
                 'route' => 'chill_person_household_accompanying_period',
                 'routeParameters' => [
                     'household_id' => $household->getId(),
-                ],])
+                ], ])
                 ->setExtras(['order' => 20]);
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index f83652db1..5dce8c477 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -20,7 +20,6 @@ use Knp\Menu\MenuItem;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 
 /**
  * Add menu entrie to person menu.
@@ -49,8 +48,8 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
     }
 
     /**
-     * @param $menuId
      * @param array{person: Person} $parameters
+     *
      * @return void
      */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
diff --git a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
index def6919e1..c82038b40 100644
--- a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
@@ -30,9 +30,6 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
      */
     public function __construct(protected ParameterBagInterface $parameterBag, private readonly Security $security, protected TranslatorInterface $translator) {}
 
-    /**
-     * @param $menuId
-     */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         if ($this->security->isGranted(PersonVoter::CREATE) && $this->parameterBag->get('chill_person.create_person_allowed')) {
diff --git a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php
index f7f47ba72..668f868ae 100644
--- a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php
+++ b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php
@@ -35,6 +35,6 @@ final readonly class AccompanyingPeriodNotificationHandler implements Notificati
 
     public function supports(Notification $notification, array $options = []): bool
     {
-        return $notification->getRelatedEntityClass() === AccompanyingPeriod::class;
+        return AccompanyingPeriod::class === $notification->getRelatedEntityClass();
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkEvaluationDocumentNotificationHandler.php b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkEvaluationDocumentNotificationHandler.php
index e45e0c914..40aff8570 100644
--- a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkEvaluationDocumentNotificationHandler.php
+++ b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkEvaluationDocumentNotificationHandler.php
@@ -1,6 +1,5 @@
 <?php
 
-
 declare(strict_types=1);
 
 /*
@@ -37,6 +36,6 @@ final readonly class AccompanyingPeriodWorkEvaluationDocumentNotificationHandler
 
     public function supports(Notification $notification, array $options = []): bool
     {
-        return $notification->getRelatedEntityClass() === AccompanyingPeriodWorkEvaluationDocument::class;
+        return AccompanyingPeriodWorkEvaluationDocument::class === $notification->getRelatedEntityClass();
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkNotificationHandler.php b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkNotificationHandler.php
index 0e225a539..e147fa520 100644
--- a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkNotificationHandler.php
+++ b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkNotificationHandler.php
@@ -1,6 +1,5 @@
 <?php
 
-
 declare(strict_types=1);
 
 /*
@@ -36,6 +35,6 @@ final readonly class AccompanyingPeriodWorkNotificationHandler implements Notifi
 
     public function supports(Notification $notification, array $options = []): bool
     {
-        return $notification->getRelatedEntityClass() === AccompanyingPeriodWork::class;
+        return AccompanyingPeriodWork::class === $notification->getRelatedEntityClass();
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php b/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
index 432ea2fbe..739387941 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
@@ -32,7 +32,6 @@ namespace Chill\PersonBundle\Privacy;
  */
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Symfony\Component\EventDispatcher\Event;
 
 class AccompanyingPeriodPrivacyEvent extends \Symfony\Contracts\EventDispatcher\Event
 {
diff --git a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
index 954060ea3..df57a08fd 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
@@ -32,9 +32,6 @@ namespace Chill\PersonBundle\Privacy;
  */
 
 use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\EventDispatcher\Event;
-
-use function count;
 
 /**
  * Class PrivacyEvent.
@@ -89,6 +86,6 @@ class PrivacyEvent extends \Symfony\Contracts\EventDispatcher\Event
      */
     public function hasPersons()
     {
-        return count($this->persons) >= 1;
+        return \count($this->persons) >= 1;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
index 33d01de1b..88eb2b172 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
@@ -36,8 +36,6 @@ use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
-use function array_map;
-
 class PrivacyEventSubscriber implements EventSubscriberInterface
 {
     /**
@@ -89,7 +87,7 @@ class PrivacyEventSubscriber implements EventSubscriberInterface
     {
         $persons = [];
 
-        if ($event->hasPersons() === true) {
+        if (true === $event->hasPersons()) {
             foreach ($event->getPersons() as $person) {
                 $persons[] = $person->getId();
             }
@@ -99,7 +97,7 @@ class PrivacyEventSubscriber implements EventSubscriberInterface
         $involved['person_id'] = $event->getPerson()->getId();
 
         if ($event->hasPersons()) {
-            $involved['persons'] = array_map(
+            $involved['persons'] = \array_map(
                 static fn (Person $p) => $p->getId(),
                 $event->getPersons()
             );
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepository.php
index b6704359d..0f68efabb 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepository.php
@@ -12,10 +12,8 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo;
-use DateInterval;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use LogicException;
 use Symfony\Component\Clock\ClockInterface;
 
 readonly class AccompanyingPeriodInfoRepository implements AccompanyingPeriodInfoRepositoryInterface
@@ -29,14 +27,14 @@ readonly class AccompanyingPeriodInfoRepository implements AccompanyingPeriodInf
         $this->entityRepository = $em->getRepository($this->getClassName());
     }
 
-    public function findAccompanyingPeriodIdInactiveAfter(DateInterval $interval, array $statuses = []): array
+    public function findAccompanyingPeriodIdInactiveAfter(\DateInterval $interval, array $statuses = []): array
     {
         $query = $this->em->createQuery();
         $baseDql = 'SELECT DISTINCT IDENTITY(ai.accompanyingPeriod) FROM '.AccompanyingPeriodInfo::class.' ai JOIN ai.accompanyingPeriod a WHERE NOT EXISTS
-            (SELECT 1 FROM ' . AccompanyingPeriodInfo::class . ' aiz WHERE aiz.infoDate > :after AND IDENTITY(aiz.accompanyingPeriod) = IDENTITY(ai.accompanyingPeriod))';
+            (SELECT 1 FROM '.AccompanyingPeriodInfo::class.' aiz WHERE aiz.infoDate > :after AND IDENTITY(aiz.accompanyingPeriod) = IDENTITY(ai.accompanyingPeriod))';
 
         if ([] !== $statuses) {
-            $dql = $baseDql . ' AND a.step IN (:statuses)';
+            $dql = $baseDql.' AND a.step IN (:statuses)';
             $query->setParameter('statuses', $statuses);
         } else {
             $dql = $baseDql;
@@ -47,14 +45,14 @@ readonly class AccompanyingPeriodInfoRepository implements AccompanyingPeriodInf
             ->getSingleColumnResult();
     }
 
-    public function findAccompanyingPeriodIdActiveSince(DateInterval $interval, array $statuses = []): array
+    public function findAccompanyingPeriodIdActiveSince(\DateInterval $interval, array $statuses = []): array
     {
         $query = $this->em->createQuery();
-        $baseDql = 'SELECT DISTINCT IDENTITY(ai.accompanyingPeriod) FROM ' . AccompanyingPeriodInfo::class . ' ai
+        $baseDql = 'SELECT DISTINCT IDENTITY(ai.accompanyingPeriod) FROM '.AccompanyingPeriodInfo::class.' ai
             JOIN ai.accompanyingPeriod a WHERE ai.infoDate > :after';
 
         if ([] !== $statuses) {
-            $dql = $baseDql . ' AND a.step IN (:statuses)';
+            $dql = $baseDql.' AND a.step IN (:statuses)';
             $query->setParameter('statuses', $statuses);
         } else {
             $dql = $baseDql;
@@ -67,7 +65,7 @@ readonly class AccompanyingPeriodInfoRepository implements AccompanyingPeriodInf
 
     public function find($id): never
     {
-        throw new LogicException("Calling an accompanying period info by his id does not make sense");
+        throw new \LogicException('Calling an accompanying period info by his id does not make sense');
     }
 
     public function findAll(): array
@@ -75,7 +73,7 @@ readonly class AccompanyingPeriodInfoRepository implements AccompanyingPeriodInf
         return $this->entityRepository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->entityRepository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepositoryInterface.php
index 07397cd48..3f85d303e 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepositoryInterface.php
@@ -21,17 +21,17 @@ use Doctrine\Persistence\ObjectRepository;
 interface AccompanyingPeriodInfoRepositoryInterface extends ObjectRepository
 {
     /**
-     * Return a list of id for inactive accompanying periods
+     * Return a list of id for inactive accompanying periods.
      *
-     * @param \DateInterval $interval
      * @param list<AccompanyingPeriod::STEP_*> $statuses
+     *
      * @return list<int>
      */
     public function findAccompanyingPeriodIdInactiveAfter(\DateInterval $interval, array $statuses = []): array;
 
     /**
-     * @param \DateInterval $interval
      * @param list<AccompanyingPeriod::STEP_*> $statuses
+     *
      * @return list<int>
      */
     public function findAccompanyingPeriodIdActiveSince(\DateInterval $interval, array $statuses = []): array;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocumentRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocumentRepository.php
index 193509890..a0364188a 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocumentRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocumentRepository.php
@@ -39,12 +39,12 @@ class AccompanyingPeriodWorkEvaluationDocumentRepository implements ObjectReposi
     }
 
     /**
-     * @param null|mixed $limit
-     * @param null|mixed $offset
+     * @param mixed|null $limit
+     * @param mixed|null $offset
      *
      * @return array|object[]|AccompanyingPeriodWorkEvaluationDocument[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
index fb1bb4ffa..840c44304 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
@@ -54,7 +53,7 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
      *
      * @return array|AccompanyingPeriodWorkEvaluation[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -93,14 +92,14 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
                     $qb->expr()->orX(
                         $qb->expr()->eq('period.user', ':user'),
                         $qb->expr()->exists(
-                            'SELECT 1 FROM ' . AccompanyingPeriodWork::class . ' subw JOIN subw.referrersHistory subw_ref_history WHERE subw.id = work.id AND subw_ref_history.user = :user'
+                            'SELECT 1 FROM '.AccompanyingPeriodWork::class.' subw JOIN subw.referrersHistory subw_ref_history WHERE subw.id = work.id AND subw_ref_history.user = :user'
                         )
                     )
                 )
             )
             ->setParameters([
                 'user' => $user,
-                'now' => new DateTimeImmutable('now'),
+                'now' => new \DateTimeImmutable('now'),
             ]);
 
         return $qb;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
index 4cbbab9fc..f0f00183d 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
@@ -47,13 +46,13 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor
             ->getSingleScalarResult();
     }
 
-    public function countNearEndDateByUser(User $user, DateTimeImmutable $since, DateTimeImmutable $until): int
+    public function countNearEndDateByUser(User $user, \DateTimeImmutable $since, \DateTimeImmutable $until): int
     {
         return $this->buildQueryNearEndDateByUser($user, $since, $until)
             ->select('count(w)')->getQuery()->getSingleScalarResult();
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -68,7 +67,7 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -91,8 +90,9 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor
      * * first, opened works
      * * then, closed works
      *
+     * @param array{types?: list<SocialAction>, user?: list<User>, after?: \DateTimeImmutable|null, before?: \DateTimeImmutable|null} $filters
+     *
      * @return AccompanyingPeriodWork[]
-     * @param array{types?: list<SocialAction>, user?: list<User>, after?: null|\DateTimeImmutable, before?: null|\DateTimeImmutable} $filters
      */
     public function findByAccompanyingPeriodOpenFirst(AccompanyingPeriod $period, array $filters, int $limit = 10, int $offset = 0): array
     {
@@ -106,23 +106,23 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor
         // implement filters
 
         if ([] !== ($filters['types'] ?? [])) {
-            $sql .= " AND w.socialaction_id IN (:types)";
+            $sql .= ' AND w.socialaction_id IN (:types)';
         }
 
         if ([] !== ($filters['user'] ?? [])) {
-            $sql .= " AND rw.user_id IN ("
-                . implode(
+            $sql .= ' AND rw.user_id IN ('
+                .implode(
                     ', ',
                     // we add a user_xx for each key of the 'user' list
-                    array_map(fn (User $u, int $idx) => ':user_' . $idx, $filters['user'], array_keys($filters['user']))
+                    array_map(fn (User $u, int $idx) => ':user_'.$idx, $filters['user'], array_keys($filters['user']))
                 )
-                . ")";
+                .')';
         }
 
         $sql .= " AND daterange(:after::date, :before::date) && daterange(w.startDate, w.endDate, '[]')";
 
         // if the start and end date were inversed, we inverse the order to avoid an error
-        if (null !== ($filters['after'] ?? null) && null !== ($filters['before']) && $filters['after'] > $filters['before']) {
+        if (null !== ($filters['after'] ?? null) && null !== $filters['before'] && $filters['after'] > $filters['before']) {
             $before = $filters['after'];
             $after = $filters['before'];
         } else {
@@ -137,7 +137,7 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor
                      w.enddate DESC,
                      w.id DESC";
 
-        $sql .= " LIMIT :limit OFFSET :offset";
+        $sql .= ' LIMIT :limit OFFSET :offset';
 
         $typeIds = [];
         foreach ($filters['types'] as $type) {
@@ -153,14 +153,14 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor
             ->setParameter('offset', $offset, Types::INTEGER);
 
         foreach ($filters['user'] as $key => $user) {
-            $nq->setParameter('user_' . $key, $user);
+            $nq->setParameter('user_'.$key, $user);
         }
 
         return $nq->getResult();
     }
 
     /**
-     * Return a list of types of social actions associated to the accompanying period
+     * Return a list of types of social actions associated to the accompanying period.
      *
      * @return array<SocialAction>
      */
@@ -171,10 +171,8 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor
             ->select('1')
             ->from(AccompanyingPeriodWork::class, 'apw');
 
-
         $in->andWhere('apw.accompanyingPeriod = :period')->setParameter('period', $period);
 
-
         // join between the embedded exist query and the main query
         $in->andWhere('apw.socialAction = sa');
 
@@ -189,7 +187,7 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor
         return $qb->getQuery()->getResult();
     }
 
-    public function findNearEndDateByUser(User $user, DateTimeImmutable $since, DateTimeImmutable $until, int $limit = 20, int $offset = 0): array
+    public function findNearEndDateByUser(User $user, \DateTimeImmutable $since, \DateTimeImmutable $until, int $limit = 20, int $offset = 0): array
     {
         return $this->buildQueryNearEndDateByUser($user, $since, $until)
             ->select('w')
@@ -227,7 +225,7 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor
         return $qb;
     }
 
-    private function buildQueryNearEndDateByUser(User $user, DateTimeImmutable $since, DateTimeImmutable $until): QueryBuilder
+    private function buildQueryNearEndDateByUser(User $user, \DateTimeImmutable $since, \DateTimeImmutable $until): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('w');
 
@@ -240,7 +238,7 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor
                     $qb->expr()->orX(
                         $qb->expr()->eq('period.user', ':user'),
                         $qb->expr()->exists(
-                            'SELECT 1 FROM ' . AccompanyingPeriodWork::class . ' subw JOIN subw.referrersHistory subw_ref_history WHERE subw.id = w.id AND subw_ref_history.user = :user and subw.ref_history.endDate IS NULL'
+                            'SELECT 1 FROM '.AccompanyingPeriodWork::class.' subw JOIN subw.referrersHistory subw_ref_history WHERE subw.id = w.id AND subw_ref_history.user = :user and subw.ref_history.endDate IS NULL'
                         )
                     )
                 )
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
index 4a50de12b..c60bdf4a7 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
@@ -41,7 +41,7 @@ final readonly class ClosingMotiveRepository implements ClosingMotiveRepositoryI
     /**
      * @return array|ClosingMotive[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -51,15 +51,12 @@ final readonly class ClosingMotiveRepository implements ClosingMotiveRepositoryI
         return $this->findOneBy($criteria);
     }
 
-    /**
-     * @return mixed
-     */
     public function getActiveClosingMotive(bool $onlyLeaf = true)
     {
         $rsm = new ResultSetMappingBuilder($this->entityManager);
         $rsm->addRootEntityFromClassMetadata($this->repository->getClassName(), 'cm');
 
-        $sql = 'SELECT ' . (string) $rsm . '
+        $sql = 'SELECT '.(string) $rsm.'
             FROM chill_person_accompanying_period_closingmotive AS cm
             WHERE
                 active IS TRUE ';
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php
index 88c52a5b0..49464bbd4 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php
@@ -15,8 +15,5 @@ use Doctrine\Persistence\ObjectRepository;
 
 interface ClosingMotiveRepositoryInterface extends ObjectRepository
 {
-    /**
-     * @return mixed
-     */
     public function getActiveClosingMotive(bool $onlyLeaf = true);
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
index e1fbf6d58..0a43697c8 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Repository;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Location;
-use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserJob;
@@ -30,7 +29,6 @@ use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Repository\AccompanyingPeriodACLAwareRepositoryTest;
 use Symfony\Component\Security\Core\Security;
-use function count;
 
 /**
  * @see AccompanyingPeriodACLAwareRepositoryTest
@@ -109,8 +107,8 @@ final readonly class AccompanyingPeriodACLAwareRepository implements Accompanyin
         Person $person,
         string $role,
         ?array $orderBy = [],
-        ?int $limit = null,
-        ?int $offset = null
+        int $limit = null,
+        int $offset = null
     ): array {
         $qb = $this->accompanyingPeriodRepository->createQueryBuilder('ap');
         $scopes = $this->authorizationHelper
@@ -124,7 +122,7 @@ final readonly class AccompanyingPeriodACLAwareRepository implements Accompanyin
                 $this->centerResolver->resolveCenters($person)
             );
 
-        if (0 === count($scopes)) {
+        if (0 === \count($scopes)) {
             return [];
         }
 
@@ -139,11 +137,11 @@ final readonly class AccompanyingPeriodACLAwareRepository implements Accompanyin
         return $qb->getQuery()->getResult();
     }
 
-    public function addOrderLimitClauses(QueryBuilder $qb, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): QueryBuilder
+    public function addOrderLimitClauses(QueryBuilder $qb, array $orderBy = null, int $limit = null, int $offset = null): QueryBuilder
     {
         if (null !== $orderBy) {
             foreach ($orderBy as $field => $order) {
-                $qb->addOrderBy('ap.' . $field, $order);
+                $qb->addOrderBy('ap.'.$field, $order);
             }
         }
 
@@ -159,9 +157,9 @@ final readonly class AccompanyingPeriodACLAwareRepository implements Accompanyin
     }
 
     /**
-     * Add clause for scope on a query, based on no
+     * Add clause for scope on a query, based on no.
      *
-     * @param QueryBuilder $qb where the accompanying period have the `ap` alias
+     * @param QueryBuilder $qb                       where the accompanying period have the `ap` alias
      * @param array<Scope> $scopesCanSee
      * @param array<Scope> $scopesCanSeeConfidential
      */
@@ -194,7 +192,7 @@ final readonly class AccompanyingPeriodACLAwareRepository implements Accompanyin
             // - and the parcours is not confidential OR the user is the referrer OR the user can see the confidential course
 
             $orOnScope = $qb->expr()->orX(
-                $qb->expr()->isMemberOf(':scope_' . $key, 'ap.scopes'),
+                $qb->expr()->isMemberOf(':scope_'.$key, 'ap.scopes'),
                 $qb->expr()->eq('ap.user', ':user')
             );
 
@@ -211,7 +209,7 @@ final readonly class AccompanyingPeriodACLAwareRepository implements Accompanyin
                 );
                 $orx->add($andXOnScope);
             }
-            $qb->setParameter('scope_' . $key, $scope);
+            $qb->setParameter('scope_'.$key, $scope);
         }
         $qb->andWhere($orx);
 
@@ -232,7 +230,7 @@ final readonly class AccompanyingPeriodACLAwareRepository implements Accompanyin
         return $centerOnScopes;
     }
 
-    public function findByUnDispatched(array $jobs, array $services, array $administrativeAdministrativeLocations, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findByUnDispatched(array $jobs, array $services, array $administrativeAdministrativeLocations, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         $qb = $this->buildQueryUnDispatched($jobs, $services, $administrativeAdministrativeLocations);
         $qb->select('ap');
@@ -258,13 +256,13 @@ final readonly class AccompanyingPeriodACLAwareRepository implements Accompanyin
 
     /**
      * @param list<array{center: Center, scopeOnRole: list<Scope>, scopeCanSeeConfidential: list<Scope>}> $centerScopes
-     * @param bool $allowNoCenter if true, will allow to see the periods linked to person which does not have any center. Very few edge case when some Person are not associated to a center.
+     * @param bool                                                                                        $allowNoCenter if true, will allow to see the periods linked to person which does not have any center. Very few edge case when some Person are not associated to a center.
      */
     public function addACLMultiCenterOnQuery(QueryBuilder $qb, array $centerScopes, bool $allowNoCenter = false): QueryBuilder
     {
         $user = $this->security->getUser();
 
-        if (0 === count($centerScopes) || !$user instanceof User) {
+        if (0 === \count($centerScopes) || !$user instanceof User) {
             return $qb->andWhere("'FALSE' = 'TRUE'");
         }
 
@@ -274,27 +272,27 @@ final readonly class AccompanyingPeriodACLAwareRepository implements Accompanyin
         foreach ($centerScopes as ['center' => $center, 'scopeOnRole' => $scopes, 'scopeCanSeeConfidential' => $scopesCanSeeConfidential]) {
             $and = $qb->expr()->andX(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . " part_{$idx} " .
-                    "JOIN part_{$idx}.person p{$idx} LEFT JOIN p{$idx}.centerCurrent centerCurrent_{$idx} " .
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class." part_{$idx} ".
+                    "JOIN part_{$idx}.person p{$idx} LEFT JOIN p{$idx}.centerCurrent centerCurrent_{$idx} ".
                     "WHERE part_{$idx}.accompanyingPeriod = ap.id AND (centerCurrent_{$idx}.center = :center_{$idx}"
-                    . ($allowNoCenter ? " OR centerCurrent_{$idx}.id IS NULL)" : ")")
+                    .($allowNoCenter ? " OR centerCurrent_{$idx}.id IS NULL)" : ')')
                 )
             );
-            $qb->setParameter('center_' . $idx, $center);
+            $qb->setParameter('center_'.$idx, $center);
 
             $orScopeInsideCenter = $qb->expr()->orX(
                 // even if the scope is not in one authorized, the user can see the course if it is in DRAFT state
                 $qb->expr()->eq('ap.step', ':draft')
             );
 
-            $idx++;
+            ++$idx;
             foreach ($scopes as $scope) {
                 // for each scope:
                 // - either the user is the referrer of the course
                 // - or the accompanying course is one of the reachable scopes
                 // - and the parcours is not confidential OR the user is the referrer OR the user can see the confidential course
                 $orOnScope = $qb->expr()->orX(
-                    $qb->expr()->isMemberOf(':scope_' . $idx, 'ap.scopes'),
+                    $qb->expr()->isMemberOf(':scope_'.$idx, 'ap.scopes'),
                     $qb->expr()->eq('ap.user', ':user_executing')
                 );
                 $qb->setParameter('user_executing', $user);
@@ -312,23 +310,23 @@ final readonly class AccompanyingPeriodACLAwareRepository implements Accompanyin
                     );
                     $orScopeInsideCenter->add($andXOnScope);
                 }
-                $qb->setParameter('scope_' . $idx, $scope);
+                $qb->setParameter('scope_'.$idx, $scope);
 
-                $idx++;
+                ++$idx;
             }
 
             $and->add($orScopeInsideCenter);
             $orX->add($and);
 
-            $idx++;
+            ++$idx;
         }
 
         return $qb->andWhere($orX);
     }
 
     /**
-     * @param array|UserJob[] $jobs
-     * @param array|Scope[] $services
+     * @param array|UserJob[]  $jobs
+     * @param array|Scope[]    $services
      * @param array|Location[] $locations
      */
     public function buildQueryUnDispatched(array $jobs, array $services, array $locations): QueryBuilder
@@ -345,22 +343,22 @@ final readonly class AccompanyingPeriodACLAwareRepository implements Accompanyin
             ->setParameter('draft', AccompanyingPeriod::STEP_DRAFT)
             ->setParameter('closed', AccompanyingPeriod::STEP_CLOSED);
 
-        if (0 < count($jobs)) {
+        if (0 < \count($jobs)) {
             $qb->andWhere($qb->expr()->in('ap.job', ':jobs'))
                 ->setParameter('jobs', $jobs);
         }
 
-        if (0 < count($locations)) {
+        if (0 < \count($locations)) {
             $qb->andWhere($qb->expr()->in('ap.administrativeLocation', ':locations'))
                 ->setParameter('locations', $locations);
         }
 
-        if (0 < count($services)) {
+        if (0 < \count($services)) {
             $or = $qb->expr()->orX();
 
             foreach ($services as $key => $service) {
-                $or->add($qb->expr()->isMemberOf(':scopef_' . $key, 'ap.scopes'));
-                $qb->setParameter('scopef_' . $key, $service);
+                $or->add($qb->expr()->isMemberOf(':scopef_'.$key, 'ap.scopes'));
+                $qb->setParameter('scopef_'.$key, $service);
             }
             $qb->andWhere($or);
         }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
index 5e5f62ca3..645a4d996 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
@@ -22,8 +22,8 @@ use Chill\PersonBundle\Entity\Person;
 interface AccompanyingPeriodACLAwareRepositoryInterface
 {
     /**
-     * @param array|UserJob[] $jobs
-     * @param array|Scope[] $services
+     * @param array|UserJob[]  $jobs
+     * @param array|Scope[]    $services
      * @param array|Location[] $administrativeLocations
      */
     public function countByUnDispatched(array $jobs, array $services, array $administrativeLocations): int;
@@ -40,20 +40,22 @@ interface AccompanyingPeriodACLAwareRepositoryInterface
         Person $person,
         string $role,
         ?array $orderBy = [],
-        ?int   $limit = null,
-        ?int   $offset = null
+        int $limit = null,
+        int $offset = null
     ): array;
 
     /**
-     * @param array|UserJob[] $jobs if empty, does not take this argument into account
-     * @param array|Scope[] $services if empty, does not take this argument into account
+     * @param array|UserJob[]  $jobs                    if empty, does not take this argument into account
+     * @param array|Scope[]    $services                if empty, does not take this argument into account
      * @param array|Location[] $administrativeLocations
+     *
      * @return list<AccompanyingPeriod>
      */
-    public function findByUnDispatched(array $jobs, array $services, array $administrativeLocations, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findByUnDispatched(array $jobs, array $services, array $administrativeLocations, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     /**
      * @param array|PostalCode[] $postalCodes
+     *
      * @return list<AccompanyingPeriod>
      */
     public function findByUserAndPostalCodesOpenedAccompanyingPeriod(?User $user, array $postalCodes, array $orderBy = [], int $limit = 0, int $offset = 50): array;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
index 36af2c763..449df5160 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Repository;
 
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
@@ -33,14 +32,14 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         return $this->repository->count($criteria);
     }
 
-    public function countByRecentUserHistory(User $user, DateTimeImmutable $since): int
+    public function countByRecentUserHistory(User $user, \DateTimeImmutable $since): int
     {
         $qb = $this->buildQueryByRecentUserHistory($user, $since);
 
         return $qb->select('count(a)')->getQuery()->getSingleScalarResult();
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -58,7 +57,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -66,7 +65,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository
     /**
      * @return array|AccompanyingPeriod[]
      */
-    public function findByRecentUserHistory(User $user, DateTimeImmutable $since, ?int $limit = 20, ?int $offset = 0): array
+    public function findByRecentUserHistory(User $user, \DateTimeImmutable $since, ?int $limit = 20, ?int $offset = 0): array
     {
         $qb = $this->buildQueryByRecentUserHistory($user, $since);
 
@@ -98,14 +97,14 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         return AccompanyingPeriod::class;
     }
 
-    private function buildQueryByRecentUserHistory(User $user, DateTimeImmutable $since): QueryBuilder
+    private function buildQueryByRecentUserHistory(User $user, \DateTimeImmutable $since): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('a');
 
         $qb
             ->join('a.userHistories', 'userHistory')
             ->where($qb->expr()->eq('a.user', ':user'))
-            ->andWhere($qb->expr()->neq('a.step', "'" . AccompanyingPeriod::STEP_DRAFT . "'"))
+            ->andWhere($qb->expr()->neq('a.step', "'".AccompanyingPeriod::STEP_DRAFT."'"))
             ->andWhere($qb->expr()->gte('userHistory.startDate', ':since'))
             ->andWhere($qb->expr()->isNull('userHistory.endDate'))
             ->setParameter('user', $user)
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php
index b27d95015..26121ffdc 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\AddressReference;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Security\Core\Security;
@@ -37,7 +36,7 @@ final readonly class HouseholdACLAwareRepository implements HouseholdACLAwareRep
         }
 
         $qb
-            ->join($alias . '.members', 'members')
+            ->join($alias.'.members', 'members')
             ->join('members.person', 'person')
             ->join('person.centerCurrent', 'person_center_current')
             ->andWhere(
@@ -68,7 +67,7 @@ final readonly class HouseholdACLAwareRepository implements HouseholdACLAwareRep
                     )
                 )
             )
-            ->setParameter('today', new DateTime('today'));
+            ->setParameter('today', new \DateTime('today'));
 
         return $qb;
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
index 5a0dee15d..bf9ffb1ff 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
@@ -49,7 +49,7 @@ final class HouseholdCompositionRepository implements HouseholdCompositionReposi
      *
      * @return array|object[]|HouseholdComposition[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -57,7 +57,7 @@ final class HouseholdCompositionRepository implements HouseholdCompositionReposi
     /**
      * @return array|HouseholdComposition[]|object[]
      */
-    public function findByHousehold(Household $household, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findByHousehold(Household $household, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->findBy(['household' => $household], $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php
index 84c62392b..3fc4bb46f 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php
@@ -32,12 +32,12 @@ interface HouseholdCompositionRepositoryInterface extends ObjectRepository
      *
      * @return array|object[]|HouseholdComposition[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array;
 
     /**
      * @return array|HouseholdComposition[]|object[]
      */
-    public function findByHousehold(Household $household, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findByHousehold(Household $household, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?HouseholdComposition;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
index 1e2c4a67f..d13b17fe4 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
@@ -46,12 +46,12 @@ final class HouseholdCompositionTypeRepository implements HouseholdCompositionTy
     }
 
     /**
-     * @param $limit
-     * @param $offset
+     * @param mixed|null $limit
+     * @param mixed|null $offset
      *
      * @return array|HouseholdCompositionType[]|object[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepositoryInterface.php
index 5fede423a..4041430d8 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepositoryInterface.php
@@ -29,12 +29,12 @@ interface HouseholdCompositionTypeRepositoryInterface extends ObjectRepository
     public function findAllActive(): array;
 
     /**
-     * @param $limit
-     * @param $offset
+     * @param mixed|null $limit
+     * @param mixed|null $offset
      *
      * @return array|HouseholdCompositionType[]|object[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array;
 
     public function findOneBy(array $criteria): ?HouseholdCompositionType;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
index 95fbda3ee..5fa3f22de 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
@@ -18,8 +18,6 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-use function strtr;
-
 final class HouseholdRepository implements ObjectRepository
 {
     private const SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION = <<<'SQL'
@@ -67,7 +65,7 @@ final class HouseholdRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -94,12 +92,12 @@ final class HouseholdRepository implements ObjectRepository
 
         if ($isCount) {
             $rsm->addScalarResult('count', 'count');
-            $sql = strtr(self::SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION, [
+            $sql = \strtr(self::SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION, [
                 '{select}' => 'COUNT(households.*) AS count',
                 '{limits}' => '',
             ]);
         } else {
-            $sql = strtr(self::SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION, [
+            $sql = \strtr(self::SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION, [
                 '{select}' => $rsm->generateSelectClause(['h' => 'households']),
                 '{limits}' => "OFFSET {$offset} LIMIT {$limit}",
             ]);
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
index ebcfabe4f..58c89fb7b 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
@@ -44,12 +44,12 @@ final class PersonHouseholdAddressRepository implements ObjectRepository
      *
      * @return PersonHouseholdAddress[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?PersonHouseholdAddress
+    public function findOneBy(array $criteria, array $orderBy = null): ?PersonHouseholdAddress
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
index 99e7338f9..b2fc2b2d1 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
@@ -12,8 +12,8 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\Position;
-//use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-//use Doctrine\Persistence\ManagerRegistry;
+// use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+// use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
@@ -28,8 +28,6 @@ final class PositionRepository implements ObjectRepository
     }
 
     /**
-     * @param mixed $id
-     *
      * @return Position
      */
     public function find($id)
@@ -51,7 +49,7 @@ final class PositionRepository implements ObjectRepository
      *
      * @return Position[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php
index 3324ee444..b2409eace 100644
--- a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php
@@ -34,7 +34,7 @@ class MaritalStatusRepository implements MaritalStatusRepositoryInterface
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepositoryInterface.php
index 1f51060e9..13be6842e 100644
--- a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepositoryInterface.php
@@ -19,7 +19,7 @@ interface MaritalStatusRepositoryInterface
 
     public function findAll(): array;
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array;
 
     public function findOneBy(array $criteria): ?MaritalStatus;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php b/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php
index b6d80a721..bf8ec9344 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php
@@ -40,7 +40,7 @@ class PersonCenterHistoryRepository implements PersonCenterHistoryInterface
     /**
      * @return array|PersonCenterHistory[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
index fda903968..0b6b96339 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -18,35 +18,26 @@ use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use DateTimeInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\Query;
 use Symfony\Component\Security\Core\Security;
 
-use function array_fill;
-use function array_map;
-use function array_merge;
-use function array_push;
-use function count;
-use function explode;
-use function implode;
-
 final readonly class PersonACLAwareRepository implements PersonACLAwareRepositoryInterface
 {
     public function __construct(private Security $security, private EntityManagerInterface $em, private CountryRepository $countryRepository, private AuthorizationHelperInterface $authorizationHelper) {}
 
     public function buildAuthorizedQuery(
-        ?string $default = null,
-        ?string $firstname = null,
-        ?string $lastname = null,
-        ?DateTimeInterface $birthdate = null,
-        ?DateTimeInterface $birthdateBefore = null,
-        ?DateTimeInterface $birthdateAfter = null,
-        ?string $gender = null,
-        ?string $countryCode = null,
-        ?string $phonenumber = null,
-        ?string $city = null
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        \DateTimeInterface $birthdate = null,
+        \DateTimeInterface $birthdateBefore = null,
+        \DateTimeInterface $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null,
+        string $phonenumber = null,
+        string $city = null
     ): SearchApiQuery {
         $query = $this->createSearchQuery(
             $default,
@@ -65,16 +56,16 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
     }
 
     public function countBySearchCriteria(
-        ?string $default = null,
-        ?string $firstname = null,
-        ?string $lastname = null,
-        ?DateTimeInterface $birthdate = null,
-        ?DateTimeInterface $birthdateBefore = null,
-        ?DateTimeInterface $birthdateAfter = null,
-        ?string $gender = null,
-        ?string $countryCode = null,
-        ?string $phonenumber = null,
-        ?string $city = null
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        \DateTimeInterface $birthdate = null,
+        \DateTimeInterface $birthdateBefore = null,
+        \DateTimeInterface $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null,
+        string $phonenumber = null,
+        string $city = null
     ): int {
         $query = $this->buildAuthorizedQuery(
             $default,
@@ -99,16 +90,16 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
      * @throws ParsingException
      */
     public function createSearchQuery(
-        ?string $default = null,
-        ?string $firstname = null,
-        ?string $lastname = null,
-        ?DateTimeInterface $birthdate = null,
-        ?DateTimeInterface $birthdateBefore = null,
-        ?DateTimeInterface $birthdateAfter = null,
-        ?string $gender = null,
-        ?string $countryCode = null,
-        ?string $phonenumber = null,
-        ?string $city = null
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        \DateTimeInterface $birthdate = null,
+        \DateTimeInterface $birthdateBefore = null,
+        \DateTimeInterface $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null,
+        string $phonenumber = null,
+        string $city = null
     ): SearchApiQuery {
         $query = new SearchApiQuery();
         $query
@@ -120,25 +111,25 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
         $andWhereSearchClauseArgs = [];
 
         if ('' !== trim($default)) {
-            foreach (explode(' ', $default) as $str) {
+            foreach (\explode(' ', $default) as $str) {
                 if ('' === trim($str)) {
                     continue;
                 }
                 $pertinence[] =
-                    'STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), person.fullnamecanonical) + ' .
-                    "(person.fullnamecanonical LIKE '%' || LOWER(UNACCENT(?)) || '%')::int + " .
-                    "(EXISTS (SELECT 1 FROM unnest(string_to_array(fullnamecanonical, ' ')) AS t WHERE starts_with(t, UNACCENT(LOWER(?)))))::int + " .
+                    'STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), person.fullnamecanonical) + '.
+                    "(person.fullnamecanonical LIKE '%' || LOWER(UNACCENT(?)) || '%')::int + ".
+                    "(EXISTS (SELECT 1 FROM unnest(string_to_array(fullnamecanonical, ' ')) AS t WHERE starts_with(t, UNACCENT(LOWER(?)))))::int + ".
                     '(starts_with(LOWER(UNACCENT(lastname)), UNACCENT(LOWER(?))))::int';
-                array_push($pertinenceArgs, $str, $str, $str, $str);
+                \array_push($pertinenceArgs, $str, $str, $str, $str);
 
                 $andWhereSearchClause[] =
-                    '(LOWER(UNACCENT(?)) <<% person.fullnamecanonical OR ' .
+                    '(LOWER(UNACCENT(?)) <<% person.fullnamecanonical OR '.
                     "person.fullnamecanonical LIKE '%' || LOWER(UNACCENT(?)) || '%' )";
-                array_push($andWhereSearchClauseArgs, $str, $str);
+                \array_push($andWhereSearchClauseArgs, $str, $str);
             }
 
             $query->andWhereClause(
-                implode(' AND ', $andWhereSearchClause),
+                \implode(' AND ', $andWhereSearchClause),
                 $andWhereSearchClauseArgs
             );
         } else {
@@ -146,7 +137,7 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
             $pertinenceArgs = [];
         }
         $query
-            ->setSelectPertinence(implode(' + ', $pertinence), $pertinenceArgs);
+            ->setSelectPertinence(\implode(' + ', $pertinence), $pertinenceArgs);
 
         if (null !== $birthdate) {
             $query->andWhereClause(
@@ -188,16 +179,16 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
                 "person.phonenumber LIKE '%' || ? || '%' OR person.mobilenumber LIKE '%' || ? || '%' OR pp.phonenumber LIKE '%' || ? || '%'",
                 [$phonenumber, $phonenumber, $phonenumber]
             );
-            $query->setFromClause($query->getFromClause() . ' LEFT JOIN chill_person_phone pp ON pp.person_id = person.id');
+            $query->setFromClause($query->getFromClause().' LEFT JOIN chill_person_phone pp ON pp.person_id = person.id');
         }
 
         if (null !== $city) {
-            $query->setFromClause($query->getFromClause() . ' ' .
-                'JOIN view_chill_person_current_address vcpca ON vcpca.person_id = person.id ' .
-                'JOIN chill_main_address cma ON vcpca.address_id = cma.id ' .
+            $query->setFromClause($query->getFromClause().' '.
+                'JOIN view_chill_person_current_address vcpca ON vcpca.person_id = person.id '.
+                'JOIN chill_main_address cma ON vcpca.address_id = cma.id '.
                 'JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id');
 
-            foreach (explode(' ', $city) as $cityStr) {
+            foreach (\explode(' ', $city) as $cityStr) {
                 $query->andWhereClause(
                     "(UNACCENT(LOWER(cmpc.label)) LIKE '%' || UNACCENT(LOWER(?)) || '%' OR cmpc.code LIKE '%' || UNACCENT(LOWER(?)) || '%')",
                     [$cityStr, $city]
@@ -206,7 +197,7 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
         }
 
         if (null !== $countryCode) {
-            $query->setFromClause($query->getFromClause() . ' JOIN country ON person.nationality_id = country.id');
+            $query->setFromClause($query->getFromClause().' JOIN country ON person.nationality_id = country.id');
             $query->andWhereClause('country.countrycode = UPPER(?)', [$countryCode]);
         }
 
@@ -239,33 +230,33 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
         $query->addSelectClause($rsm->generateSelectClause());
 
         $nql = $this->em->createNativeQuery(
-            $query->buildQuery() . ' ORDER BY pertinence DESC OFFSET ? LIMIT ?',
+            $query->buildQuery().' ORDER BY pertinence DESC OFFSET ? LIMIT ?',
             $rsm
-        )->setParameters(array_merge($query->buildParameters(), [$start, $limit]));
+        )->setParameters(\array_merge($query->buildParameters(), [$start, $limit]));
 
         return $nql->getResult();
     }
 
     /**
+     * @return array|Person[]
+     *
      * @throws NonUniqueResultException
      * @throws ParsingException
-     *
-     * @return array|Person[]
      */
     public function findBySearchCriteria(
         int $start,
         int $limit,
         bool $simplify = false,
-        ?string $default = null,
-        ?string $firstname = null,
-        ?string $lastname = null,
-        ?DateTimeInterface $birthdate = null,
-        ?DateTimeInterface $birthdateBefore = null,
-        ?DateTimeInterface $birthdateAfter = null,
-        ?string $gender = null,
-        ?string $countryCode = null,
-        ?string $phonenumber = null,
-        ?string $city = null
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        \DateTimeInterface $birthdate = null,
+        \DateTimeInterface $birthdateBefore = null,
+        \DateTimeInterface $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null,
+        string $phonenumber = null,
+        string $city = null
     ): array {
         $query = $this->buildAuthorizedQuery(
             $default,
@@ -293,18 +284,18 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
         }
 
         return $query
-            ->setFromClause($query->getFromClause() . ' JOIN view_chill_person_person_center_history_current vcppchc ON vcppchc.person_id = person.id', $query->getFromParams())
+            ->setFromClause($query->getFromClause().' JOIN view_chill_person_person_center_history_current vcppchc ON vcppchc.person_id = person.id', $query->getFromParams())
             ->andWhereClause(
                 strtr(
                     'vcppchc.center_id IN ({{ center_ids }})',
                     [
-                        '{{ center_ids }}' => implode(
+                        '{{ center_ids }}' => \implode(
                             ', ',
-                            array_fill(0, count($authorizedCenters), '?')
+                            \array_fill(0, \count($authorizedCenters), '?')
                         ),
                     ]
                 ),
-                array_map(static fn (Center $c) => $c->getId(), $authorizedCenters)
+                \array_map(static fn (Center $c) => $c->getId(), $authorizedCenters)
             );
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
index 1e35f03f3..b9f62b89f 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
@@ -13,34 +13,33 @@ namespace Chill\PersonBundle\Repository;
 
 use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeInterface;
 
 interface PersonACLAwareRepositoryInterface
 {
     public function buildAuthorizedQuery(
-        ?string $default = null,
-        ?string $firstname = null,
-        ?string $lastname = null,
-        ?DateTimeInterface $birthdate = null,
-        ?DateTimeInterface $birthdateBefore = null,
-        ?DateTimeInterface $birthdateAfter = null,
-        ?string $gender = null,
-        ?string $countryCode = null,
-        ?string $phonenumber = null,
-        ?string $city = null
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        \DateTimeInterface $birthdate = null,
+        \DateTimeInterface $birthdateBefore = null,
+        \DateTimeInterface $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null,
+        string $phonenumber = null,
+        string $city = null
     ): SearchApiQuery;
 
     public function countBySearchCriteria(
-        ?string $default = null,
-        ?string $firstname = null,
-        ?string $lastname = null,
-        ?DateTimeInterface $birthdate = null,
-        ?DateTimeInterface $birthdateBefore = null,
-        ?DateTimeInterface $birthdateAfter = null,
-        ?string $gender = null,
-        ?string $countryCode = null,
-        ?string $phonenumber = null,
-        ?string $city = null
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        \DateTimeInterface $birthdate = null,
+        \DateTimeInterface $birthdateBefore = null,
+        \DateTimeInterface $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null,
+        string $phonenumber = null,
+        string $city = null
     );
 
     /**
@@ -50,15 +49,15 @@ interface PersonACLAwareRepositoryInterface
         int $start,
         int $limit,
         bool $simplify = false,
-        ?string $default = null,
-        ?string $firstname = null,
-        ?string $lastname = null,
-        ?DateTimeInterface $birthdate = null,
-        ?DateTimeInterface $birthdateBefore = null,
-        ?DateTimeInterface $birthdateAfter = null,
-        ?string $gender = null,
-        ?string $countryCode = null,
-        ?string $phonenumber = null,
-        ?string $city = null
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        \DateTimeInterface $birthdate = null,
+        \DateTimeInterface $birthdateBefore = null,
+        \DateTimeInterface $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null,
+        string $phonenumber = null,
+        string $city = null
     ): array;
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
index 71ae7b5a6..0d951e3bd 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
@@ -16,11 +16,6 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
-use Exception;
-
-use function count;
-use function in_array;
-use function str_replace;
 
 class PersonRepository implements ObjectRepository
 {
@@ -32,8 +27,6 @@ class PersonRepository implements ObjectRepository
     }
 
     /**
-     * @param $centers
-     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -51,7 +44,7 @@ class PersonRepository implements ObjectRepository
         return $qb->getQuery()->getSingleScalarResult();
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -66,7 +59,7 @@ class PersonRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -77,13 +70,7 @@ class PersonRepository implements ObjectRepository
     }
 
     /**
-     * @param $centers
-     * @param $firstResult
-     * @param $maxResults
-     *
-     * @throws Exception
-     *
-     * @return mixed
+     * @throws \Exception
      */
     public function findByPhone(
         string $phonenumber,
@@ -116,43 +103,40 @@ class PersonRepository implements ObjectRepository
 
     private function addByCenters(QueryBuilder $qb, array $centers): void
     {
-        if (count($centers) > 0) {
+        if (\count($centers) > 0) {
             $qb->andWhere($qb->expr()->in('p.center', ':centers'));
             $qb->setParameter('centers', $centers);
         }
     }
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     private function addPhoneNumber(QueryBuilder $qb, string $phonenumber, array $only): void
     {
-        if (count($only) === 0) {
-            throw new Exception('No array field to search');
+        if (0 === \count($only)) {
+            throw new \Exception('No array field to search');
         }
 
         $phonenumber = $this->parsePhoneNumber($phonenumber);
 
         $orX = $qb->expr()->orX();
 
-        if (in_array('mobile', $only, true)) {
+        if (\in_array('mobile', $only, true)) {
             $orX->add($qb->expr()->like("REPLACE(p.mobilenumber, ' ', '')", ':phonenumber'));
         }
 
-        if (in_array('phone', $only, true)) {
+        if (\in_array('phone', $only, true)) {
             $orX->add($qb->expr()->like("REPLACE(p.phonenumber, ' ', '')", ':phonenumber'));
         }
 
         $qb->andWhere($orX);
 
-        $qb->setParameter('phonenumber', '%' . $phonenumber . '%');
+        $qb->setParameter('phonenumber', '%'.$phonenumber.'%');
     }
 
-    /**
-     * @param $phonenumber
-     */
     private function parsePhoneNumber(string $phonenumber): string
     {
-        return str_replace(' ', '', $phonenumber);
+        return \str_replace(' ', '', $phonenumber);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
index 9280ade69..fcdb2d73b 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
@@ -44,7 +44,7 @@ final class PersonResourceRepository implements ObjectRepository
      *
      * @return PersonResource[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php
index d3fe813dc..d66d14572 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php
@@ -35,7 +35,7 @@ class RelationRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php
index 932b872c5..26ae266d8 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php
@@ -48,7 +48,7 @@ class RelationshipRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
index 5f75d537b..a866d5eec 100644
--- a/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\ResidentialAddress;
-use DateTimeImmutable;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\QueryBuilder;
@@ -42,9 +41,9 @@ class ResidentialAddressRepository extends ServiceEntityRepository
             ->getSingleScalarResult();
     }
 
-    public function buildQueryFindCurrentResidentialAddresses(Person $person, ?DateTimeImmutable $at = null): QueryBuilder
+    public function buildQueryFindCurrentResidentialAddresses(Person $person, \DateTimeImmutable $at = null): QueryBuilder
     {
-        $date = $at ?? new DateTimeImmutable('today');
+        $date = $at ?? new \DateTimeImmutable('today');
         $qb = $this->createQueryBuilder('ra');
 
         $dateFilter = $qb->expr()->andX(
@@ -67,7 +66,7 @@ class ResidentialAddressRepository extends ServiceEntityRepository
     /**
      * @return array|ResidentialAddress[]|null
      */
-    public function findCurrentResidentialAddressByPerson(Person $person, ?DateTimeImmutable $at = null): array
+    public function findCurrentResidentialAddressByPerson(Person $person, \DateTimeImmutable $at = null): array
     {
         return $this->buildQueryFindCurrentResidentialAddresses($person, $at)
             ->select('ra')
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
index a7b739f7d..8391132f1 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
@@ -48,12 +48,12 @@ final class EvaluationRepository implements EvaluationRepositoryInterface
      *
      * @return array<int, Evaluation>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Evaluation
+    public function findOneBy(array $criteria, array $orderBy = null): ?Evaluation
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepositoryInterface.php
index aa1de34eb..cba57efe0 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepositoryInterface.php
@@ -34,9 +34,9 @@ interface EvaluationRepositoryInterface extends ObjectRepository
      *
      * @return array<int, Evaluation>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array;
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Evaluation;
+    public function findOneBy(array $criteria, array $orderBy = null): ?Evaluation;
 
     /**
      * @return class-string
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
index a798c8388..8a2831996 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
@@ -57,7 +56,7 @@ final class GoalRepository implements ObjectRepository
      *
      * @return array<int, Goal>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -65,7 +64,7 @@ final class GoalRepository implements ObjectRepository
     /**
      * @return Goal[]
      */
-    public function findBySocialActionWithDescendants(SocialAction $action, array $orderBy = [], ?int $limit = null, ?int $offset = null): array
+    public function findBySocialActionWithDescendants(SocialAction $action, array $orderBy = [], int $limit = null, int $offset = null): array
     {
         $qb = $this->buildQueryBySocialActionWithDescendants($action);
         $qb->select('g');
@@ -76,10 +75,10 @@ final class GoalRepository implements ObjectRepository
                 $qb->expr()->gt('g.desactivationDate', ':now')
             )
         )
-            ->setParameter('now', new DateTime('now'));
+            ->setParameter('now', new \DateTime('now'));
 
         foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('g.' . $sort, $order);
+            $qb->addOrderBy('g.'.$sort, $order);
         }
 
         return $qb
@@ -89,7 +88,7 @@ final class GoalRepository implements ObjectRepository
             ->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Goal
+    public function findOneBy(array $criteria, array $orderBy = null): ?Goal
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
index 327f396db..8b8fbfc2b 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
@@ -67,7 +67,7 @@ final class ResultRepository implements ObjectRepository
      *
      * @return array<int, Result>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -75,13 +75,13 @@ final class ResultRepository implements ObjectRepository
     /**
      * @return array<Result>
      */
-    public function findByGoal(Goal $goal, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findByGoal(Goal $goal, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         $qb = $this->buildQueryByGoal($goal);
 
         if (null !== $orderBy) {
             foreach ($orderBy as $sort => $order) {
-                $qb->addOrderBy('r.' . $sort, $order);
+                $qb->addOrderBy('r.'.$sort, $order);
             }
         }
 
@@ -96,13 +96,13 @@ final class ResultRepository implements ObjectRepository
     /**
      * @return Result[]
      */
-    public function findBySocialActionWithDescendants(SocialAction $action, array $orderBy = [], ?int $limit = null, ?int $offset = null): array
+    public function findBySocialActionWithDescendants(SocialAction $action, array $orderBy = [], int $limit = null, int $offset = null): array
     {
         $qb = $this->buildQueryBySocialActionWithDescendants($action);
         $qb->select('r');
 
         foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('r.' . $sort, $order);
+            $qb->addOrderBy('r.'.$sort, $order);
         }
 
         return $qb
@@ -112,7 +112,7 @@ final class ResultRepository implements ObjectRepository
             ->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Result
+    public function findOneBy(array $criteria, array $orderBy = null): ?Result
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
index b4df922a1..2fc3b35df 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
@@ -27,7 +26,7 @@ final class SocialActionRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(SocialAction::class);
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -59,12 +58,12 @@ final class SocialActionRepository implements ObjectRepository
      *
      * @return array<int, SocialAction>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?SocialAction
+    public function findOneBy(array $criteria, array $orderBy = null): ?SocialAction
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
@@ -84,7 +83,7 @@ final class SocialActionRepository implements ObjectRepository
         $qb->where('sa.desactivationDate is null')
             ->orWhere('sa.desactivationDate > :now')
             ->orderBy('sa.ordering', 'ASC')
-            ->setParameter('now', new DateTime('now'));
+            ->setParameter('now', new \DateTime('now'));
 
         return $qb;
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
index f645a4ac4..d3e6fa10f 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
@@ -54,12 +53,12 @@ final class SocialIssueRepository implements ObjectRepository
      *
      * @return array<int, SocialIssue>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?SocialIssue
+    public function findOneBy(array $criteria, array $orderBy = null): ?SocialIssue
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
@@ -79,7 +78,7 @@ final class SocialIssueRepository implements ObjectRepository
         $qb->where('si.desactivationDate is null')
             ->orWhere('si.desactivationDate > :now')
             ->orderBy('si.ordering', 'ASC')
-            ->setParameter('now', new DateTime('now'));
+            ->setParameter('now', new \DateTime('now'));
 
         return $qb;
     }
diff --git a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
index e741704fe..9ca72ecac 100644
--- a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
+++ b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
@@ -23,18 +23,9 @@ use Chill\MainBundle\Search\Utils\ExtractPhonenumberFromPattern;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\Type\GenderType;
 use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
-use DateTime;
-use Exception;
 use libphonenumber\PhoneNumber;
-use libphonenumber\PhoneNumberUtil;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Templating\EngineInterface;
-
-use function array_fill_keys;
-use function array_filter;
-use function array_key_exists;
-use function array_merge;
 
 class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterface
 {
@@ -94,23 +85,23 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
     {
         $string = '@person ';
 
-        $string .= !isset($data['_default']) ? '' : $data['_default'] . ' ';
+        $string .= !isset($data['_default']) ? '' : $data['_default'].' ';
 
         foreach (['firstname', 'lastname', 'gender', 'city'] as $key) {
-            $string .= !isset($data[$key]) ? '' : $key . ':' .
+            $string .= !isset($data[$key]) ? '' : $key.':'.
                 // add quote if contains spaces
-                (str_contains((string) $data[$key], ' ') ? '"' . $data[$key] . '"' : $data[$key])
-                . ' ';
+                (str_contains((string) $data[$key], ' ') ? '"'.$data[$key].'"' : $data[$key])
+                .' ';
         }
 
         foreach (['birthdate', 'birthdate-before', 'birthdate-after'] as $key) {
             $string .= !isset($data[$key]) ?
                 ''
                 :
-                $key . ':' . $data[$key]->format('Y-m-d') . ' ';
+                $key.':'.$data[$key]->format('Y-m-d').' ';
         }
 
-        $string .= !isset($data['phonenumber']) ? '' : 'phonenumber:' . $data['phonenumber']->getNationalNumber();
+        $string .= !isset($data['phonenumber']) ? '' : 'phonenumber:'.$data['phonenumber']->getNationalNumber();
 
         return $string;
     }
@@ -125,24 +116,22 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
 
         // parse dates
         foreach (['birthdate', 'birthdate-before', 'birthdate-after'] as $key) {
-            if (array_key_exists($key, $terms)) {
+            if (\array_key_exists($key, $terms)) {
                 try {
-                    $date = new DateTime($terms[$key]);
-                } catch (Exception $ex) {
-                    throw new ParsingException("The date for {$key} is "
-                              . 'not parsable', 0, $ex);
+                    $date = new \DateTime($terms[$key]);
+                } catch (\Exception $ex) {
+                    throw new ParsingException("The date for {$key} is ".'not parsable', 0, $ex);
                 }
             }
             $data[$key] = $date ?? null;
         }
 
-        if (array_key_exists('phonenumber', $terms)) {
+        if (\array_key_exists('phonenumber', $terms)) {
             try {
                 $phonenumber = new PhoneNumber();
                 $phonenumber->setNationalNumber($terms['phonenumber']);
-            } catch (Exception $ex) {
-                throw new ParsingException("The data for phonenumber is "
-                    . 'not parsable', 0, $ex);
+            } catch (\Exception $ex) {
+                throw new ParsingException('The data for phonenumber is not parsable', 0, $ex);
             }
 
             $data['phonenumber'] = $phonenumber;
@@ -194,7 +183,7 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
                     'persons' => $this->search($terms, $start, $limit, $options),
                     'pattern' => $this->recomposePattern(
                         $terms,
-                        array_filter(self::POSSIBLE_KEYS, static fn ($item) => '_default' !== $item),
+                        \array_filter(self::POSSIBLE_KEYS, static fn ($item) => '_default' !== $item),
                         $terms['_domain']
                     ),
                     'total' => $total,
@@ -205,9 +194,10 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
                 ]
             );
         }
+
         // format is "json"
         return [
-            'results' => $this->search($terms, $start, $limit, array_merge($options, ['simplify' => true])),
+            'results' => $this->search($terms, $start, $limit, \array_merge($options, ['simplify' => true])),
             'pagination' => [
                 'more' => $paginator->hasNextPage(),
             ],
@@ -232,32 +222,29 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
             'nationality' => $countryCode,
             'phonenumber' => $phonenumber,
             'city' => $city,
-        ] = $terms + array_fill_keys(self::POSSIBLE_KEYS, null);
+        ] = $terms + \array_fill_keys(self::POSSIBLE_KEYS, null);
 
         if (null !== $birthdate) {
             try {
-                $birthdate = new DateTime($birthdate);
-            } catch (Exception $e) {
-                throw new ParsingException('The date is '
-                    . 'not parsable', 0, $e);
+                $birthdate = new \DateTime($birthdate);
+            } catch (\Exception $e) {
+                throw new ParsingException('The date is not parsable', 0, $e);
             }
         }
 
         if (null !== $birthdateBefore) {
             try {
-                $birthdateBefore = new DateTime($birthdateBefore);
-            } catch (Exception $e) {
-                throw new ParsingException('The date is '
-                    . 'not parsable', 0, $e);
+                $birthdateBefore = new \DateTime($birthdateBefore);
+            } catch (\Exception $e) {
+                throw new ParsingException('The date is not parsable', 0, $e);
             }
         }
 
         if (null !== $birthdateAfter) {
             try {
-                $birthdateAfter = new DateTime($birthdateAfter);
-            } catch (Exception $e) {
-                throw new ParsingException('The date is '
-                    . 'not parsable', 0, $e);
+                $birthdateAfter = new \DateTime($birthdateAfter);
+            } catch (\Exception $e) {
+                throw new ParsingException('The date is not parsable', 0, $e);
             }
         }
 
@@ -292,32 +279,29 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
             'nationality' => $countryCode,
             'phonenumber' => $phonenumber,
             'city' => $city,
-        ] = $terms + array_fill_keys(self::POSSIBLE_KEYS, null);
+        ] = $terms + \array_fill_keys(self::POSSIBLE_KEYS, null);
 
         if (null !== $birthdate) {
             try {
-                $birthdate = new DateTime($birthdate);
-            } catch (Exception $e) {
-                throw new ParsingException('The date is '
-                    . 'not parsable', 0, $e);
+                $birthdate = new \DateTime($birthdate);
+            } catch (\Exception $e) {
+                throw new ParsingException('The date is not parsable', 0, $e);
             }
         }
 
         if (null !== $birthdateBefore) {
             try {
-                $birthdateBefore = new DateTime($birthdateBefore);
-            } catch (Exception $e) {
-                throw new ParsingException('The date is '
-                    . 'not parsable', 0, $e);
+                $birthdateBefore = new \DateTime($birthdateBefore);
+            } catch (\Exception $e) {
+                throw new ParsingException('The date is not parsable', 0, $e);
             }
         }
 
         if (null !== $birthdateAfter) {
             try {
-                $birthdateAfter = new DateTime($birthdateAfter);
-            } catch (Exception $e) {
-                throw new ParsingException('The date is '
-                    . 'not parsable', 0, $e);
+                $birthdateAfter = new \DateTime($birthdateAfter);
+            } catch (\Exception $e) {
+                throw new ParsingException('The date is not parsable', 0, $e);
             }
         }
 
@@ -347,14 +331,14 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
         $terms['_default'] = $phoneResults->getFilteredSubject();
 
         if (
-            $datesResults->hasResult() && (!array_key_exists('birthdate', $terms)
+            $datesResults->hasResult() && (!\array_key_exists('birthdate', $terms)
             || null !== $terms['birthdate'])
         ) {
             $terms['birthdate'] = $datesResults->getFound()[0]->format('Y-m-d');
         }
 
         if (
-            $phoneResults->hasResult() && (!array_key_exists('phonenumber', $terms)
+            $phoneResults->hasResult() && (!\array_key_exists('phonenumber', $terms)
             || null !== $terms['phonenumber'])
         ) {
             $terms['phonenumber'] = $phoneResults->getFound()[0];
diff --git a/src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php b/src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
index 697a438bf..6fdd66a84 100644
--- a/src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
+++ b/src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
@@ -20,10 +20,6 @@ use Chill\PersonBundle\Repository\Household\HouseholdRepository;
 use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Symfony\Component\Security\Core\Security;
 
-use function array_map;
-use function count;
-use function in_array;
-
 class SearchHouseholdApiProvider implements SearchApiInterface
 {
     public function __construct(private readonly HouseholdRepository $householdRepository, private readonly PersonACLAwareRepositoryInterface $personACLAwareRepository, private readonly Security $security, private readonly AuthorizationHelperInterface $authorizationHelper, private readonly ExtractDateFromPattern $extractDateFromPattern, private readonly ExtractPhonenumberFromPattern $extractPhonenumberFromPattern) {}
@@ -35,7 +31,7 @@ class SearchHouseholdApiProvider implements SearchApiInterface
 
     public function prepare(array $metadatas): void
     {
-        $ids = array_map(static fn ($m) => $m['id'], $metadatas);
+        $ids = \array_map(static fn ($m) => $m['id'], $metadatas);
 
         $this->householdRepository->findBy(['id' => $ids]);
     }
@@ -50,12 +46,12 @@ class SearchHouseholdApiProvider implements SearchApiInterface
             $filtered,
             null,
             null,
-            count($datesResult->getFound()) > 0 ? $datesResult->getFound()[0] : null,
+            \count($datesResult->getFound()) > 0 ? $datesResult->getFound()[0] : null,
             null,
             null,
             null,
             null,
-            count($phoneResult->getFound()) > 0 ? $phoneResult->getFound()[0] : null
+            \count($phoneResult->getFound()) > 0 ? $phoneResult->getFound()[0] : null
         );
 
         $previousFrom = $query->getFromClause();
@@ -64,7 +60,7 @@ class SearchHouseholdApiProvider implements SearchApiInterface
         $query
             ->setDistinct(true, 'cpphm.household_id')
             ->setFromClause(
-                $previousFrom . ' '.
+                $previousFrom.' '.
                 'JOIN chill_person_household_members AS cpphm ON cpphm.person_id = person.id',
                 $previousParams
             )
@@ -82,6 +78,6 @@ class SearchHouseholdApiProvider implements SearchApiInterface
 
     public function supportsTypes(string $pattern, array $types, array $parameters): bool
     {
-        return in_array('household', $types, true);
+        return \in_array('household', $types, true);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php b/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
index bc63fca66..8444a41ec 100644
--- a/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
+++ b/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
@@ -20,10 +20,6 @@ use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Symfony\Component\Security\Core\Security;
 
-use function array_map;
-use function count;
-use function in_array;
-
 class SearchPersonApiProvider implements SearchApiInterface
 {
     public function __construct(private readonly PersonRepository $personRepository, private readonly PersonACLAwareRepositoryInterface $personACLAwareRepository, private readonly Security $security, private readonly AuthorizationHelperInterface $authorizationHelper, private readonly ExtractDateFromPattern $extractDateFromPattern, private readonly ExtractPhonenumberFromPattern $extractPhonenumberFromPattern) {}
@@ -35,7 +31,7 @@ class SearchPersonApiProvider implements SearchApiInterface
 
     public function prepare(array $metadatas): void
     {
-        $ids = array_map(static fn ($m) => $m['id'], $metadatas);
+        $ids = \array_map(static fn ($m) => $m['id'], $metadatas);
 
         $this->personRepository->findByIds($ids);
     }
@@ -50,12 +46,12 @@ class SearchPersonApiProvider implements SearchApiInterface
             $filtered,
             null,
             null,
-            count($datesResult->getFound()) > 0 ? $datesResult->getFound()[0] : null,
+            \count($datesResult->getFound()) > 0 ? $datesResult->getFound()[0] : null,
             null,
             null,
             null,
             null,
-            count($phoneResult->getFound()) > 0 ? $phoneResult->getFound()[0] : null
+            \count($phoneResult->getFound()) > 0 ? $phoneResult->getFound()[0] : null
         )
             ->setSelectKey('person')
             ->setSelectJsonbMetadata("jsonb_build_object('id', person.id)");
@@ -68,6 +64,6 @@ class SearchPersonApiProvider implements SearchApiInterface
 
     public function supportsTypes(string $pattern, array $types, array $parameters): bool
     {
-        return in_array('person', $types, true);
+        return \in_array('person', $types, true);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
index 03b46957c..74deb91e1 100644
--- a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
+++ b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
@@ -19,8 +19,6 @@ use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
-use function count;
-
 class SimilarPersonMatcher
 {
     final public const SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL = 'alphabetical';
@@ -96,13 +94,13 @@ class SimilarPersonMatcher
             $qb->setParameter('personBirthdate', $person->getBirthdate());
         }
 
-        if ($person->getId() !== null) {
+        if (null !== $person->getId()) {
             $qb->andWhere($qb->expr()->neq('p.id', ':personId'));
             $qb->setParameter('personId', $person->getId());
 
             $notDuplicatePersons = $this->personNotDuplicateRepository->findNotDuplicatePerson($person);
 
-            if (count($notDuplicatePersons)) {
+            if (\count($notDuplicatePersons)) {
                 $qb->andWhere($qb->expr()->notIn('p.id', ':notDuplicatePersons'));
                 $qb->setParameter('notDuplicatePersons', $notDuplicatePersons);
             }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php
index 0ed4e40d3..3bba4f5c5 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php
@@ -15,7 +15,6 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
-use UnexpectedValueException;
 
 class AccompanyingPeriodCommentVoter extends Voter
 {
@@ -35,7 +34,7 @@ class AccompanyingPeriodCommentVoter extends Voter
         return match ($attribute) {
             self::EDIT => $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod()),
             self::DELETE => $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod()),
-            default => throw new UnexpectedValueException("This attribute {$attribute} is not supported"),
+            default => throw new \UnexpectedValueException("This attribute {$attribute} is not supported"),
         };
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodResourceVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodResourceVoter.php
index 315ae31dc..5750a7b58 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodResourceVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodResourceVoter.php
@@ -15,7 +15,6 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use UnexpectedValueException;
 
 class AccompanyingPeriodResourceVoter extends Voter
 {
@@ -36,7 +35,7 @@ class AccompanyingPeriodResourceVoter extends Voter
                 [AccompanyingPeriodVoter::EDIT],
                 $subject->getAccompanyingPeriod()
             ),
-            default => throw new UnexpectedValueException("attribute not supported: {$attribute}"),
+            default => throw new \UnexpectedValueException("attribute not supported: {$attribute}"),
         };
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
index 1a4b75456..9aadd3d95 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
@@ -23,8 +23,6 @@ use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Security;
 
-use function in_array;
-
 class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
     /**
@@ -103,7 +101,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
     final public const TOGGLE_INTENSITY = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_INTENSITY';
 
     /**
-     * Right to see confidential period even if not referrer
+     * Right to see confidential period even if not referrer.
      */
     final public const SEE_CONFIDENTIAL_ALL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_CONFIDENTIAL';
 
@@ -162,7 +160,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
 
         if ($subject instanceof AccompanyingPeriod) {
             if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
-                if (in_array($attribute, [self::EDIT, self::DELETE], true)) {
+                if (\in_array($attribute, [self::EDIT, self::DELETE], true)) {
                     return false;
                 }
 
@@ -183,7 +181,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
                 return false;
             }
 
-            if (in_array($attribute, [
+            if (\in_array($attribute, [
                 self::SEE, self::SEE_DETAILS, self::EDIT,
             ], true)) {
                 if ($subject->getUser() === $token->getUser()) {
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php
index b4e56aadc..77c131cd9 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php
@@ -15,7 +15,6 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluatio
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use UnexpectedValueException;
 
 /**
  * Voter for AccompanyingPeriodWorkEvaluationDocument.
@@ -35,7 +34,7 @@ class AccompanyingPeriodWorkEvaluationDocumentVoter extends Voter
     }
 
     /**
-     * @param string $attribute
+     * @param string                                   $attribute
      * @param AccompanyingPeriodWorkEvaluationDocument $subject
      *
      * @return bool|void
@@ -48,7 +47,7 @@ class AccompanyingPeriodWorkEvaluationDocumentVoter extends Voter
                 [AccompanyingPeriodWorkEvaluationVoter::SEE],
                 $subject->getAccompanyingPeriodWorkEvaluation()
             ),
-            default => throw new UnexpectedValueException("The attribute {$attribute} is not supported"),
+            default => throw new \UnexpectedValueException("The attribute {$attribute} is not supported"),
         };
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php
index aa7c51470..ce5faca8d 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php
@@ -16,8 +16,6 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluatio
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
-use UnexpectedValueException;
-use function in_array;
 
 class AccompanyingPeriodWorkEvaluationVoter extends Voter implements ChillVoterInterface
 {
@@ -35,11 +33,11 @@ class AccompanyingPeriodWorkEvaluationVoter extends Voter implements ChillVoterI
     protected function supports($attribute, $subject)
     {
         return $subject instanceof AccompanyingPeriodWorkEvaluation
-            && in_array($attribute, self::ALL, true);
+            && \in_array($attribute, self::ALL, true);
     }
 
     /**
-     * @param string $attribute
+     * @param string                           $attribute
      * @param AccompanyingPeriodWorkEvaluation $subject
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
@@ -47,7 +45,7 @@ class AccompanyingPeriodWorkEvaluationVoter extends Voter implements ChillVoterI
         return match ($attribute) {
             self::STATS => $this->security->isGranted(AccompanyingPeriodVoter::STATS, $subject),
             self::SEE => $this->security->isGranted(AccompanyingPeriodWorkVoter::SEE, $subject->getAccompanyingPeriodWork()),
-            default => throw new UnexpectedValueException("attribute {$attribute} is not supported"),
+            default => throw new \UnexpectedValueException("attribute {$attribute} is not supported"),
         };
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
index 69f90fa12..64b25498c 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
@@ -21,9 +21,6 @@ use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
-use UnexpectedValueException;
-use function get_class;
-use function in_array;
 
 class AccompanyingPeriodWorkVoter extends Voter implements ProvideRoleHierarchyInterface, ChillVoterInterface
 {
@@ -81,15 +78,15 @@ class AccompanyingPeriodWorkVoter extends Voter implements ProvideRoleHierarchyI
         return
             (
                 $subject instanceof AccompanyingPeriodWork
-                && in_array($attribute, $this->getRoles(), true)
+                && \in_array($attribute, $this->getRoles(), true)
             ) || (
                 $subject instanceof AccompanyingPeriod
-                && in_array($attribute, [self::SEE, self::CREATE], true)
+                && \in_array($attribute, [self::SEE, self::CREATE], true)
             );
     }
 
     /**
-     * @param string $attribute
+     * @param string                 $attribute
      * @param AccompanyingPeriodWork $subject
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
@@ -98,19 +95,16 @@ class AccompanyingPeriodWorkVoter extends Voter implements ProvideRoleHierarchyI
             return match ($attribute) {
                 self::SEE => $this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $subject->getAccompanyingPeriod()),
                 self::CREATE, self::UPDATE, self::DELETE => $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod()),
-                default => throw new UnexpectedValueException("attribute {$attribute} is not supported"),
+                default => throw new \UnexpectedValueException("attribute {$attribute} is not supported"),
             };
         } elseif ($subject instanceof AccompanyingPeriod) {
             return match ($attribute) {
                 self::SEE => $this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $subject),
                 self::CREATE => $this->security->isGranted(AccompanyingPeriodVoter::CREATE, $subject),
-                default => throw new UnexpectedValueException(sprintf(
-                    "attribute {$attribute} is not supported on instance %s",
-                    AccompanyingPeriod::class
-                )),
+                default => throw new \UnexpectedValueException(sprintf("attribute {$attribute} is not supported on instance %s", AccompanyingPeriod::class)),
             };
         }
 
-        throw new UnexpectedValueException(sprintf("attribute {$attribute} on instance %s is not supported", $subject::class));
+        throw new \UnexpectedValueException(sprintf("attribute {$attribute} on instance %s is not supported", $subject::class));
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
index 7000730a7..798ed853a 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
@@ -21,8 +21,6 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
-use UnexpectedValueException;
-use function in_array;
 
 class HouseholdVoter extends Voter implements ProvideRoleHierarchyInterface, ChillVoterInterface
 {
@@ -71,7 +69,7 @@ class HouseholdVoter extends Voter implements ProvideRoleHierarchyInterface, Chi
     protected function supports($attribute, $subject)
     {
         return ($subject instanceof Household
-            && in_array($attribute, self::ALL, true))
+            && \in_array($attribute, self::ALL, true))
             || $this->helper->supports($attribute, $subject);
     }
 
@@ -81,7 +79,7 @@ class HouseholdVoter extends Voter implements ProvideRoleHierarchyInterface, Chi
             self::SEE => $this->checkAssociatedMembersRole($subject, PersonVoter::SEE),
             self::EDIT => $this->checkAssociatedMembersRole($subject, PersonVoter::UPDATE),
             self::STATS => $this->voteOnAttribute($attribute, $subject, $token),
-            default => throw new UnexpectedValueException('attribute not supported'),
+            default => throw new \UnexpectedValueException('attribute not supported'),
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
index 34be9a559..e266fe0ae 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
@@ -25,7 +25,6 @@ use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Templating\Entity\ClosingMotiveRender;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTime;
 use Doctrine\Common\Collections\Collection;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
@@ -33,8 +32,6 @@ use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function is_array;
-
 class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
     use NormalizerAwareTrait;
@@ -43,15 +40,15 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
 
     private const PERIOD_NULL = [
         'id',
-        'closingDate' => DateTime::class,
+        'closingDate' => \DateTime::class,
         'closingMotive' => AccompanyingPeriod\ClosingMotive::class,
         'confidential',
         'confidentialText',
-        'createdAt' => DateTime::class,
+        'createdAt' => \DateTime::class,
         'createdBy' => User::class,
         'emergency',
         'emergencyText',
-        'openingDate' => DateTime::class,
+        'openingDate' => \DateTime::class,
         'origin' => AccompanyingPeriod\Origin::class,
         'originText',
         'requestorAnonymous',
@@ -78,19 +75,19 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
 
     /**
      * @param AccompanyingPeriod|null $period
-     * @param string|null $format
+     * @param string|null             $format
      */
     public function normalize($period, $format = null, array $context = [])
     {
         if ($period instanceof AccompanyingPeriod) {
             $scopes = $this->scopeResolverDispatcher->isConcerned($period) ? $this->scopeResolverDispatcher->resolveScope($period) : [];
 
-            if (!is_array($scopes)) {
+            if (!\is_array($scopes)) {
                 $scopes = [$scopes];
             }
 
             $addressContext = array_merge($context, ['docgen:expects' => Address::class, 'groups' => 'docgen:read']);
-            $dateContext = array_merge($context, ['docgen:expects' => DateTime::class, 'groups' => 'docgen:read']);
+            $dateContext = array_merge($context, ['docgen:expects' => \DateTime::class, 'groups' => 'docgen:read']);
             $userContext = array_merge($context, ['docgen:expects' => User::class, 'groups' => 'docgen:read']);
             $participationContext = array_merge($context, ['docgen:expects' => AccompanyingPeriodParticipation::class, 'groups' => 'docgen:read']);
             $administrativeLocationContext = array_merge($context, ['docgen:expects' => Location::class, 'groups' => 'docgen:read']);
@@ -112,29 +109,29 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
                 'currentParticipations' => $this->normalizer->normalize($period->getCurrentParticipations(), $format, $participationContext),
                 'requestorAnonymous' => $period->isRequestorAnonymous(),
                 'requestorPerson' => $this->normalizer->normalize($period->getRequestorPerson(), $format, array_merge($context, ['docgen:expects' => Person::class])),
-                'hasRequestorPerson' => $period->getRequestorPerson() !== null,
+                'hasRequestorPerson' => null !== $period->getRequestorPerson(),
                 'requestorThirdParty' => $this->normalizer->normalize($period->getRequestorThirdParty(), $format, array_merge($context, ['docgen:expects' => ThirdParty::class])),
-                'hasRequestorThirdParty' => $period->getRequestorThirdParty() !== null,
+                'hasRequestorThirdParty' => null !== $period->getRequestorThirdParty(),
                 'resources' => $this->normalizer->normalize($period->getResources(), $format, $context),
                 'scopes' => $this->normalizer->normalize($scopes, $format, array_merge($context, ['docgen:expects' => Scope::class, 'groups' => 'docgen:read'])),
                 'socialIssues' => $this->normalizer->normalize($period->getSocialIssues(), $format, $context),
                 'intensity' => $this->translator->trans($period->getIntensity()),
-                'step' => $this->translator->trans('accompanying_period.' . $period->getStep()),
+                'step' => $this->translator->trans('accompanying_period.'.$period->getStep()),
                 'emergencyText' => $period->isEmergency() ? $this->translator->trans('accompanying_period.emergency') : '',
                 'confidentialText' => $period->isConfidential() ? $this->translator->trans('confidential') : '',
                 'originText' => null !== $period->getOrigin() ? $this->translatableStringHelper->localize($period->getOrigin()->getLabel()) : '',
-                'isClosed' => $period->getClosingDate() !== null,
+                'isClosed' => null !== $period->getClosingDate(),
                 'closingMotiveText' => null !== $period->getClosingMotive() ?
                     $this->closingMotiveRender->renderString($period->getClosingMotive(), []) : '',
                 'ref' => $this->normalizer->normalize($period->getUser(), $format, $userContext),
-                'hasRef' => $period->getUser() !== null,
+                'hasRef' => null !== $period->getUser(),
                 'socialIssuesText' => implode(', ', array_map(fn (SocialIssue $s) => $this->socialIssueRender->renderString($s, []), $period->getSocialIssues()->toArray())),
                 'scopesText' => implode(', ', array_map(fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()), $scopes)),
-                'hasRequestor' => $period->getRequestor() !== null,
+                'hasRequestor' => null !== $period->getRequestor(),
                 'requestorKind' => $period->getRequestorKind(),
-                'hasLocation' => $period->getLocation() !== null,
-                'hasLocationPerson' => $period->getPersonLocation() !== null,
-                'hasAdministrativeLocation' => $period->getAdministrativeLocation() !== null,
+                'hasLocation' => null !== $period->getLocation(),
+                'hasLocationPerson' => null !== $period->getPersonLocation(),
+                'hasAdministrativeLocation' => null !== $period->getAdministrativeLocation(),
                 'locationPerson' => $this->normalizer->normalize($period->getPersonLocation(), $format, array_merge($context, ['docgen:expects' => Person::class])),
                 'location' => $this->normalizer->normalize($period->getLocation(), $format, $addressContext),
                 'administrativeLocation' => $this->normalizer->normalize($period->getAdministrativeLocation(), $format, $administrativeLocationContext),
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
index f4b97c47d..2b1b767c0 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
@@ -20,7 +20,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 final class AccompanyingPeriodOriginNormalizer implements NormalizerInterface
 {
     /**
-     * @param Origin $origin
+     * @param Origin      $origin
      * @param string|null $format
      */
     public function normalize($origin, $format = null, array $context = [])
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
index 2ddeb466d..ce0a4707d 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
@@ -21,7 +21,7 @@ class AccompanyingPeriodParticipationNormalizer implements NormalizerAwareInterf
 
     /**
      * @param AccompanyingPeriodParticipation $participation
-     * @param string|null $format
+     * @param string|null                     $format
      */
     public function normalize($participation, $format = null, array $context = [])
     {
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
index 2fefd6506..2e26e96c4 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
@@ -22,10 +22,6 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
 
-use function array_key_exists;
-use function array_merge;
-use function count;
-
 class AccompanyingPeriodResourceNormalizer implements DenormalizerAwareInterface, DenormalizerInterface
 {
     use DenormalizerAwareTrait;
@@ -42,16 +38,15 @@ class AccompanyingPeriodResourceNormalizer implements DenormalizerAwareInterface
             throw new Exception\InvalidArgumentException("the key type must be present in data and set to 'accompanying_period_resource'");
         }
 
-        if (null === $resource && array_key_exists('id', $data)) {
+        if (null === $resource && \array_key_exists('id', $data)) {
             $resource = $this->repository->find($data['id']);
 
             if (null === $resource) {
-                throw new Exception\UnexpectedValueException(sprintf('the resource with' .
-                    'id %d is not found', $data['id']));
+                throw new Exception\UnexpectedValueException(sprintf('the resource withid %d is not found', $data['id']));
             }
 
             // if resource found, available only for read-only
-            if (count($data) > 2) {
+            if (\count($data) > 2) {
                 unset($data['id'], $data['type']);
 
                 throw new Exception\ExtraAttributesException($data);
@@ -62,12 +57,12 @@ class AccompanyingPeriodResourceNormalizer implements DenormalizerAwareInterface
             $resource = new Resource();
         }
 
-        if (array_key_exists('resource', $data)) {
+        if (\array_key_exists('resource', $data)) {
             $res = $this->denormalizer->denormalize(
                 $data['resource'],
                 DiscriminatedObjectDenormalizer::TYPE,
                 $format,
-                array_merge(
+                \array_merge(
                     $context,
                     [
                         DiscriminatedObjectDenormalizer::ALLOWED_TYPES => [
@@ -80,7 +75,7 @@ class AccompanyingPeriodResourceNormalizer implements DenormalizerAwareInterface
             $resource->setResource($res);
         }
 
-        if (array_key_exists('comment', $data)) {
+        if (\array_key_exists('comment', $data)) {
             $resource->setComment($data['comment']);
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
index c289cb0a4..e5cd50f09 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
@@ -21,11 +21,6 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
 
-use function array_key_exists;
-use function array_merge;
-use function in_array;
-use function is_array;
-
 /**
  * This denormalizer rely on AbstractNormalizer for most of the job, and
  * add some logic for synchronizing collection.
@@ -44,12 +39,12 @@ class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInte
 
     public function denormalize($data, $type, $format = null, array $context = [])
     {
-        $work = $this->denormalizer->denormalize($data, $type, $format, array_merge(
+        $work = $this->denormalizer->denormalize($data, $type, $format, \array_merge(
             $context,
             ['skip' => self::class]
         ));
 
-        if (in_array('accompanying_period_work:edit', $context['groups'] ?? [], true)) {
+        if (\in_array('accompanying_period_work:edit', $context['groups'] ?? [], true)) {
             $this->handleEvaluationCollection($data, $work, $format, $context);
         }
 
@@ -60,8 +55,8 @@ class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInte
     {
         return AccompanyingPeriodWork::class === $type
             && self::class !== ($context['skip'] ?? null)
-            && is_array($data)
-            && array_key_exists('type', $data)
+            && \is_array($data)
+            && \array_key_exists('type', $data)
             && 'accompanying_period_work' === $data['type'];
     }
 
@@ -71,7 +66,7 @@ class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInte
         $dataWithoutId = [];
 
         foreach ($data['accompanyingPeriodWorkEvaluations'] as $e) {
-            if (array_key_exists('id', $e)) {
+            if (\array_key_exists('id', $e)) {
                 $dataById[$e['id']] = $e;
             } else {
                 $dataWithoutId[] = $e;
@@ -81,7 +76,7 @@ class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInte
         // partition the separate kept evaluations and removed one
         [$kept, $removed] = $work->getAccompanyingPeriodWorkEvaluations()
             ->partition(
-                static fn (int $key, AccompanyingPeriodWorkEvaluation $a) => array_key_exists($a->getId(), $dataById)
+                static fn (int $key, AccompanyingPeriodWorkEvaluation $a) => \array_key_exists($a->getId(), $dataById)
             );
 
         // remove the evaluations from work
@@ -94,7 +89,7 @@ class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInte
                 $dataById[$k->getId()],
                 AccompanyingPeriodWorkEvaluation::class,
                 $format,
-                array_merge(
+                \array_merge(
                     $context,
                     [
                         'groups' => ['write'],
@@ -109,7 +104,7 @@ class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInte
                 $newData,
                 AccompanyingPeriodWorkEvaluation::class,
                 $format,
-                array_merge(
+                \array_merge(
                     $context,
                     ['groups' => ['accompanying_period_work_evaluation:create']]
                 )
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php
index 8e890445e..a5dcfb840 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php
@@ -19,10 +19,6 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
 
-use function array_key_exists;
-use function array_merge;
-use function is_array;
-
 /**
  * This denormalizer rely on AbstractNormalizer for most of the job, and
  * add some logic for synchronizing collection.
@@ -35,7 +31,7 @@ class AccompanyingPeriodWorkEvaluationDenormalizer implements ContextAwareDenorm
 
     public function denormalize($data, $type, $format = null, array $context = [])
     {
-        $evaluation = $this->denormalizer->denormalize($data, $type, $format, array_merge(
+        $evaluation = $this->denormalizer->denormalize($data, $type, $format, \array_merge(
             $context,
             ['skip' => self::class]
         ));
@@ -49,8 +45,8 @@ class AccompanyingPeriodWorkEvaluationDenormalizer implements ContextAwareDenorm
     {
         return AccompanyingPeriodWorkEvaluation::class === $type
             && self::class !== ($context['skip'] ?? null)
-            && is_array($data)
-            && array_key_exists('type', $data)
+            && \is_array($data)
+            && \array_key_exists('type', $data)
             && 'accompanying_period_work_evaluation' === $data['type'];
     }
 
@@ -60,17 +56,17 @@ class AccompanyingPeriodWorkEvaluationDenormalizer implements ContextAwareDenorm
         $dataWithoutId = [];
 
         foreach ($data['documents'] as $e) {
-            if (array_key_exists('id', $e)) {
+            if (\array_key_exists('id', $e)) {
                 $dataById[$e['id']] = $e;
             } else {
                 $dataWithoutId[] = $e;
             }
         }
 
-        //partition the separate kept documents and removed one
+        // partition the separate kept documents and removed one
         [$kept, $removed] = $evaluation->getDocuments()
             ->partition(
-                static fn (int $key, AccompanyingPeriodWorkEvaluationDocument $a) => array_key_exists($a->getId(), $dataById)
+                static fn (int $key, AccompanyingPeriodWorkEvaluationDocument $a) => \array_key_exists($a->getId(), $dataById)
             );
 
         // remove the document from evaluation
@@ -84,7 +80,7 @@ class AccompanyingPeriodWorkEvaluationDenormalizer implements ContextAwareDenorm
                 $dataById[$k->getId()],
                 AccompanyingPeriodWorkEvaluationDocument::class,
                 $format,
-                array_merge(
+                \array_merge(
                     $context,
                     [
                         'groups' => ['write'],
@@ -99,7 +95,7 @@ class AccompanyingPeriodWorkEvaluationDenormalizer implements ContextAwareDenorm
                 $newData,
                 AccompanyingPeriodWorkEvaluationDocument::class,
                 $format,
-                array_merge(
+                \array_merge(
                     $context,
                     ['groups' => ['accompanying_period_work_evaluation:create']]
                 )
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php
index 1ef0469c8..720bb9c03 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php
@@ -18,7 +18,6 @@ use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Workflow\Registry;
-use function array_key_exists;
 
 class AccompanyingPeriodWorkEvaluationDocumentNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
@@ -28,7 +27,7 @@ class AccompanyingPeriodWorkEvaluationDocumentNormalizer implements ContextAware
 
     public function __construct(private readonly EntityWorkflowRepository $entityWorkflowRepository, private readonly MetadataExtractor $metadataExtractor, private readonly Registry $registry) {}
 
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($object, string $format = null, array $context = []): array
     {
         $initial = $this->normalizer->normalize($object, $format, array_merge($context, [
             self::SKIP => spl_object_hash($object),
@@ -48,12 +47,12 @@ class AccompanyingPeriodWorkEvaluationDocumentNormalizer implements ContextAware
         return $initial;
     }
 
-    public function supportsNormalization($data, ?string $format = null, array $context = [])
+    public function supportsNormalization($data, string $format = null, array $context = [])
     {
         return $data instanceof AccompanyingPeriodWorkEvaluationDocument
             && 'json' === $format
             && (
-                !array_key_exists(self::SKIP, $context)
+                !\array_key_exists(self::SKIP, $context)
                 || spl_object_hash($data) !== $context[self::SKIP]
             );
     }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
index ce746ab4d..67c9209e5 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
@@ -19,7 +19,6 @@ use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Workflow\Registry;
-use function array_key_exists;
 
 class AccompanyingPeriodWorkEvaluationNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
@@ -32,7 +31,7 @@ class AccompanyingPeriodWorkEvaluationNormalizer implements ContextAwareNormaliz
     /**
      * @param AccompanyingPeriodWorkEvaluation $object
      */
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($object, string $format = null, array $context = []): array
     {
         $initial = $this->normalizer->normalize($object, $format, array_merge(
             $context,
@@ -65,10 +64,10 @@ class AccompanyingPeriodWorkEvaluationNormalizer implements ContextAwareNormaliz
         return $initial;
     }
 
-    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
+    public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
         return 'json' === $format
             && $data instanceof AccompanyingPeriodWorkEvaluation
-            && !array_key_exists(self::IGNORE_EVALUATION, $context);
+            && !\array_key_exists(self::IGNORE_EVALUATION, $context);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
index 86e94f52e..3f0cd738e 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
-use ArrayObject;
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
@@ -22,7 +21,6 @@ use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Workflow\Registry;
-use function array_key_exists;
 
 class AccompanyingPeriodWorkNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
@@ -37,7 +35,7 @@ class AccompanyingPeriodWorkNormalizer implements ContextAwareNormalizerInterfac
      *
      * @throws ExceptionInterface
      */
-    public function normalize($object, ?string $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string
+    public function normalize($object, string $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string
     {
         $initial = $this->normalizer->normalize($object, $format, array_merge(
             $context,
@@ -78,10 +76,10 @@ class AccompanyingPeriodWorkNormalizer implements ContextAwareNormalizerInterfac
         return $initial;
     }
 
-    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
+    public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
         return 'json' === $format
             && $data instanceof AccompanyingPeriodWork
-            && !array_key_exists(self::IGNORE_WORK, $context);
+            && !\array_key_exists(self::IGNORE_WORK, $context);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
index 5e9d6ae69..0e358483e 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
@@ -18,15 +18,11 @@ use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Household\MembersEditor;
 use Chill\PersonBundle\Household\MembersEditorFactory;
-use DateTimeImmutable;
 use Symfony\Component\Serializer\Exception;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
-use UnexpectedValueException;
-use function array_key_exists;
-
 class MembersEditorNormalizer implements DenormalizerAwareInterface, DenormalizerInterface
 {
     use DenormalizerAwareTrait;
@@ -66,7 +62,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
             );
             $startDate = $this->denormalizer->denormalize(
                 $concerned['start_date'] ?? null,
-                DateTimeImmutable::class,
+                \DateTimeImmutable::class,
                 $format,
                 $context
             );
@@ -75,9 +71,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
                 null === $person
                 && null === $startDate
             ) {
-                throw new Exception\InvalidArgumentException('position with ' .
-                    "key {$key} could not be denormalized: missing " .
-                    'person or start_date.');
+                throw new Exception\InvalidArgumentException('position with '."key {$key} could not be denormalized: missing ".'person or start_date.');
             }
 
             $editor->leaveMovement($startDate, $person);
@@ -112,7 +106,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
                 $context
             );
 
-            if (array_key_exists('position', $concerned)) {
+            if (\array_key_exists('position', $concerned)) {
                 $position = $this->denormalizer->denormalize(
                     $concerned['position'] ?? null,
                     Position::class,
@@ -125,7 +119,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
 
             $startDate = $this->denormalizer->denormalize(
                 $concerned['start_date'] ?? null,
-                DateTimeImmutable::class,
+                \DateTimeImmutable::class,
                 $format,
                 $context
             );
@@ -138,9 +132,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
                 && null === $position
                 && null === $startDate
             ) {
-                throw new Exception\InvalidArgumentException('position with ' .
-                    "key {$key} could not be denormalized: missing " .
-                    'person, position or start_date.');
+                throw new Exception\InvalidArgumentException('position with '."key {$key} could not be denormalized: missing ".'person, position or start_date.');
             }
 
             $editor->addMovement(
@@ -155,10 +147,10 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
         if (null !== $data['composition']) {
             $compositionType = $this->denormalizer->denormalize($data['composition']['household_composition_type'], HouseholdCompositionType::class, $format, $context);
             $numberOfChildren = $data['composition']['number_of_children'];
-            $startDate = $this->denormalizer->denormalize($data['composition']['start_date'], DateTimeImmutable::class, $format, $context);
+            $startDate = $this->denormalizer->denormalize($data['composition']['start_date'], \DateTimeImmutable::class, $format, $context);
 
             if (null === $compositionType) {
-                throw new UnexpectedValueException('composition type cannot be null');
+                throw new \UnexpectedValueException('composition type cannot be null');
             }
 
             $householdComposition = (new HouseholdComposition())
@@ -181,7 +173,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
             throw new Exception\UnexpectedValueException("The schema does not have any key 'concerned'");
         }
 
-        if (false === array_key_exists('destination', $data)) {
+        if (false === \array_key_exists('destination', $data)) {
             throw new Exception\UnexpectedValueException("The schema does not have any key 'destination'");
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
index 46a7f630f..c8f9cf455 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
@@ -22,7 +22,6 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonAltName;
 use Chill\PersonBundle\Repository\Relationships\RelationshipRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\DataFixtures\Exception\CircularReferenceException;
 use libphonenumber\PhoneNumber;
@@ -33,12 +32,6 @@ use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-use function array_map;
-use function implode;
-use function in_array;
-use function is_string;
-
 class PersonDocGenNormalizer implements
     ContextAwareNormalizerInterface,
     NormalizerAwareInterface
@@ -63,7 +56,7 @@ class PersonDocGenNormalizer implements
 
         /** @var Person $person */
         $dateContext = $context;
-        $dateContext['docgen:expects'] = DateTimeInterface::class;
+        $dateContext['docgen:expects'] = \DateTimeInterface::class;
         $addressContext = array_merge($context, ['docgen:expects' => Address::class]);
         $phonenumberContext = array_merge($context, ['docgen:expects' => PhoneNumber::class]);
         $centerContext = array_merge($context, ['docgen:expects' => Center::class]);
@@ -90,9 +83,9 @@ class PersonDocGenNormalizer implements
             'civility' => $this->normalizer->normalize($person->getCivility(), $format, array_merge($context, ['docgen:expects' => Civility::class])),
             'firstName' => $person->getFirstName(),
             'lastName' => $person->getLastName(),
-            'altNames' => implode(
+            'altNames' => \implode(
                 ', ',
-                array_map(
+                \array_map(
                     static fn (PersonAltName $altName) => $altName->getLabel(),
                     $person->getAltNames()->toArray()
                 )
@@ -177,7 +170,7 @@ class PersonDocGenNormalizer implements
             $key = spl_object_hash($person);
         }
 
-        if (!array_key_exists(self::CIRCULAR_KEY, $context)) {
+        if (!\array_key_exists(self::CIRCULAR_KEY, $context)) {
             $context[self::CIRCULAR_KEY] = [$key];
 
             return $context;
@@ -204,11 +197,11 @@ class PersonDocGenNormalizer implements
     {
         $groups = $context[AbstractNormalizer::GROUPS] ?? [];
 
-        if (is_string($groups)) {
+        if (\is_string($groups)) {
             $groups = [$groups];
         }
 
-        return in_array($group, $groups, true);
+        return \in_array($group, $groups, true);
     }
 
     private function normalizeNullValue(string $format, array $context)
@@ -219,10 +212,10 @@ class PersonDocGenNormalizer implements
             'id', 'firstName', 'lastName', 'age', 'altNames', 'text',
             'center' => Center::class,
             'civility' => Civility::class,
-            'birthdate' => DateTimeInterface::class,
-            'deathdate' => DateTimeInterface::class,
+            'birthdate' => \DateTimeInterface::class,
+            'deathdate' => \DateTimeInterface::class,
             'gender', 'maritalStatus',
-            'maritalStatusDate' => DateTimeInterface::class,
+            'maritalStatusDate' => \DateTimeInterface::class,
             'maritalStatusComment',
             'email', 'firstPhoneNumber', 'fixPhoneNumber', 'mobilePhoneNumber', 'nationality',
             'placeOfBirth', 'memo', 'numberOfChildren',
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index 09aad0747..eae33f399 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -20,8 +20,6 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonAltName;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
-use DateTime;
-use DateTimeImmutable;
 use Doctrine\Common\Collections\Collection;
 use libphonenumber\PhoneNumber;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
@@ -31,10 +29,6 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
-use function array_key_exists;
-use function count;
-use function in_array;
-use function is_string;
 
 /**
  * Serialize a Person entity.
@@ -60,13 +54,13 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
     {
         $person = $this->extractObjectToPopulate($type, $context);
 
-        if (array_key_exists('id', $data) && null === $person) {
+        if (\array_key_exists('id', $data) && null === $person) {
             $person = $this->repository->find($data['id']);
 
             if (null === $person) {
-                throw new UnexpectedValueException("The person with id \"{$data['id']}\" does " .
-                    'not exists');
+                throw new UnexpectedValueException("The person with id \"{$data['id']}\" does ".'not exists');
             }
+
             // currently, not allowed to update a person through api
             // if instantiated with id
             return $person;
@@ -92,7 +86,7 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
 
         $fields = array_filter(
             $fields,
-            static fn (string $field): bool => array_key_exists($field, $data)
+            static fn (string $field): bool => \array_key_exists($field, $data)
         );
 
         foreach ($fields as $item) {
@@ -123,14 +117,14 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
                     break;
 
                 case 'birthdate':
-                    $object = $this->denormalizer->denormalize($data[$item], DateTime::class, $format, $context);
+                    $object = $this->denormalizer->denormalize($data[$item], \DateTime::class, $format, $context);
 
                     $person->setBirthdate($object);
 
                     break;
 
                 case 'deathdate':
-                    $object = $this->denormalizer->denormalize($data[$item], DateTimeImmutable::class, $format, $context);
+                    $object = $this->denormalizer->denormalize($data[$item], \DateTimeImmutable::class, $format, $context);
 
                     $person->setDeathdate($object);
 
@@ -178,14 +172,14 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
     }
 
     /**
-     * @param Person $person
+     * @param Person      $person
      * @param string|null $format
      */
     public function normalize($person, $format = null, array $context = [])
     {
         $groups = $context[AbstractNormalizer::GROUPS] ?? [];
 
-        if (is_string($groups)) {
+        if (\is_string($groups)) {
             $groups = [$groups];
         }
         $household = $person->getCurrentHousehold();
@@ -209,7 +203,7 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
             'civility' => $this->normalizer->normalize($person->getCivility(), $format, $context),
         ];
 
-        if (in_array('minimal', $groups, true) && 1 === count($groups)) {
+        if (\in_array('minimal', $groups, true) && 1 === \count($groups)) {
             return $data;
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
index 183338cc8..402f5ff03 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
@@ -26,7 +26,7 @@ class RelationshipDocGenNormalizer implements ContextAwareNormalizerInterface, N
 
     /**
      * @param Relationship $relation
-     * @param string|null $format
+     * @param string|null  $format
      */
     public function normalize($relation, $format = null, array $context = [])
     {
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
index 382f3bccb..a2f69624d 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
@@ -25,7 +25,7 @@ class SocialIssueNormalizer implements ContextAwareNormalizerInterface, Normaliz
 
     public function normalize($socialIssue, $format = null, array $context = [])
     {
-        /** @var SocialIssue $socialIssue */
+        /* @var SocialIssue $socialIssue */
         switch ($format) {
             case 'json':
                 return [
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
index fb39f722d..41666e576 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
-use ArrayObject;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
@@ -19,7 +18,6 @@ use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Workflow\Registry;
-use function array_key_exists;
 
 class WorkflowNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
@@ -32,11 +30,11 @@ class WorkflowNormalizer implements ContextAwareNormalizerInterface, NormalizerA
     /**
      * @param EntityWorkflow $object
      *
-     * @throws ExceptionInterface
+     * @return array|\ArrayObject|bool|float|int|string|void|null
      *
-     * @return array|ArrayObject|bool|float|int|string|void|null
+     * @throws ExceptionInterface
      */
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($object, string $format = null, array $context = []): array
     {
         $data = $this->normalizer->normalize($object, $format, array_merge(
             $context,
@@ -53,10 +51,10 @@ class WorkflowNormalizer implements ContextAwareNormalizerInterface, NormalizerA
         return $data;
     }
 
-    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
+    public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
         return 'json' === $format
             && $data instanceof EntityWorkflow
-            && !array_key_exists(self::IGNORE_ENTITY_WORKFLOW, $context);
+            && !\array_key_exists(self::IGNORE_ENTITY_WORKFLOW, $context);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php
index 0c4dea166..44d2e38d5 100644
--- a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php
+++ b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php
@@ -14,8 +14,6 @@ namespace Chill\PersonBundle\Service\AccompanyingPeriod;
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use DateInterval;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
@@ -24,54 +22,54 @@ class OldDraftAccompanyingPeriodRemover implements OldDraftAccompanyingPeriodRem
 {
     public function __construct(private readonly EntityManagerInterface $em, private readonly LoggerInterface $logger) {}
 
-    public function remove(DateInterval $interval): void
+    public function remove(\DateInterval $interval): void
     {
-        $this->logger->debug('[' . self::class . '] start to remove old periods', [
+        $this->logger->debug('['.self::class.'] start to remove old periods', [
             'interval' => $interval->format('%d days'),
         ]);
 
-        $beforeDate = (new DateTimeImmutable('now'))->sub($interval);
+        $beforeDate = (new \DateTimeImmutable('now'))->sub($interval);
 
         $results = $this->em->wrapInTransaction(static function (EntityManagerInterface $em) use ($beforeDate) {
-            $subDQL = 'SELECT p FROM ' . AccompanyingPeriod::class . ' p WHERE p.createdAt < :beforeDate AND p.step = :draft';
+            $subDQL = 'SELECT p FROM '.AccompanyingPeriod::class.' p WHERE p.createdAt < :beforeDate AND p.step = :draft';
             $parameters = [
                 'beforeDate' => $beforeDate,
                 'draft' => AccompanyingPeriod::STEP_DRAFT,
             ];
 
             $resources = $em->createQuery(
-                'DELETE ' . AccompanyingPeriod\Resource::class . " r  WHERE r.accompanyingPeriod IN ({$subDQL})"
+                'DELETE '.AccompanyingPeriod\Resource::class." r  WHERE r.accompanyingPeriod IN ({$subDQL})"
             )
                 ->setParameters($parameters)
                 ->getSingleScalarResult();
 
             $participations = $em->createQuery(
-                'DELETE ' . AccompanyingPeriodParticipation::class . " part WHERE part.accompanyingPeriod IN ({$subDQL})"
+                'DELETE '.AccompanyingPeriodParticipation::class." part WHERE part.accompanyingPeriod IN ({$subDQL})"
             )
                 ->setParameters($parameters)
                 ->getSingleScalarResult();
 
             $userHistory = $em->createQuery(
-                'DELETE ' . AccompanyingPeriod\UserHistory::class . " h WHERE h.accompanyingPeriod IN ({$subDQL})"
+                'DELETE '.AccompanyingPeriod\UserHistory::class." h WHERE h.accompanyingPeriod IN ({$subDQL})"
             )
                 ->setParameters($parameters)
                 ->getSingleScalarResult();
 
             $comments = $em->createQuery(
-                'DELETE ' . AccompanyingPeriod\Comment::class . " c WHERE c.accompanyingPeriod IN ({$subDQL})"
+                'DELETE '.AccompanyingPeriod\Comment::class." c WHERE c.accompanyingPeriod IN ({$subDQL})"
             )
                 ->setParameters($parameters)
                 ->getSingleScalarResult();
 
             $documents = $em->createQuery(
-                'DELETE ' . AccompanyingCourseDocument::class . " d WHERE d.course IN ({$subDQL})"
+                'DELETE '.AccompanyingCourseDocument::class." d WHERE d.course IN ({$subDQL})"
             )
                 ->setParameters($parameters)
                 ->getSingleScalarResult();
 
             $periods = $em
                 ->createQuery(
-                    'DELETE ' . AccompanyingPeriod::class . ' p WHERE p.createdAt < :beforeDate
+                    'DELETE '.AccompanyingPeriod::class.' p WHERE p.createdAt < :beforeDate
                     AND p.step = :draft'
                 )
                 ->setParameter(':beforeDate', $beforeDate, Types::DATETIME_IMMUTABLE)
@@ -88,7 +86,7 @@ class OldDraftAccompanyingPeriodRemover implements OldDraftAccompanyingPeriodRem
             ];
         });
 
-        $this->logger->info('[' . self::class . '] periods removed', array_merge($results, [
+        $this->logger->info('['.self::class.'] periods removed', array_merge($results, [
             'interval' => $interval->format('%d days'),
         ]));
     }
diff --git a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php
index 550128703..ef9833b3a 100644
--- a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php
+++ b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\AccompanyingPeriod;
 
-use DateInterval;
-
 interface OldDraftAccompanyingPeriodRemoverInterface
 {
-    public function remove(DateInterval $interval): void;
+    public function remove(\DateInterval $interval): void;
 }
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index db69e6ea3..b01e7c5f3 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -30,7 +30,6 @@ use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
@@ -41,10 +40,9 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-
 /**
  * @see AccompanyingPeriodContextTest
+ *
  * @template-implements DocGeneratorContextWithPublicFormInterface<AccompanyingPeriod>
  */
 class AccompanyingPeriodContext implements
@@ -66,7 +64,7 @@ class AccompanyingPeriodContext implements
 
     public function adminFormReverseTransform(array $data): array
     {
-        if (array_key_exists('category', $data)) {
+        if (\array_key_exists('category', $data)) {
             $data['category'] = [
                 'idInsideBundle' => $data['category']->getIdInsideBundle(),
                 'bundleId' => $data['category']->getBundleId(),
@@ -89,7 +87,7 @@ class AccompanyingPeriodContext implements
             'thirdPartyLabel' => $data['thirdPartyLabel'] ?? $this->translator->trans('Third party'),
         ];
 
-        if (array_key_exists('category', $data)) {
+        if (\array_key_exists('category', $data)) {
             $r['category'] = $this->documentCategoryRepository->find($data['category']);
         }
 
@@ -176,7 +174,7 @@ class AccompanyingPeriodContext implements
                     'multiple' => false,
                     'expanded' => true,
                     'required' => false,
-                    'label' => $options[$key . 'Label'],
+                    'label' => $options[$key.'Label'],
                     'placeholder' => $this->translator->trans('Any person selected'),
                 ]);
             }
@@ -231,7 +229,7 @@ class AccompanyingPeriodContext implements
         if ($options['thirdParty']) {
             $data['thirdParty'] = $this->normalizer->normalize($contextGenerationData['thirdParty'], 'docgen', [
                 'docgen:expects' => ThirdParty::class,
-                'groups' => 'docgen:read'
+                'groups' => 'docgen:read',
             ]);
         }
 
@@ -274,7 +272,7 @@ class AccompanyingPeriodContext implements
     {
         $options = $template->getOptions();
 
-        return $options['mainPerson'] || $options['person1'] || $options['person2'] || $options ['thirdParty'];
+        return $options['mainPerson'] || $options['person1'] || $options['person2'] || $options['thirdParty'];
     }
 
     public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
@@ -315,12 +313,12 @@ class AccompanyingPeriodContext implements
         $doc = new AccompanyingCourseDocument();
         $doc->setTemplate($template)
             ->setTitle($this->translatableStringHelper->localize($template->getName()))
-            ->setDate(new DateTime())
+            ->setDate(new \DateTime())
             ->setDescription($this->translatableStringHelper->localize($template->getName()))
             ->setCourse($entity)
             ->setObject($storedObject);
 
-        if (array_key_exists('category', $template->getOptions())) {
+        if (\array_key_exists('category', $template->getOptions())) {
             $doc
                 ->setCategory(
                     $this->documentCategoryRepository->find(
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
index 6247c0664..4c1be8159 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
@@ -20,10 +20,10 @@ use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
- * Generate a context for an @link{AccompanyingPeriodWork}.
+ * Generate a context for an @see{AccompanyingPeriodWork}.
  *
  * Although there isn't any document associated to AccompanyingPeriodWork, this context
- * is use by @link{AccompanyingPeriodWorkEvaluationContext}.
+ * is use by @see{AccompanyingPeriodWorkEvaluationContext}.
  *
  * @implements DocGeneratorContextWithPublicFormInterface<AccompanyingPeriodWork>
  */
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index af2b643fc..6ecaa99b4 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -23,7 +23,6 @@ use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
-use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -124,6 +123,7 @@ class AccompanyingPeriodWorkEvaluationContext implements
                 AbstractNormalizer::GROUPS => ['docgen:read'],
             ]
         );
+
         return $data;
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index eff7c674e..bf4b7da0d 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\DocGenerator;
 
-use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
 use Chill\DocStoreBundle\Entity\DocumentCategory;
@@ -29,15 +28,12 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Person\PersonResource;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\ResidentialAddress;
-use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use LogicException;
 use Service\DocGenerator\PersonContextTest;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
@@ -46,10 +42,7 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_key_exists;
-use function count;
 
 /**
  * @see PersonContextTest
@@ -79,7 +72,7 @@ final class PersonContext implements PersonContextInterface
 
     public function adminFormReverseTransform(array $data): array
     {
-        if (array_key_exists('category', $data)) {
+        if (\array_key_exists('category', $data)) {
             $data['category'] = [
                 'idInsideBundle' => $data['category']->getIdInsideBundle(),
                 'bundleId' => $data['category']->getBundleId(),
@@ -98,7 +91,7 @@ final class PersonContext implements PersonContextInterface
             'thirdPartyLabel' => $data['thirdPartyLabel'] ?? $this->translator->trans('Third party'),
         ];
 
-        if (array_key_exists('category', $data)) {
+        if (\array_key_exists('category', $data)) {
             $r['category'] = $this->documentCategoryRepository->find($data['category']);
         }
 
@@ -197,7 +190,7 @@ final class PersonContext implements PersonContextInterface
         if ($template->getOptions()['thirdParty']) {
             $data['thirdParty'] = $this->normalizer->normalize($contextGenerationData['thirdParty'], 'docgen', [
                 'docgen:expects' => ThirdParty::class,
-                'groups' => 'docgen:read'
+                'groups' => 'docgen:read',
             ]);
         }
 
@@ -285,12 +278,12 @@ final class PersonContext implements PersonContextInterface
             ->setTitle(
                 $contextGenerationData['title'] ?? $this->translatableStringHelper->localize($template->getName())
             )
-            ->setDate(new DateTime())
+            ->setDate(new \DateTime())
             ->setDescription($this->translatableStringHelper->localize($template->getName()))
             ->setPerson($entity)
             ->setObject($storedObject);
 
-        if (array_key_exists('category', $template->getOptions())) {
+        if (\array_key_exists('category', $template->getOptions())) {
             $doc
                 ->setCategory(
                     $this->documentCategoryRepository->find(
@@ -309,8 +302,8 @@ final class PersonContext implements PersonContextInterface
                 $this->centerResolverManager->resolveCenters($entity)
             );
 
-            if (1 !== count($scopes)) {
-                throw new LogicException('at this step, it should have only one scope');
+            if (1 !== \count($scopes)) {
+                throw new \LogicException('at this step, it should have only one scope');
             }
 
             $doc->setScope($scopes[0]);
@@ -321,7 +314,7 @@ final class PersonContext implements PersonContextInterface
 
     private function isScopeNecessary(Person $person): bool
     {
-        if ($this->showScopes && 1 < count(
+        if ($this->showScopes && 1 < \count(
             $this->authorizationHelper->getReachableScopes(
                 $this->security->getUser(),
                 PersonDocumentVoter::CREATE,
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryBuilder.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryBuilder.php
index efc6c9923..7945f13d6 100644
--- a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryBuilder.php
@@ -12,7 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Service\EntityInfo;
 
 /**
- * Build a list of different Query parts into a single query
+ * Build a list of different Query parts into a single query.
  */
 class AccompanyingPeriodInfoQueryBuilder
 {
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo.php
index 53b5e31ad..a0215957c 100644
--- a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo.php
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
 
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationDocumentUpdateQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationDocumentUpdateQueryPartForAccompanyingPeriodInfo.php
index 68d761cc2..cae8c96de 100644
--- a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationDocumentUpdateQueryPartForAccompanyingPeriodInfo.php
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationDocumentUpdateQueryPartForAccompanyingPeriodInfo.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
 
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo.php
index 843602249..ce8dd22f8 100644
--- a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo.php
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
 
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo.php
index cc82fc9ab..ecf366483 100644
--- a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo.php
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
 
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationUpdateQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationUpdateQueryPartForAccompanyingPeriodInfo.php
index 0d7b86a3d..ff29c558d 100644
--- a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationUpdateQueryPartForAccompanyingPeriodInfo.php
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationUpdateQueryPartForAccompanyingPeriodInfo.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
 use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
 
diff --git a/src/Bundle/ChillPersonBundle/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProvider.php b/src/Bundle/ChillPersonBundle/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProvider.php
index 84de67576..40e85b368 100644
--- a/src/Bundle/ChillPersonBundle/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProvider.php
+++ b/src/Bundle/ChillPersonBundle/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProvider.php
@@ -19,7 +19,6 @@ use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Security;
@@ -33,7 +32,7 @@ final readonly class AccompanyingPeriodWorkEvaluationGenericDocProvider implemen
         private EntityManagerInterface $entityManager,
     ) {}
 
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
     {
         $accompanyingPeriodWorkMetadata = $this->entityManager->getClassMetadata(AccompanyingPeriod\AccompanyingPeriodWork::class);
         $query = $this->buildBaseQuery();
@@ -52,7 +51,7 @@ final readonly class AccompanyingPeriodWorkEvaluationGenericDocProvider implemen
         return $this->security->isGranted(AccompanyingPeriodWorkVoter::SEE, $accompanyingPeriod);
     }
 
-    private function addWhereClausesToQuery(FetchQuery $query, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
+    private function addWhereClausesToQuery(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
     {
         $classMetadata = $this->entityManager->getClassMetadata(AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument::class);
         $storedObjectMetadata = $this->entityManager->getClassMetadata(StoredObject::class);
@@ -76,7 +75,7 @@ final readonly class AccompanyingPeriodWorkEvaluationGenericDocProvider implemen
         if (null !== $content) {
             $query->addWhereClause(
                 sprintf('apwed.%s ilike ?', $classMetadata->getColumnName('title')),
-                ['%' . $content . '%'],
+                ['%'.$content.'%'],
                 [Types::STRING]
             );
         }
@@ -84,7 +83,7 @@ final readonly class AccompanyingPeriodWorkEvaluationGenericDocProvider implemen
         return $query;
     }
 
-    public function buildFetchQueryForPerson(Person $person, ?DateTimeImmutable $startDate = null, ?DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
     {
         $storedObjectMetadata = $this->entityManager->getClassMetadata(StoredObject::class);
         $accompanyingPeriodWorkMetadata = $this->entityManager->getClassMetadata(AccompanyingPeriod\AccompanyingPeriodWork::class);
@@ -105,8 +104,8 @@ final readonly class AccompanyingPeriodWorkEvaluationGenericDocProvider implemen
                 $storedObjectMetadata->getColumnName('createdAt')
             );
             $orParams = [...$orParams, $participation->getAccompanyingPeriod()->getId(),
-                DateTimeImmutable::createFromInterface($participation->getStartDate()),
-                null === $participation->getEndDate() ? null : DateTimeImmutable::createFromInterface($participation->getEndDate())];
+                \DateTimeImmutable::createFromInterface($participation->getStartDate()),
+                null === $participation->getEndDate() ? null : \DateTimeImmutable::createFromInterface($participation->getEndDate())];
             $orTypes = [...$orTypes, Types::INTEGER, Types::DATE_IMMUTABLE, Types::DATE_IMMUTABLE];
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Service/GenericDoc/Renderer/AccompanyingPeriodWorkEvaluationGenericDocRenderer.php b/src/Bundle/ChillPersonBundle/Service/GenericDoc/Renderer/AccompanyingPeriodWorkEvaluationGenericDocRenderer.php
index f77beb283..7c6f2264f 100644
--- a/src/Bundle/ChillPersonBundle/Service/GenericDoc/Renderer/AccompanyingPeriodWorkEvaluationGenericDocRenderer.php
+++ b/src/Bundle/ChillPersonBundle/Service/GenericDoc/Renderer/AccompanyingPeriodWorkEvaluationGenericDocRenderer.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Service\GenericDoc\Renderer;
 
 use Chill\DocStoreBundle\GenericDoc\GenericDocDTO;
 use Chill\DocStoreBundle\GenericDoc\Twig\GenericDocRendererInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocumentRepository;
 use Chill\PersonBundle\Service\GenericDoc\Providers\AccompanyingPeriodWorkEvaluationGenericDocProvider;
 
@@ -25,7 +24,7 @@ final readonly class AccompanyingPeriodWorkEvaluationGenericDocRenderer implemen
 
     public function supports(GenericDocDTO $genericDocDTO, $options = []): bool
     {
-        return $genericDocDTO->key === AccompanyingPeriodWorkEvaluationGenericDocProvider::KEY;
+        return AccompanyingPeriodWorkEvaluationGenericDocProvider::KEY === $genericDocDTO->key;
     }
 
     public function getTemplate(GenericDocDTO $genericDocDTO, $options = []): string
diff --git a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
index 0be0b6a33..21406072d 100644
--- a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
+++ b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
@@ -24,16 +24,13 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr\Comparison;
 use Doctrine\Persistence\ObjectRepository;
-use Exception;
-
-use function count;
 
 final readonly class SocialWorkMetadata implements SocialWorkMetadataInterface
 {
     public function __construct(private SocialIssueRepository $socialIssueRepository, private SocialActionRepository $socialActionRepository, private GoalRepository $goalRepository, private ResultRepository $resultRepository, private EvaluationRepository $evaluationRepository, private EntityManagerInterface $entityManager) {}
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     public function import(iterable $dataset): bool
     {
@@ -130,9 +127,9 @@ final readonly class SocialWorkMetadata implements SocialWorkMetadataInterface
     }
 
     /**
-     * @throws Exception
-     *
      * @return object
+     *
+     * @throws \Exception
      */
     private function getOrCreateEntity(ObjectRepository $repository, string $field, array $jsonCriterias = [])
     {
@@ -149,13 +146,11 @@ final readonly class SocialWorkMetadata implements SocialWorkMetadataInterface
             return new $entity();
         }
 
-        if (count($results) === 1) {
+        if (1 === \count($results)) {
             return reset($results);
         }
 
-        throw new Exception(
-            'Unable to create entity.'
-        );
+        throw new \Exception('Unable to create entity.');
     }
 
     private function handleEvaluation(?string $evaluationTitle, SocialAction $socialAction): ?Evaluation
@@ -220,9 +215,9 @@ final readonly class SocialWorkMetadata implements SocialWorkMetadataInterface
     }
 
     /**
-     * @throws Exception
-     *
      * @return array<string, SocialAction|null>
+     *
+     * @throws \Exception
      */
     private function handleSocialAction(
         ?string $socialActionTitle,
@@ -270,9 +265,9 @@ final readonly class SocialWorkMetadata implements SocialWorkMetadataInterface
     }
 
     /**
-     * @throws Exception
-     *
      * @return array<string, SocialIssue|null>
+     *
+     * @throws \Exception
      */
     private function handleSocialIssue(
         ?string $socialIssueTitle,
@@ -326,12 +321,12 @@ final readonly class SocialWorkMetadata implements SocialWorkMetadataInterface
      * Index 5: Result
      * Index 6: Evaluation
      *
-     * @param array<int, ?string> $row
-     * @param array<string, array<string, <|array|null>|SocialIssue|string, SocialAction|null>|Evaluation|Goal|Result> $previousRow
+     * @param array<int, ?string>                                                                                                                      $row
+     * @param array{socialIssues: array<SocialIssue>, socialActions: array<SocialAction>, goal: Goal|null, result: Result|null, eval: Evaluation|null} $previousRow
      *
-     * @throws Exception
+     * @return array{socialIssues: array<SocialIssue>, socialActions: array<SocialAction>, goal: Goal|null, result: Result|null, eval: Evaluation|null}
      *
-     * @return array<string, array<string, <|array|null>|SocialIssue|string, SocialAction|null>|Evaluation|Goal|Result>
+     * @throws \Exception
      */
     private function import1(int $key, array $row, array $previousRow): array
     {
@@ -350,7 +345,7 @@ final readonly class SocialWorkMetadata implements SocialWorkMetadataInterface
         $socialIssue = $socialIssues['socialIssueChild'] ?? $socialIssues['socialIssue'];
 
         if (null === $socialIssue) {
-            throw new Exception(sprintf("no social issue on row {$key}, values: %s", implode(', ', $row)));
+            throw new \Exception(sprintf("no social issue on row {$key}, values: %s", implode(', ', $row)));
         }
 
         $socialActions = $this
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
index 5d44f6967..29ed4226a 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
@@ -35,8 +35,8 @@ final readonly class ClosingMotiveRender implements ChillEntityRenderInterface
     public function renderBox($entity, array $options): string
     {
         return
-            $this->getDefaultOpeningBox('closing-motive') .
-            $this->renderString($entity, $options) .
+            $this->getDefaultOpeningBox('closing-motive').
+            $this->renderString($entity, $options).
             $this->getDefaultClosingBox();
     }
 
@@ -60,7 +60,7 @@ final readonly class ClosingMotiveRender implements ChillEntityRenderInterface
 
         if ($motive->hasParent()) {
             if ('' !== $existing) {
-                $str = $str . self::SEPARATOR . $existing;
+                $str = $str.self::SEPARATOR.$existing;
             }
 
             $str = $this->renderStringRecursive(
@@ -71,11 +71,11 @@ final readonly class ClosingMotiveRender implements ChillEntityRenderInterface
         }
 
         if ('' !== $existing) {
-            $str = $str . self::SEPARATOR . $existing;
+            $str = $str.self::SEPARATOR.$existing;
         }
 
         if ($motive->isLeaf() && $motive->isCanceledAccompanyingPeriod()) {
-            $str = $str . ' ' . $this->translator->trans('( Canceled period )');
+            $str = $str.' '.$this->translator->trans('( Canceled period )');
         }
 
         return $str;
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
index 5a4e9ff3a..a09ad11f5 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
@@ -11,16 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Templating\Entity;
 
-use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Chill\MainBundle\Templating\Entity\BoxUtilsChillEntityRenderTrait;
-use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-
 /**
  * Render a Person.
  */
@@ -50,12 +45,12 @@ class PersonRender implements PersonRenderInterface
         ];
 
         return
-            $this->getDefaultOpeningBox('person') .
+            $this->getDefaultOpeningBox('person').
             $this->engine->render('@ChillPerson/Entity/person.html.twig', [
                 'person' => $person,
                 'render' => $options['render'] ?? 'raw',
                 'options' => $params,
-            ]) .
+            ]).
             $this->getDefaultClosingBox();
     }
 
@@ -63,19 +58,19 @@ class PersonRender implements PersonRenderInterface
     {
         $options = array_merge(['addAge' => true], $options);
 
-        if (null !== $person->getAge() && $person->getDeathDate() === null && $options['addAge']) {
-            return $person->getFirstName() . ' ' . $person->getLastName()
-            . $this->addAltNames($person, false) . ' (' . $this->translator->trans('years_old', ['age' => $person->getAge()]) . ')';
+        if (null !== $person->getAge() && null === $person->getDeathDate() && $options['addAge']) {
+            return $person->getFirstName().' '.$person->getLastName()
+            .$this->addAltNames($person, false).' ('.$this->translator->trans('years_old', ['age' => $person->getAge()]).')';
         }
 
         if (null !== $person->getDeathDate() && $options['addAge']) {
-            return $person->getFirstName() . ' ' . $person->getLastName()
-            . ' (‡)'
-            . $this->addAltNames($person, false);
+            return $person->getFirstName().' '.$person->getLastName()
+            .' (‡)'
+            .$this->addAltNames($person, false);
         }
 
-        return $person->getFirstName() . ' ' . $person->getLastName()
-            . $this->addAltNames($person, false);
+        return $person->getFirstName().' '.$person->getLastName()
+            .$this->addAltNames($person, false);
     }
 
     public function supports($entity, array $options): bool
@@ -93,7 +88,7 @@ class PersonRender implements PersonRenderInterface
 
             foreach ($person->getAltNames()->getIterator() as $altName) {
                 /** @var \Chill\PersonBundle\Entity\PersonAltName $altName */
-                if (array_key_exists($altName->getKey(), $altNames)) {
+                if (\array_key_exists($altName->getKey(), $altNames)) {
                     if ($isFirst) {
                         $str .= ' (';
                         $isFirst = false;
@@ -102,7 +97,7 @@ class PersonRender implements PersonRenderInterface
                     }
 
                     if ($addSpan) {
-                        $str .= '<span class="altname altname-' . $altName->getKey() . '">';
+                        $str .= '<span class="altname altname-'.$altName->getKey().'">';
                     }
                     $str .= $altName->getLabel();
 
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
index 6c818d320..b9cf28fb7 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
@@ -25,10 +25,10 @@ final readonly class ResourceKindRender implements ChillEntityRenderInterface
     public function renderBox($entity, array $options): string
     {
         return
-            '<span class="resource">' .
+            '<span class="resource">'.
             $this->translatableStringHelper->localize(
                 $entity->getTitle()
-            ) .
+            ).
             '</span>';
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
index 04fdc6ea1..657ed0f53 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
@@ -14,11 +14,7 @@ namespace Chill\PersonBundle\Templating\Entity;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_merge;
-use function array_reverse;
-use function implode;
 
 /**
  * @implements ChillEntityRenderInterface<SocialAction>
@@ -51,7 +47,7 @@ class SocialActionRender implements ChillEntityRenderInterface
 
     public function renderBox($socialAction, array $options): string
     {
-        $options = array_merge(self::DEFAULT_ARGS, $options);
+        $options = \array_merge(self::DEFAULT_ARGS, $options);
         // give some help to twig: an array of parents
         $parents = $this->buildParents($socialAction);
 
@@ -65,7 +61,7 @@ class SocialActionRender implements ChillEntityRenderInterface
     public function renderString($socialAction, array $options): string
     {
         /** @var SocialAction $socialAction */
-        $options = array_merge(self::DEFAULT_ARGS, $options);
+        $options = \array_merge(self::DEFAULT_ARGS, $options);
         $titles = [$this->translatableStringHelper->localize($socialAction->getTitle())];
 
         while ($socialAction->hasParent()) {
@@ -75,12 +71,12 @@ class SocialActionRender implements ChillEntityRenderInterface
             );
         }
 
-        $titles = array_reverse($titles);
+        $titles = \array_reverse($titles);
 
-        $title = implode($options[self::SEPARATOR_KEY], $titles);
+        $title = \implode($options[self::SEPARATOR_KEY], $titles);
 
         if ($options[self::SHOW_AND_CHILDREN] && $socialAction->hasChildren()) {
-            $title .= ' (' . $this->translator->trans($options[self::AND_CHILDREN_MENTION]) . ')';
+            $title .= ' ('.$this->translator->trans($options[self::AND_CHILDREN_MENTION]).')';
         }
 
         return $title;
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
index cbd84170e..af8622f67 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
@@ -14,10 +14,7 @@ namespace Chill\PersonBundle\Templating\Entity;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_reverse;
-use function implode;
 
 /**
  * @implements ChillEntityRenderInterface<SocialIssue>
@@ -75,12 +72,12 @@ final readonly class SocialIssueRender implements ChillEntityRenderInterface
             );
         }
 
-        $titles = array_reverse($titles);
+        $titles = \array_reverse($titles);
 
-        $title = implode($options[self::SEPARATOR_KEY], $titles);
+        $title = \implode($options[self::SEPARATOR_KEY], $titles);
 
         if ($options[self::SHOW_AND_CHILDREN] && $socialIssue->hasChildren()) {
-            $title .= ' (' . $this->translator->trans($options[self::AND_CHILDREN_MENTION]) . ')';
+            $title .= ' ('.$this->translator->trans($options[self::AND_CHILDREN_MENTION]).')';
         }
 
         return $title;
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php
index c12683967..74cf7c83e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php
@@ -19,6 +19,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodConfidentialTest extends WebTestCase
@@ -45,7 +46,7 @@ final class AccompanyingPeriodConfidentialTest extends WebTestCase
      */
     public function testConfidentialInvalid()
     {
-        $this->markTestSkipped("test not written fully");
+        $this->markTestSkipped('test not written fully');
 
         // Disabling this dataprovider to avoid having errors while running the test.
         return yield from [];
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php
index 1ee427e25..021cab706 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php
@@ -22,18 +22,15 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
-use DateTime;
-use DateTimeImmutable;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use ReflectionClass;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonMoveEventSubscriberTest extends KernelTestCase
@@ -51,23 +48,23 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
         $this->forceIdToPeriod($period);
 
         $previousHousehold = (new Household())->addAddress(
-            (new Address())->setValidFrom(new DateTime('1 year ago'))
+            (new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $previousMembership = new HouseholdMember();
         $previousMembership
             ->setPerson($person)
             ->setHousehold($previousHousehold)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $nextHousehold = (new Household())->addAddress(
-            (new Address())->setValidFrom(new DateTime('tomorrow'))
+            (new Address())->setValidFrom(new \DateTime('tomorrow'))
         );
         $nextMembership = new HouseholdMember();
         $nextMembership
             ->setPerson($person)
             ->setHousehold($nextHousehold)
-            ->setStartDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('tomorrow'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -93,23 +90,23 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
         $this->forceIdToPeriod($period);
 
         $previousHousehold = (new Household())->addAddress(
-            ($previousAddress = new Address())->setValidFrom(new DateTime('1 year ago'))
+            ($previousAddress = new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $previousMembership = new HouseholdMember();
         $previousMembership
             ->setPerson($person)
             ->setHousehold($previousHousehold)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $nextHousehold = (new Household())->addAddress(
-            (new Address())->setValidFrom(new DateTime('tomorrow'))
+            (new Address())->setValidFrom(new \DateTime('tomorrow'))
         );
         $nextMembership = new HouseholdMember();
         $nextMembership
             ->setPerson($person)
             ->setHousehold($nextHousehold)
-            ->setStartDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('tomorrow'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -138,23 +135,23 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
         $this->forceIdToPeriod($period);
 
         $previousHousehold = (new Household())->addAddress(
-            ($previousAddress = new Address())->setValidFrom(new DateTime('1 year ago'))
+            ($previousAddress = new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $previousMembership = new HouseholdMember();
         $previousMembership
             ->setPerson($person)
             ->setHousehold($previousHousehold)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $nextHousehold = (new Household())->addAddress(
-            (new Address())->setValidFrom(new DateTime('1 month ago'))
+            (new Address())->setValidFrom(new \DateTime('1 month ago'))
         );
         $nextMembership = new HouseholdMember();
         $nextMembership
             ->setPerson($person)
             ->setHousehold($nextHousehold)
-            ->setStartDate(new DateTimeImmutable('1 month ago'));
+            ->setStartDate(new \DateTimeImmutable('1 month ago'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -183,14 +180,14 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
         $this->forceIdToPeriod($period);
 
         $previousHousehold = (new Household())->addAddress(
-            ($previousAddress = new Address())->setValidFrom(new DateTime('1 year ago'))
+            ($previousAddress = new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $previousMembership = new HouseholdMember();
         $previousMembership
             ->setPerson($person)
             ->setHousehold($previousHousehold)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -221,14 +218,14 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
         $membership
             ->setPerson($person)
             ->setHousehold($household = new Household())
-            ->setStartDate(new DateTimeImmutable('1 year ago'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'));
 
         $previousAddress = new Address();
-        $previousAddress->setValidFrom(new DateTime('6 months ago'));
+        $previousAddress->setValidFrom(new \DateTime('6 months ago'));
         $household->addAddress($previousAddress);
 
         $newAddress = new Address();
-        $newAddress->setValidFrom(new DateTime('tomorrow'));
+        $newAddress->setValidFrom(new \DateTime('tomorrow'));
         $household->addAddress($newAddress);
 
         $event = new PersonAddressMoveEvent($person);
@@ -247,10 +244,10 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
     }
 
     private function buildSubscriber(
-        ?\Twig\Environment $engine = null,
-        ?NotificationPersisterInterface $notificationPersister = null,
-        ?Security $security = null,
-        ?TranslatorInterface $translator = null
+        \Twig\Environment $engine = null,
+        NotificationPersisterInterface $notificationPersister = null,
+        Security $security = null,
+        TranslatorInterface $translator = null
     ): PersonAddressMoveEventSubscriber {
         if (null === $translator) {
             $double = $this->prophesize(TranslatorInterface::class);
@@ -283,7 +280,7 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
 
     private function forceIdToPeriod(AccompanyingPeriod $period): void
     {
-        $reflectionClass = new ReflectionClass($period);
+        $reflectionClass = new \ReflectionClass($period);
         $property = $reflectionClass->getProperty('id');
         $property->setAccessible(true);
         $property->setValue($period, 0);
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjobTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjobTest.php
index 5a5b50dbb..bdfca0d58 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjobTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjobTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\Clock\MockClock;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class AccompanyingPeriodStepChangeCronjobTest extends TestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php
index 182005377..75e3877bc 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php
@@ -18,7 +18,6 @@ use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PrePersistEventArgs;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 use PHPUnit\Framework\TestCase;
@@ -26,6 +25,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends TestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Action/Remove/PersonMoveTest.php b/src/Bundle/ChillPersonBundle/Tests/Action/Remove/PersonMoveTest.php
index 64826930f..a7acdcc82 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Action/Remove/PersonMoveTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Action/Remove/PersonMoveTest.php
@@ -18,14 +18,12 @@ use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\PersonBundle\Actions\Remove\PersonMove;
 use Chill\PersonBundle\Actions\Remove\PersonMoveManager;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Relationships\Relation;
 use Chill\PersonBundle\Entity\Relationships\Relationship;
 use Chill\PersonBundle\Repository\Person\PersonCenterHistoryInterface;
-use Chill\PersonBundle\Repository\PersonRepository;
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -33,6 +31,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class PersonMoveTest extends KernelTestCase
@@ -85,13 +84,13 @@ class PersonMoveTest extends KernelTestCase
     {
         $move = new PersonMove($this->em, $this->personMoveManager, $this->eventDispatcher);
         $sqls = $move->getSQL($personA, $personB);
-        $this->em->getConnection()->transactional(function (Connection $conn) use ($personA, $personB, $sqls) {
+        $this->em->getConnection()->transactional(function (Connection $conn) use ($sqls) {
             foreach ($sqls as $sql) {
                 $conn->executeStatement($sql);
             }
         });
 
-        $personsByIdOfA = $this->em->createQuery("SELECT p FROM " . Person::class . " p WHERE p.id = :id")
+        $personsByIdOfA = $this->em->createQuery('SELECT p FROM '.Person::class.' p WHERE p.id = :id')
             ->setParameter('id', $personA->getId())
             ->getResult();
         $personB = $this->em->find(Person::class, $personB->getId());
@@ -137,13 +136,13 @@ class PersonMoveTest extends KernelTestCase
 
         $move = new PersonMove($this->em, $this->personMoveManager, $this->eventDispatcher);
         $sqls = $move->getSQL($personA, $personB);
-        $this->em->getConnection()->transactional(function (Connection $conn) use ($personA, $personB, $sqls) {
+        $this->em->getConnection()->transactional(function (Connection $conn) use ($sqls) {
             foreach ($sqls as $sql) {
                 $conn->executeStatement($sql);
             }
         });
 
-        $personsByIdOfA = $this->em->createQuery("SELECT p FROM " . Person::class . " p WHERE p.id = :id")
+        $personsByIdOfA = $this->em->createQuery('SELECT p FROM '.Person::class.' p WHERE p.id = :id')
             ->setParameter('id', $personA->getId())
             ->getResult();
         /** @var Person $personB */
@@ -188,7 +187,7 @@ class PersonMoveTest extends KernelTestCase
         self::$entitiesToDelete[] = [Person::class, $personA];
         self::$entitiesToDelete[] = [Person::class, $personB];
 
-        yield [$personA, $personB, "move 2 people without any associated data"];
+        yield [$personA, $personB, 'move 2 people without any associated data'];
 
         $personA = new Person();
         $personB = new Person();
@@ -206,7 +205,7 @@ class PersonMoveTest extends KernelTestCase
         self::$entitiesToDelete[] = [Person::class, $personB];
         self::$entitiesToDelete[] = [Activity::class, $activity];
 
-        yield [$personA, $personB, "move 2 people having an activity"];
+        yield [$personA, $personB, 'move 2 people having an activity'];
 
         $personA = new Person();
         $personB = new Person();
@@ -232,7 +231,7 @@ class PersonMoveTest extends KernelTestCase
         self::$entitiesToDelete[] = [Person::class, $personA];
         self::$entitiesToDelete[] = [Person::class, $personB];
 
-        yield [$personA, $personB, "move 2 people having the same household at the same time"];
+        yield [$personA, $personB, 'move 2 people having the same household at the same time'];
 
         $personA = new Person();
         $personB = new Person();
@@ -249,13 +248,13 @@ class PersonMoveTest extends KernelTestCase
         self::$entitiesToDelete[] = [Person::class, $personB];
         self::$entitiesToDelete[] = [AccompanyingPeriod::class, $parcours];
 
-        yield [$personA, $personB, "move 2 people participating to the same parcours"];
+        yield [$personA, $personB, 'move 2 people participating to the same parcours'];
 
         $personA = new Person();
         $personB = new Person();
         $relationship = new Relationship();
         $relation = new Relation();
-        $user = (new User())->setUsername(uniqid())->setEmail(uniqid() . '@foo.com');
+        $user = (new User())->setUsername(uniqid())->setEmail(uniqid().'@foo.com');
 
         $relationship->setRelation($relation);
         $relationship->setToPerson($personA);
@@ -275,7 +274,7 @@ class PersonMoveTest extends KernelTestCase
         self::$entitiesToDelete[] = [User::class, $user];
         self::$entitiesToDelete[] = [Relationship::class, $relationship];
 
-        yield [$personA, $personB, "move 2 people with a relationship"];
+        yield [$personA, $personB, 'move 2 people with a relationship'];
 
         $this->em->flush();
         $this->em->clear();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
index 4f2d19f54..a23f4ae6e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
@@ -20,24 +20,15 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
-use Iterator;
-use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use function array_map;
-use function array_pop;
-use function array_rand;
-use function count;
-use function in_array;
-use function json_decode;
-use function json_encode;
 
 /**
  * Test api for AccompanyingCourseControllerTest.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingCourseApiControllerTest extends WebTestCase
@@ -62,17 +53,17 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        $period = new AccompanyingPeriod(new DateTime('1 week ago'));
+        $period = new AccompanyingPeriod(new \DateTime('1 week ago'));
         $user = $em->getRepository(User::class)
             ->findOneByUsernameCanonical('center a_social');
         $period->setCreatedBy($user);
-        //$period->setCreatedAt(new \DateTime('yesterday'));
+        // $period->setCreatedAt(new \DateTime('yesterday'));
 
         $center = $em->getRepository(Center::class)
             ->findOneBy(['name' => 'Center A']);
 
-        $personIds = $em->createQuery('SELECT p.id FROM ' .
-            Person::class . ' p JOIN p.centerCurrent cc' .
+        $personIds = $em->createQuery('SELECT p.id FROM '.
+            Person::class.' p JOIN p.centerCurrent cc'.
             ' WHERE cc.center = :center')
             ->setParameter('center', $center)
             ->setMaxResults(100)
@@ -82,7 +73,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         shuffle($personIds);
 
         for ($i = 0; 2 > $i; ++$i) {
-            $person = $em->getRepository(Person::class)->find(array_pop($personIds));
+            $person = $em->getRepository(Person::class)->find(\array_pop($personIds));
             $period->addPerson($person);
         }
 
@@ -147,13 +138,13 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         $nbGenerated = 0;
 
         while ($nbGenerated < $maxGenerated) {
-            $id = array_pop($personIds)['id'];
+            $id = \array_pop($personIds)['id'];
 
             $person = $em->getRepository(Person::class)
                 ->find($id);
             $periods = $person->getAccompanyingPeriods();
 
-            yield [array_pop($personIds)['id'], $periods[array_rand($periods)]->getId()];
+            yield [\array_pop($personIds)['id'], $periods[\array_rand($periods)]->getId()];
 
             ++$nbGenerated;
         }
@@ -211,21 +202,21 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         // create a random order
         shuffle($personIds);
 
-        $socialIssues = $em->createQuery('SELECT s FROM ' .
-            SocialIssue::class . ' s ')
+        $socialIssues = $em->createQuery('SELECT s FROM '.
+            SocialIssue::class.' s ')
             ->setMaxResults(10)
             ->getResult();
 
         $nbGenerated = 0;
 
         while ($nbGenerated < $maxGenerated) {
-            $id = array_pop($personIds)['id'];
+            $id = \array_pop($personIds)['id'];
 
             $person = $em->getRepository(Person::class)
                 ->find($id);
             $periods = $person->getAccompanyingPeriods();
 
-            yield [$periods[array_rand($periods)], $socialIssues[array_rand($socialIssues)]];
+            yield [$periods[\array_rand($periods)], $socialIssues[\array_rand($socialIssues)]];
 
             ++$nbGenerated;
         }
@@ -233,7 +224,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         self::ensureKernelShutdown();
     }
 
-    public function dataGenerateRandomRequestorValidData(): Iterator
+    public function dataGenerateRandomRequestorValidData(): \Iterator
     {
         $dataLength = 2;
         $maxResults = 100;
@@ -275,8 +266,8 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         // create a random order
         shuffle($personIds);
 
-        $thirdPartyIds = $em->createQuery('SELECT t.id FROM ' .
-            ThirdParty::class . ' t ')
+        $thirdPartyIds = $em->createQuery('SELECT t.id FROM '.
+            ThirdParty::class.' t ')
             ->setMaxResults($maxResults)
             ->getScalarResult();
 
@@ -287,15 +278,15 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
 
         while ($i <= $dataLength) {
             $person = $em->getRepository(Person::class)
-                ->find(array_pop($personIds)['id']);
+                ->find(\array_pop($personIds)['id']);
 
-            if (count($person->getAccompanyingPeriods()) === 0) {
+            if (0 === \count($person->getAccompanyingPeriods())) {
                 continue;
             }
 
             $period = $person->getAccompanyingPeriods()[0];
 
-            yield [$period, array_pop($personIds)['id'], array_pop($thirdPartyIds)['id']];
+            yield [$period, \array_pop($personIds)['id'], \array_pop($thirdPartyIds)['id']];
             ++$i;
         }
 
@@ -314,14 +305,14 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
+            \json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $data = json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -332,17 +323,17 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         // check by deownloading the accompanying cours
 
         $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId));
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
         $response = $this->client->getResponse();
-        $data = json_decode((string) $response->getContent(), null, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode((string) $response->getContent(), null, 512, JSON_THROW_ON_ERROR);
 
         // check that the person id is contained
-        $participationsPersonsIds = array_map(
+        $participationsPersonsIds = \array_map(
             static fn ($participation) => $participation->person->id,
             $data->participations
         );
@@ -356,14 +347,14 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
+            \json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $data = json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -386,16 +377,16 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [],
             [],
             [],
-            json_encode(['type' => 'social_issue', 'id' => $si->getId()], JSON_THROW_ON_ERROR)
+            \json_encode(['type' => 'social_issue', 'id' => $si->getId()], JSON_THROW_ON_ERROR)
         );
 
-        $this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
 
-        if ($this->client->getResponse()->getStatusCode() === 422) {
+        if (422 === $this->client->getResponse()->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
-        $data = json_decode((string) $this->client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode((string) $this->client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
         $this->assertArrayHasKey('id', $data);
         $this->assertArrayHasKey('type', $data);
         $this->assertEquals('social_issue', $data['type']);
@@ -406,10 +397,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [],
             [],
             [],
-            json_encode(['type' => 'social_issue', 'id' => $si->getId()], JSON_THROW_ON_ERROR)
+            \json_encode(['type' => 'social_issue', 'id' => $si->getId()], JSON_THROW_ON_ERROR)
         );
 
-        $this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
     }
 
     /**
@@ -421,13 +412,13 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         $client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId));
         $response = $client->getResponse();
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
-        $data = json_decode((string) $response->getContent(), null, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode((string) $response->getContent(), null, 512, JSON_THROW_ON_ERROR);
         $this->assertEquals(
             $data->id,
             $periodId,
@@ -453,13 +444,13 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'accompanying_period', 'emergency' => !$initialValueEmergency], JSON_THROW_ON_ERROR)
+            \json_encode(['type' => 'accompanying_period', 'emergency' => !$initialValueEmergency], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -486,14 +477,14 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'accompanying_period_comment', 'content' => 'this is a text'])
+            \json_encode(['type' => 'accompanying_period_comment', 'content' => 'this is a text'])
         );
         $response = $this->client->getResponse();
-        $data = json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -505,12 +496,12 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'accompanying_period_comment', 'id' => $data['id']], JSON_THROW_ON_ERROR)
+            \json_encode(['type' => 'accompanying_period_comment', 'id' => $data['id']], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $data = json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
     }
 
     /**
@@ -524,9 +515,9 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             sprintf('/api/1.0/person/accompanying-course/%d/confirm.json', $period->getId())
         );
 
-        $this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
 
-        if ($this->client->getResponse()->getStatusCode() === 422) {
+        if (422 === $this->client->getResponse()->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -545,7 +536,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             sprintf('/api/1.0/person/accompanying-course/%d/referrers-suggested.json', $periodId)
         );
 
-        $this->assertTrue(in_array($client->getResponse()->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($client->getResponse()->getStatusCode(), [200, 422], true));
     }
 
     /**
@@ -563,14 +554,14 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
+            \json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $data = json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -590,14 +581,14 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'thirdparty', 'id' => $thirdPartyId], JSON_THROW_ON_ERROR)
+            \json_encode(['type' => 'thirdparty', 'id' => $thirdPartyId], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $data = json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -616,9 +607,9 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId())
         );
         $response = $this->client->getResponse();
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -644,14 +635,14 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'accompanying_period_resource', 'resource' => ['type' => 'person', 'id' => $personId]])
+            \json_encode(['type' => 'accompanying_period_resource', 'resource' => ['type' => 'person', 'id' => $personId]])
         );
         $response = $this->client->getResponse();
-        $data = json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -671,13 +662,13 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId()),
             [],
             [],
-            [], //server
-            json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()], JSON_THROW_ON_ERROR)
+            [], // server
+            \json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -688,14 +679,14 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'accompanying_period_resource', 'resource' => ['type' => 'thirdparty', 'id' => $thirdPartyId]])
+            \json_encode(['type' => 'accompanying_period_resource', 'resource' => ['type' => 'thirdparty', 'id' => $thirdPartyId]])
         );
         $response = $this->client->getResponse();
-        $data = json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -715,11 +706,11 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId()),
             [],
             [],
-            [], //server
-            json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()], JSON_THROW_ON_ERROR)
+            [], // server
+            \json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
     }
 
     public function testShow404()
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
index 35d276c7c..7b6bdd43b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
@@ -16,17 +16,13 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
-use Iterator;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use function array_pop;
-use function count;
-use function preg_match;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingCourseControllerTest extends WebTestCase
@@ -45,28 +41,28 @@ final class AccompanyingCourseControllerTest extends WebTestCase
         self::ensureKernelShutdown();
     }
 
-    public function dataGenerateRandomUsers(): Iterator
+    public function dataGenerateRandomUsers(): \Iterator
     {
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        $period = new AccompanyingPeriod(new DateTime('1 week ago'));
+        $period = new AccompanyingPeriod(new \DateTime('1 week ago'));
         $user = $em->getRepository(User::class)
             ->findOneByUsernameCanonical('center a_social');
         $period->setCreatedBy($user);
-        //$period->setCreatedAt(new \DateTime('yesterday'));
+        // $period->setCreatedAt(new \DateTime('yesterday'));
 
         $center = $em->getRepository(Center::class)
             ->findOneBy(['name' => 'Center A']);
 
-        $personIds = $em->createQuery('SELECT p.id FROM ' .
-            Person::class . ' p JOIN p.centerCurrent cc ' .
+        $personIds = $em->createQuery('SELECT p.id FROM '.
+            Person::class.' p JOIN p.centerCurrent cc '.
             ' WHERE cc.center = :center')
             ->setParameter('center', $center)
             ->setMaxResults(100)
             ->getScalarResult();
 
-        yield [array_pop($personIds), array_pop($personIds)];
+        yield [\array_pop($personIds), \array_pop($personIds)];
 
         self::ensureKernelShutdown();
     }
@@ -78,7 +74,7 @@ final class AccompanyingCourseControllerTest extends WebTestCase
         $this->assertResponseRedirects();
         $location = $this->client->getResponse()->headers->get('Location');
 
-        $this->assertEquals(1, preg_match('|^\\/[^\\/]+\\/parcours/([\\d]+)/edit$|', (string) $location));
+        $this->assertEquals(1, \preg_match('|^\\/[^\\/]+\\/parcours/([\\d]+)/edit$|', (string) $location));
     }
 
     /**
@@ -97,7 +93,7 @@ final class AccompanyingCourseControllerTest extends WebTestCase
         $location = $this->client->getResponse()->headers->get('Location');
         $matches = [];
 
-        $this->assertEquals(1, preg_match('|^\\/[^\\/]+\\/parcours/([\\d]+)/edit$|', (string) $location, $matches));
+        $this->assertEquals(1, \preg_match('|^\\/[^\\/]+\\/parcours/([\\d]+)/edit$|', (string) $location, $matches));
         $id = $matches[1];
 
         $period = self::$container->get(EntityManagerInterface::class)
@@ -106,6 +102,6 @@ final class AccompanyingCourseControllerTest extends WebTestCase
 
         $this->assertNotNull($period);
 
-        $this->assertEquals(2, count($period->getParticipations()));
+        $this->assertEquals(2, \count($period->getParticipations()));
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
index bf32935f3..9d8fa2321 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
@@ -13,11 +13,8 @@ namespace Chill\PersonBundle\Tests\Controller;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
 use Doctrine\Common\Collections\Criteria;
-use LogicalException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use function array_key_exists;
 
 /**
  * Test the creation or deletion of accompanying periods.
@@ -26,6 +23,7 @@ use function array_key_exists;
  * closed) starting the 2015-01-05.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodControllerTest extends WebTestCase
@@ -74,7 +72,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
         $center = self::$em->getRepository(\Chill\MainBundle\Entity\Center::class)
             ->findOneBy(['name' => 'Center A']);
 
-        $this->person = (new Person(new DateTime('2015-01-05')))
+        $this->person = (new Person(new \DateTime('2015-01-05')))
             ->setFirstName('Roland')
             ->setLastName('Gallorime')
             ->setCenter($center)
@@ -108,7 +106,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
     public function testAddNewPeriodBeforeActual()
     {
         $crawler = $this->client->request('GET', '/fr/person/'
-              . $this->person->getId() . '/accompanying-period/create');
+              .$this->person->getId().'/accompanying-period/create');
 
         $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();
         $form->get(self::CLOSING_MOTIVE_INPUT)
@@ -122,7 +120,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
 
         $this->assertTrue(
             $this->client->getResponse()->isRedirect(
-                '/fr/person/' . $this->person->getId() . '/accompanying-period'
+                '/fr/person/'.$this->person->getId().'/accompanying-period'
             ),
             'the server redirects to /accompanying-period page'
         );
@@ -149,20 +147,20 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
     public function testClosingCurrentPeriod()
     {
         $crawler = $this->client->request('GET', '/fr/person/'
-              . $this->person->getId() . '/accompanying-period/close');
+              .$this->person->getId().'/accompanying-period/close');
 
         $form = $crawler->selectButton('Clôre la période')->form();
 
         $form->get(self::CLOSING_MOTIVE_INPUT)
             ->setValue($this->getLastValueOnClosingMotive($form));
         $form->get(self::CLOSING_INPUT)
-            ->setValue((new DateTime('2015-02-01'))->format('d-m-Y'));
+            ->setValue((new \DateTime('2015-02-01'))->format('d-m-Y'));
 
         $cr = $this->client->submit($form);
 
         $this->assertTrue(
             $this->client->getResponse()->isRedirect(
-                '/fr/person/' . $this->person->getId() . '/accompanying-period'
+                '/fr/person/'.$this->person->getId().'/accompanying-period'
             ),
             'the server redirects to /accompanying-period page'
         );
@@ -189,14 +187,14 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
     public function testClosingCurrentPeriodWithDateClosingBeforeOpeningFails()
     {
         $crawler = $this->client->request('GET', '/fr/person/'
-              . $this->person->getId() . '/accompanying-period/close');
+              .$this->person->getId().'/accompanying-period/close');
 
         $form = $crawler->selectButton('Clôre la période')->form();
 
         $form->get(self::CLOSING_MOTIVE_INPUT)
             ->setValue($this->getLastValueOnClosingMotive($form));
         $form->get(self::CLOSING_INPUT)
-            ->setValue((new DateTime('2014-01-01'))->format('d-m-Y'));
+            ->setValue((new \DateTime('2014-01-01'))->format('d-m-Y'));
 
         $crawlerResponse = $this->client->submit($form);
 
@@ -236,7 +234,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
         ]);
 
         $crawler = $this->client->request('GET', '/fr/person/'
-              . $this->person->getId() . '/accompanying-period/create');
+              .$this->person->getId().'/accompanying-period/create');
 
         $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();
         $form->get(self::CLOSING_MOTIVE_INPUT)
@@ -272,11 +270,11 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
      */
     public function testCreatePeriodWithClosingAfterCurrentFails(): never
     {
-        $this->markTestSkipped('Multiple period may now cover. This test is kept ' .
+        $this->markTestSkipped('Multiple period may now cover. This test is kept '.
             'in case of a configuration may add this feature again');
 
         $crawler = $this->client->request('GET', '/fr/person/'
-              . $this->person->getId() . '/accompanying-period/create');
+              .$this->person->getId().'/accompanying-period/create');
 
         $form = $crawler->selectButton("Créer une période d'accompagnement")->form();
         $form->get(self::CLOSING_MOTIVE_INPUT)
@@ -312,7 +310,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
     public function testCreatePeriodWithClosingBeforeOpeningFails()
     {
         $crawler = $this->client->request('GET', '/fr/person/'
-              . $this->person->getId() . '/accompanying-period/create');
+              .$this->person->getId().'/accompanying-period/create');
 
         $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();
         $form->get(self::CLOSING_MOTIVE_INPUT)
@@ -358,7 +356,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
         ]);
 
         $crawler = $this->client->request('GET', '/fr/person/'
-              . $this->person->getId() . '/accompanying-period/create');
+              .$this->person->getId().'/accompanying-period/create');
 
         $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();
         $form->get(self::CLOSING_MOTIVE_INPUT)
@@ -404,7 +402,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
         ]);
 
         $crawler = $this->client->request('GET', '/fr/person/'
-              . $this->person->getId() . '/accompanying-period/create');
+              .$this->person->getId().'/accompanying-period/create');
 
         $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();
         $form->get(self::CLOSING_MOTIVE_INPUT)
@@ -440,11 +438,11 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
      */
     public function testCreatePeriodWithOpeningAndClosingAfterCurrentFails(): never
     {
-        $this->markTestSkipped('Multiple period may now cover. This test is kept ' .
+        $this->markTestSkipped('Multiple period may now cover. This test is kept '.
             'in case of a configuration may add this feature again');
 
         $crawler = $this->client->request('GET', '/fr/person/'
-              . $this->person->getId() . '/accompanying-period/create');
+              .$this->person->getId().'/accompanying-period/create');
 
         $form = $crawler->selectButton("Créer une période d'accompagnement")->form();
         $form->get(self::CLOSING_MOTIVE_INPUT)
@@ -489,7 +487,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
 
         // close the current period
         $period = $this->person->getOpenedAccompanyingPeriod();
-        $period->setClosingDate(new DateTime('2015-02-05'));
+        $period->setClosingDate(new \DateTime('2015-02-05'));
         $this->person->close($period);
 
         $this->generatePeriods([
@@ -503,7 +501,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
         $periods = $this->person->getAccompanyingPeriodsOrdered();
         /** @var Criteria $criteria */
         $criteria = Criteria::create();
-        //$criteria->where(Criteria::expr()->eq('openingDate', \DateTime::createFromFormat()))
+        // $criteria->where(Criteria::expr()->eq('openingDate', \DateTime::createFromFormat()))
         $firstPeriod = reset($periods);
         $lastPeriod = end($periods);
 
@@ -546,15 +544,14 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
     protected function generatePeriods(array $periods)
     {
         foreach ($periods as $periodDef) {
-            $period = new AccompanyingPeriod(new DateTime($periodDef['openingDate']));
+            $period = new AccompanyingPeriod(new \DateTime($periodDef['openingDate']));
 
-            if (array_key_exists('closingDate', $periodDef)) {
-                if (!array_key_exists('closingMotive', $periodDef)) {
-                    throw new LogicalException('you must define a closing '
-                          . 'motive into your periods fixtures');
+            if (\array_key_exists('closingDate', $periodDef)) {
+                if (!\array_key_exists('closingMotive', $periodDef)) {
+                    throw new \LogicalException('you must define a closing motive into your periods fixtures');
                 }
 
-                $period->setClosingDate(new DateTime($periodDef['closingDate']))
+                $period->setClosingDate(new \DateTime($periodDef['closingDate']))
                     ->setClosingMotive($periodDef['closingMotive']);
             }
 
@@ -571,7 +568,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
      * @var \Symfony\Component\DomCrawler\Form The form
      *
      * @return Chill\PersonBundle\Entity\AccompanyingPeriod The last value of closing
-     * motive
+     *                                                      motive
      */
     protected function getLastValueOnClosingMotive(\Symfony\Component\DomCrawler\Form $form)
     {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodRegulationListControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodRegulationListControllerTest.php
index 80b73673b..be056598d 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodRegulationListControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodRegulationListControllerTest.php
@@ -16,6 +16,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodRegulationListControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
index e98539de5..b5e468032 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
@@ -15,22 +15,16 @@ use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\AddressReference;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Test\PrepareClientTrait;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use function array_map;
-use function array_pop;
-use function random_int;
-use function shuffle;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdApiControllerTest extends WebTestCase
@@ -64,11 +58,11 @@ final class HouseholdApiControllerTest extends WebTestCase
             ->getQuery()->getSingleScalarResult();
 
         if (0 === $nbReference) {
-            throw new RuntimeException('any reference found. Add a reference in database to perform this test');
+            throw new \RuntimeException('any reference found. Add a reference in database to perform this test');
         }
 
         $reference = $em->createQueryBuilder()->select('ar')->from(AddressReference::class, 'ar')
-            ->setFirstResult(random_int(0, $nbReference - 1))
+            ->setFirstResult(\random_int(0, $nbReference - 1))
             ->setMaxResults(1)
             ->getQuery()->getSingleResult();
 
@@ -79,14 +73,14 @@ final class HouseholdApiControllerTest extends WebTestCase
         $em->persist($p);
         $h = new Household();
         $h->addMember($m = (new HouseholdMember())->setPerson($p));
-        $h->addAddress($a = Address::createFromAddressReference($reference)->setValidFrom(new DateTime('today')));
+        $h->addAddress($a = Address::createFromAddressReference($reference)->setValidFrom(new \DateTime('today')));
         $em->persist($a);
         $em->persist($m);
         $em->persist($h);
 
         $em->flush();
 
-        $this->toDelete = $this->toDelete + [
+        $this->toDelete += [
             [HouseholdMember::class, $m->getId()],
             [User::class, $p->getId()],
             [Household::class, $h->getId()],
@@ -119,13 +113,13 @@ final class HouseholdApiControllerTest extends WebTestCase
             ->getQuery()
             ->getResult();
 
-        shuffle($householdIds);
+        \shuffle($householdIds);
 
-        yield [array_pop($householdIds)['id']];
+        yield [\array_pop($householdIds)['id']];
 
-        yield [array_pop($householdIds)['id']];
+        yield [\array_pop($householdIds)['id']];
 
-        yield [array_pop($householdIds)['id']];
+        yield [\array_pop($householdIds)['id']];
 
         self::ensureKernelShutdown();
     }
@@ -138,7 +132,7 @@ final class HouseholdApiControllerTest extends WebTestCase
             ->createQueryBuilder();
 
         $personIds = $qb
-            ->select("p.id AS pid")
+            ->select('p.id AS pid')
             ->from(Person::class, 'p')
             ->where(
                 $qb->expr()->gte('SIZE(p.accompanyingPeriodParticipations)', 2)
@@ -169,7 +163,7 @@ final class HouseholdApiControllerTest extends WebTestCase
         $this->assertArrayHasKey('count', $data);
         $this->assertArrayHasKey('results', $data);
 
-        $householdIds = array_map(static fn ($r) => $r['id'], $data['results']);
+        $householdIds = \array_map(static fn ($r) => $r['id'], $data['results']);
 
         $this->assertContains($expectedHouseholdId, $householdIds);
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
index 702c4f2b6..d11f50ac4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
@@ -13,17 +13,14 @@ namespace Chill\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\Household\Household;
-use DateInterval;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use function array_pop;
-use function shuffle;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdControllerTest extends WebTestCase
@@ -48,7 +45,7 @@ final class HouseholdControllerTest extends WebTestCase
         $em = self::$container->get(EntityManagerInterface::class);
 
         $ids = $em->createQuery(
-            sprintf("SELECT DISTINCT h.id FROM %s h JOIN h.members m JOIN m.person p JOIN p.centerHistory ch JOIN ch.center c WHERE c.name = :center AND ch.endDate IS NULL", Household::class)
+            sprintf('SELECT DISTINCT h.id FROM %s h JOIN h.members m JOIN m.person p JOIN p.centerHistory ch JOIN ch.center c WHERE c.name = :center AND ch.endDate IS NULL', Household::class)
         )
             ->setParameter('center', 'Center A')
             ->setMaxResults(100)
@@ -58,13 +55,13 @@ final class HouseholdControllerTest extends WebTestCase
             throw new \RuntimeException('no household ids with center "Center A"');
         }
 
-        shuffle($ids);
+        \shuffle($ids);
 
-        yield [array_pop($ids)['id']];
+        yield [\array_pop($ids)['id']];
 
-        yield [array_pop($ids)['id']];
+        yield [\array_pop($ids)['id']];
 
-        yield [array_pop($ids)['id']];
+        yield [\array_pop($ids)['id']];
 
         self::ensureKernelShutdown();
     }
@@ -117,8 +114,8 @@ final class HouseholdControllerTest extends WebTestCase
 
         $form['household[commentMembers][comment]'] = 'This is a text **generated** by automatic tests';
         $form['household[waitingForBirth]']->tick();
-        $form['household[waitingForBirthDate]'] = (new DateTime('today'))
-            ->add(new DateInterval('P1M'))->format('Y-m-d');
+        $form['household[waitingForBirthDate]'] = (new \DateTime('today'))
+            ->add(new \DateInterval('P1M'))->format('Y-m-d');
 
         $this->client->submit($form);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
index bb700602f..aaaeefd81 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
@@ -16,34 +16,26 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\ORM\EntityManagerInterface;
-use Iterator;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use function array_pop;
-use function count;
-use function json_decode;
-use function json_encode;
-use function random_int;
-use function shuffle;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdMemberControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
-    public function provideValidDataEditMember(): Iterator
+    public function provideValidDataEditMember(): \Iterator
     {
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        $membershipIds = $em->createQuery(sprintf("SELECT m.id FROM %s m JOIN m.person p JOIN p.centerHistory ch JOIN ch.center c WHERE c.name = :center AND m.endDate IS NULL AND ch.endDate IS NULL", HouseholdMember::class))
+        $membershipIds = $em->createQuery(sprintf('SELECT m.id FROM %s m JOIN m.person p JOIN p.centerHistory ch JOIN ch.center c WHERE c.name = :center AND m.endDate IS NULL AND ch.endDate IS NULL', HouseholdMember::class))
             ->setParameter('center', 'Center A')
             ->getScalarResult();
 
@@ -51,19 +43,19 @@ final class HouseholdMemberControllerTest extends WebTestCase
             throw new \RuntimeException("no memberships for person associated to 'Center A'");
         }
 
-        shuffle($membershipIds);
+        \shuffle($membershipIds);
 
-        yield [array_pop($membershipIds)['id']];
+        yield [\array_pop($membershipIds)['id']];
     }
 
-    public function provideValidDataMove(): Iterator
+    public function provideValidDataMove(): \Iterator
     {
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
-        $yesterday = new DateTimeImmutable('yesterday');
+        $yesterday = new \DateTimeImmutable('yesterday');
 
         $personIds = $em->createQuery(
-            sprintf("SELECT p.id FROM %s p JOIN p.centerHistory ch JOIN ch.center c WHERE c.name = :center AND ch.endDate IS NULL", Person::class)
+            sprintf('SELECT p.id FROM %s p JOIN p.centerHistory ch JOIN ch.center c WHERE c.name = :center AND ch.endDate IS NULL', Person::class)
         )
             ->setParameter('center', 'Center A')
             ->setMaxResults(100)
@@ -73,20 +65,20 @@ final class HouseholdMemberControllerTest extends WebTestCase
             throw new \RuntimeException('no person associated with "Center A"');
         }
 
-        shuffle($personIds);
+        \shuffle($personIds);
 
         $household = new Household();
         $em->persist($household);
         $em->flush();
 
-        $positions = $em->createQuery('SELECT pos.id FROM ' . Position::class . ' pos ' .
+        $positions = $em->createQuery('SELECT pos.id FROM '.Position::class.' pos '.
             'WHERE pos.shareHouseHold = TRUE')
             ->getResult();
 
         $i = 0;
 
         do {
-            $id = array_pop($personIds)['id'];
+            $id = \array_pop($personIds)['id'];
             $person = self::$container->get(EntityManagerInterface::class)
                 ->getRepository(Person::class)
                 ->find($id);
@@ -103,8 +95,8 @@ final class HouseholdMemberControllerTest extends WebTestCase
                 yield [
                     $id,
                     $household->getId(),
-                    $positions[random_int(0, count($positions) - 1)]['id'],
-                    new DateTimeImmutable('tomorrow'),
+                    $positions[\random_int(0, \count($positions) - 1)]['id'],
+                    new \DateTimeImmutable('tomorrow'),
                 ];
             }
         } while (1 >= $i);
@@ -135,7 +127,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
     /**
      * @dataProvider provideValidDataMove
      */
-    public function testLeaveWithoutHousehold(mixed $personId, mixed $householdId, mixed $positionId, DateTimeInterface $date)
+    public function testLeaveWithoutHousehold(mixed $personId, mixed $householdId, mixed $positionId, \DateTimeInterface $date)
     {
         $client = $this->getClientAuthenticated();
 
@@ -145,7 +137,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server
-            json_encode(
+            \json_encode(
                 [
                     'concerned' => [
                         [
@@ -154,7 +146,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
                                 'id' => $personId,
                             ],
                             'start_date' => [
-                                'datetime' => $date->format(DateTimeInterface::RFC3339),
+                                'datetime' => $date->format(\DateTimeInterface::RFC3339),
                             ],
                             'position' => [
                                 'type' => 'household_position',
@@ -175,7 +167,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
             $client->getResponse()->getStatusCode()
         );
 
-        $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
         $this->assertEquals(null, $data);
     }
@@ -183,7 +175,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
     /**
      * @dataProvider provideValidDataMove
      */
-    public function testMoveMember(mixed $personId, mixed $householdId, mixed $positionId, DateTimeInterface $date)
+    public function testMoveMember(mixed $personId, mixed $householdId, mixed $positionId, \DateTimeInterface $date)
     {
         $client = $this->getClientAuthenticated();
 
@@ -193,7 +185,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server
-            json_encode(
+            \json_encode(
                 [
                     'concerned' => [
                         [
@@ -202,7 +194,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
                                 'id' => $personId,
                             ],
                             'start_date' => [
-                                'datetime' => $date->format(DateTimeInterface::RFC3339),
+                                'datetime' => $date->format(\DateTimeInterface::RFC3339),
                             ],
                             'position' => [
                                 'type' => 'household_position',
@@ -230,7 +222,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
     /**
      * @dataProvider provideValidDataMove
      */
-    public function testMoveMemberToNewHousehold(mixed $personId, mixed $householdId, mixed $positionId, DateTimeInterface $date)
+    public function testMoveMemberToNewHousehold(mixed $personId, mixed $householdId, mixed $positionId, \DateTimeInterface $date)
     {
         $client = $this->getClientAuthenticated();
 
@@ -240,7 +232,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server
-            json_encode(
+            \json_encode(
                 [
                     'concerned' => [
                         [
@@ -249,7 +241,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
                                 'id' => $personId,
                             ],
                             'start_date' => [
-                                'datetime' => $date->format(DateTimeInterface::RFC3339),
+                                'datetime' => $date->format(\DateTimeInterface::RFC3339),
                             ],
                             'position' => [
                                 'type' => 'household_position',
@@ -272,14 +264,14 @@ final class HouseholdMemberControllerTest extends WebTestCase
             $client->getResponse()->getStatusCode()
         );
 
-        $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
         $this->assertIsArray($data);
         $this->assertArrayHasKey('members', $data);
         $this->assertIsArray($data['members']);
         $this->assertEquals(
             1,
-            count($data['members']),
+            \count($data['members']),
             'assert new household count one member'
         );
         $this->assertArrayHasKey('person', $data['members'][0]);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php
index 44965a51f..14c6e30fa 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php
@@ -16,6 +16,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonAddressControllerTest extends WebTestCase
@@ -91,8 +92,8 @@ final class PersonAddressControllerTest extends WebTestCase
      */
     public function testCreateAddress()
     {
-        $crawler = $this->client->request('GET', '/fr/person/' .
-                self::$person->getId() . '/address/new');
+        $crawler = $this->client->request('GET', '/fr/person/'.
+                self::$person->getId().'/address/new');
 
         $this->assertTrue($this->client->getResponse()->isSuccessful());
 
@@ -134,8 +135,8 @@ final class PersonAddressControllerTest extends WebTestCase
 
     public function testEmptyList()
     {
-        $crawler = $this->client->request('GET', '/fr/person/' .
-                self::$person->getId() . '/address/list');
+        $crawler = $this->client->request('GET', '/fr/person/'.
+                self::$person->getId().'/address/list');
 
         $this->assertTrue($this->client->getResponse()->isSuccessful());
 
@@ -155,8 +156,8 @@ final class PersonAddressControllerTest extends WebTestCase
         $this->refreshPerson();
         $address = self::$person->getLastAddress();
 
-        $crawler = $this->client->request('GET', '/fr/person/' . self::$person->getId()
-                . '/address/' . $address->getId() . '/edit');
+        $crawler = $this->client->request('GET', '/fr/person/'.self::$person->getId()
+                .'/address/'.$address->getId().'/edit');
 
         $this->assertTrue($this->client->getResponse()->isSuccessful());
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php
index b2f3215b4..9171277f7 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php
@@ -14,60 +14,57 @@ namespace Chill\PersonBundle\Tests\Controller;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
-use Iterator;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use function array_pop;
-use function json_decode;
-use function shuffle;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonApiControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
-    public function dataGetPersonFromCenterA(): Iterator
+    public function dataGetPersonFromCenterA(): \Iterator
     {
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
         $personIds = $em->createQuery(sprintf(
-            "SELECT p.id FROM %s p JOIN p.centerCurrent pc JOIN pc.center c WHERE c.name = :center",
+            'SELECT p.id FROM %s p JOIN p.centerCurrent pc JOIN pc.center c WHERE c.name = :center',
             Person::class
         ))
             ->setParameter('center', 'Center A')
             ->setMaxResults(100)
             ->getScalarResult();
 
-        shuffle($personIds);
+        \shuffle($personIds);
 
-        yield array_pop($personIds);
+        yield \array_pop($personIds);
 
-        yield array_pop($personIds);
+        yield \array_pop($personIds);
 
-        yield array_pop($personIds);
+        yield \array_pop($personIds);
 
-        yield array_pop($personIds);
+        yield \array_pop($personIds);
     }
 
-    public function dataGetPersonFromCenterB(): Iterator
+    public function dataGetPersonFromCenterB(): \Iterator
     {
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
         $personIds = $em->createQuery(
-            sprintf("SELECT p.id FROM %s p JOIN p.centerCurrent pc JOIN pc.center c WHERE c.name = :center", Person::class)
+            sprintf('SELECT p.id FROM %s p JOIN p.centerCurrent pc JOIN pc.center c WHERE c.name = :center', Person::class)
         )
             ->setParameter('center', 'Center B')
             ->setMaxResults(100)
             ->getScalarResult();
 
-        shuffle($personIds);
+        \shuffle($personIds);
 
-        yield array_pop($personIds);
+        yield \array_pop($personIds);
 
-        yield array_pop($personIds);
+        yield \array_pop($personIds);
     }
 
     /**
@@ -107,7 +104,7 @@ final class PersonApiControllerTest extends WebTestCase
 
         $this->assertResponseIsSuccessful();
 
-        $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
         $this->assertArrayHasKey('type', $data);
         $this->assertArrayHasKey('id', $data);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
index b532b0dba..572374bc1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
@@ -12,18 +12,16 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\DomCrawler\Form;
-use function count;
-use function in_array;
 
 /**
  * Test creation and deletion for persons.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PersonControllerCreateTest extends WebTestCase
@@ -51,7 +49,7 @@ final class PersonControllerCreateTest extends WebTestCase
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        //remove two people created during test
+        // remove two people created during test
         $jesus = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)
             ->findOneBy(['firstName' => 'God']);
 
@@ -120,15 +118,15 @@ final class PersonControllerCreateTest extends WebTestCase
         );
         $this->assertEquals(
             3,
-            count($genderType->availableOptionValues()),
+            \count($genderType->availableOptionValues()),
             'The gender input has three options: man, women and undefined'
         );
         $this->assertTrue(
-            in_array('man', $genderType->availableOptionValues(), true),
+            \in_array('man', $genderType->availableOptionValues(), true),
             'gender has "homme" option'
         );
         $this->assertTrue(
-            in_array('woman', $genderType->availableOptionValues(), true),
+            \in_array('woman', $genderType->availableOptionValues(), true),
             'gender has "femme" option'
         );
         $this->assertFalse($genderType->hasValue(), 'The gender input is not checked');
@@ -143,11 +141,11 @@ final class PersonControllerCreateTest extends WebTestCase
 
         $crawler = $client->request('GET', '/fr/person/new');
 
-        //test the page is loaded before continuing
+        // test the page is loaded before continuing
         $this->assertTrue($client->getResponse()->isSuccessful());
 
         $form = $crawler->selectButton("Créer l'usager")->form();
-        $form = $this->fillAValidCreationForm($form, 'Charline', 'dd', new DateTime('1970-10-15'));
+        $form = $this->fillAValidCreationForm($form, 'Charline', 'dd', new \DateTime('1970-10-15'));
         $client->submit($form);
 
         $this->assertStringContainsString(
@@ -156,7 +154,7 @@ final class PersonControllerCreateTest extends WebTestCase
             'check that the page has detected the lastname of a person existing in database'
         );
 
-        //inversion
+        // inversion
         $form = $crawler->selectButton("Créer l'usager")->form();
         $form = $this->fillAValidCreationForm($form, 'dd', 'Charline');
         $client->submit($form);
@@ -224,12 +222,12 @@ final class PersonControllerCreateTest extends WebTestCase
         Form &$creationForm,
         string $firstname = 'God',
         string $lastname = 'Jesus',
-        ?DateTime $birthdate = null
+        \DateTime $birthdate = null
     ) {
-        $creationForm->get(self::FIRSTNAME_INPUT)->setValue($firstname . '_' . uniqid());
-        $creationForm->get(self::LASTNAME_INPUT)->setValue($lastname . '_' . uniqid());
+        $creationForm->get(self::FIRSTNAME_INPUT)->setValue($firstname.'_'.uniqid());
+        $creationForm->get(self::LASTNAME_INPUT)->setValue($lastname.'_'.uniqid());
         $creationForm->get(self::GENDER_INPUT)->select('man');
-        $date = $birthdate ?? new DateTime('1947-02-01');
+        $date = $birthdate ?? new \DateTime('1947-02-01');
         $creationForm->get(self::BIRTHDATE_INPUT)->setValue($date->format('Y-m-d'));
 
         return $creationForm;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
index d21a5fdc2..d1ef1f1c9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
@@ -16,9 +16,7 @@ use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
-use Closure;
 use Doctrine\ORM\EntityManagerInterface;
-use PHPUnit\Framework\Constraint\StringContains;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
@@ -28,6 +26,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  * As I am logged in as "center a_social"
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PersonControllerUpdateTest extends WebTestCase
@@ -157,7 +156,7 @@ final class PersonControllerUpdateTest extends WebTestCase
 
         $alerts = $crawler->filter('.alert-danger');
 
-        self::assertEquals(1, $alerts->count(), "there is an alert message displayed on the page");
+        self::assertEquals(1, $alerts->count(), 'there is an alert message displayed on the page');
     }
 
     public static function providePerson(): iterable
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
index 27be1dffa..d23fbcb7a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
@@ -11,10 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Controller;
 
-//ini_set('memory_limit', '-1');
+// ini_set('memory_limit', '-1');
 
 use Chill\PersonBundle\Entity\Person;
-use Closure;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
@@ -23,6 +22,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  * As I am logged in as "center a_social"
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
@@ -63,8 +63,8 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
         $this->em->persist($this->person);
         $this->em->flush();
 
-        $this->editUrl = '/en/person/' . $this->person->getId() . '/general/edit';
-        $this->viewUrl = '/en/person/' . $this->person->getId() . '/general';
+        $this->editUrl = '/en/person/'.$this->person->getId().'/general/edit';
+        $this->viewUrl = '/en/person/'.$this->person->getId().'/general';
 
         $this->client = self::createClient(
             [
@@ -109,13 +109,13 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
      * @param string $field
      * @param string $value
      */
-    public function testEditTextField($field, $value, Closure $callback)
+    public function testEditTextField($field, $value, \Closure $callback)
     {
         $crawler = $this->client->request('GET', $this->editUrl);
 
         $form = $crawler->selectButton('Submit')
             ->form();
-        //transform countries into value if needed
+        // transform countries into value if needed
         switch ($field) {
             case 'nationality':
             case 'countryOfBirth':
@@ -133,7 +133,7 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
                 $transformedValue = $value;
         }
 
-        $form->get('chill_personbundle_person[' . $field . ']')
+        $form->get('chill_personbundle_person['.$field.']')
             ->setValue($transformedValue);
 
         $this->client->submit($form);
@@ -146,7 +146,7 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
         $this->assertEquals(
             $value,
             $callback($this->person),
-            'the value ' . $field . ' is updated in db'
+            'the value '.$field.' is updated in db'
         );
 
         $crawler = $this->client->followRedirect();
@@ -160,7 +160,7 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
                 || 'gender' === $field) {
             // we do not perform test on the web page contents.
         } else {
-            $this->assertGreaterThan(0, $crawler->filter('html:contains("' . $value . '")')->count());
+            $this->assertGreaterThan(0, $crawler->filter('html:contains("'.$value.'")')->count());
         }
     }
 
@@ -175,10 +175,10 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
 
         $configurables = ['placeOfBirth', 'phonenumber', 'email',
             'countryOfBirth', 'nationality', 'spokenLanguages', 'maritalStatus', ];
-        $form = $crawler->selectButton('Submit')->form(); //;
+        $form = $crawler->selectButton('Submit')->form(); // ;
 
         foreach ($configurables as $key) {
-            $this->assertFalse($form->has('chill_personbundle_person[' . $key . ']'));
+            $this->assertFalse($form->has('chill_personbundle_person['.$key.']'));
         }
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
index ff9e36446..8c1a397aa 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
@@ -19,6 +19,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonControllerViewTest extends WebTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
index 6c74de23e..e0d56204f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
@@ -16,6 +16,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonControllerViewWithHiddenFieldsTest extends WebTestCase
@@ -31,26 +32,26 @@ final class PersonControllerViewWithHiddenFieldsTest extends WebTestCase
 
     protected function setUp(): void
     {
-        /**
-        self::bootKernel(['environment' => 'test_with_hidden_fields']);
-
-        $this->em = self::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager');
-
-        $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class)
-            ->findOneBy(['name' => 'Center A']);
-
-        $this->person = (new Person())
-            ->setLastName('Tested Person')
-            ->setFirstName('Réginald')
-            ->setCenter($center)
-            ->setGender(Person::MALE_GENDER);
-
-        $this->em->persist($this->person);
-        $this->em->flush();
-
-        $this->viewUrl = '/en/person/' . $this->person->getId() . '/general';
-        */
+        /*
+         * self::bootKernel(['environment' => 'test_with_hidden_fields']);
+         *
+         * $this->em = self::$kernel->getContainer()
+         * ->get('doctrine.orm.entity_manager');
+         *
+         * $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class)
+         * ->findOneBy(['name' => 'Center A']);
+         *
+         * $this->person = (new Person())
+         * ->setLastName('Tested Person')
+         * ->setFirstName('Réginald')
+         * ->setCenter($center)
+         * ->setGender(Person::MALE_GENDER);
+         *
+         * $this->em->persist($this->person);
+         * $this->em->flush();
+         *
+         * $this->viewUrl = '/en/person/' . $this->person->getId() . '/general';
+         */
     }
 
     protected function tearDown(): void
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
index 4432bd9e1..38e482fe9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonDuplicateControllerViewTest extends WebTestCase
@@ -62,7 +63,6 @@ final class PersonDuplicateControllerViewTest extends WebTestCase
 
     /**
      * @dataProvider providePersonData
-     * @return void
      */
     public function testViewDuplicatePerson(int $personId, int $person2Id): void
     {
@@ -71,7 +71,7 @@ final class PersonDuplicateControllerViewTest extends WebTestCase
             'PHP_AUTH_PW' => 'password',
         ]);
 
-        $crawler = $client->request('GET', '/en/person/' . $personId . '/duplicate/view');
+        $crawler = $client->request('GET', '/en/person/'.$personId.'/duplicate/view');
         $response = $client->getResponse();
         $this->assertTrue($response->isSuccessful());
 
@@ -79,14 +79,14 @@ final class PersonDuplicateControllerViewTest extends WebTestCase
         $this->assertGreaterThan(0, $crawler->filter('html:contains("Réginal")')->count());
         $this->assertGreaterThan(0, $crawler->filter('html:contains("Réginald")')->count());
 
-        $crawler = $client->request('GET', '/en/person/' . $personId . '/duplicate/' . $person2Id . '/confirm');
+        $crawler = $client->request('GET', '/en/person/'.$personId.'/duplicate/'.$person2Id.'/confirm');
         $response = $client->getResponse();
         $this->assertTrue($response->isSuccessful());
 
         $this->assertGreaterThan(0, $crawler->filter('html:contains("Old person")')->count());
         $this->assertGreaterThan(0, $crawler->filter('html:contains("New person")')->count());
 
-        $crawler = $client->request('POST', '/en/person/' . $personId . '/duplicate/' . $person2Id . '/confirm', [
+        $crawler = $client->request('POST', '/en/person/'.$personId.'/duplicate/'.$person2Id.'/confirm', [
             'chill_personbundle_person_confirm_duplicate[confirm]' => 1,
         ]);
         $response = $client->getResponse();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php
index 5bcfd3967..7e191b91e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php
@@ -17,12 +17,10 @@ use Chill\PersonBundle\Entity\Relationships\Relation;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use function array_rand;
-use function json_encode;
-use function random_int;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RelationshipApiControllerTest extends WebTestCase
@@ -63,7 +61,7 @@ final class RelationshipApiControllerTest extends WebTestCase
             ->setParameter('name', 'Center A')
             ->getQuery()
             ->setMaxResults(1)
-            ->setFirstResult(random_int(0, $countPersons - 1))
+            ->setFirstResult(\random_int(0, $countPersons - 1))
             ->getSingleResult();
 
         self::ensureKernelShutdown();
@@ -96,7 +94,7 @@ final class RelationshipApiControllerTest extends WebTestCase
             ->setParameter('name', 'Center A')
             ->getQuery()
             ->setMaxResults(2)
-            ->setFirstResult(random_int(0, $countPersons - 1))
+            ->setFirstResult(\random_int(0, $countPersons - 1))
             ->getResult();
 
         self::ensureKernelShutdown();
@@ -132,7 +130,7 @@ final class RelationshipApiControllerTest extends WebTestCase
             [],
             [],
             [],
-            json_encode([
+            \json_encode([
                 'type' => 'relationship',
                 'fromPerson' => ['id' => $fromPersonId, 'type' => 'person'],
                 'toPerson' => ['id' => $toPersonId, 'type' => 'person'],
@@ -152,6 +150,6 @@ final class RelationshipApiControllerTest extends WebTestCase
                 ->findAll();
         }
 
-        return $this->relations[array_rand($this->relations)];
+        return $this->relations[\array_rand($this->relations)];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php
index 6c0a66b34..c7ca4c4bb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php
@@ -14,12 +14,10 @@ namespace Chill\PersonBundle\Tests\Controller;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use function array_pop;
-use function count;
-use function json_decode;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialIssueApiControllerTest extends WebTestCase
@@ -38,14 +36,14 @@ final class SocialIssueApiControllerTest extends WebTestCase
     {
         $socialIssues = $data['results'];
         shuffle($socialIssues);
-        $socialIssue = array_pop($socialIssues);
+        $socialIssue = \array_pop($socialIssues);
 
         $client = $this->getClientAuthenticated();
         $client->request(Request::METHOD_GET, sprintf('/api/1.0/person/social-work/social-issue/%d.json', $socialIssue['id']));
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
 
-        $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
         $this->assertArrayHasKey('id', $data);
         $this->assertArrayHasKey('type', $data);
@@ -58,10 +56,10 @@ final class SocialIssueApiControllerTest extends WebTestCase
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
 
-        $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $data = \json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
         $this->assertGreaterThan(0, $data['count']);
-        $this->assertGreaterThan(0, count($data['results']));
+        $this->assertGreaterThan(0, \count($data['results']));
 
         return $data;
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/SocialWorkEvaluationApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/SocialWorkEvaluationApiControllerTest.php
index 9ed62e4b3..f4609ddc1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/SocialWorkEvaluationApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/SocialWorkEvaluationApiControllerTest.php
@@ -19,6 +19,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialWorkEvaluationApiControllerTest extends WebTestCase
@@ -52,7 +53,7 @@ final class SocialWorkEvaluationApiControllerTest extends WebTestCase
 
         /** @var SocialAction $socialAction */
         $socialAction = $this->em->createQuery(
-            'SELECT s FROM ' . SocialAction::class . ' s WHERE SIZE(s.evaluations) >= 2'
+            'SELECT s FROM '.SocialAction::class.' s WHERE SIZE(s.evaluations) >= 2'
         )
             ->setMaxResults(1)
             ->getSingleResult();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/AccompanyingPeriodWorkTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/AccompanyingPeriodWorkTest.php
index 6771b0305..45c2ed680 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/AccompanyingPeriodWorkTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/AccompanyingPeriodWorkTest.php
@@ -18,6 +18,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class AccompanyingPeriodWorkTest extends TestCase
@@ -58,7 +59,6 @@ class AccompanyingPeriodWorkTest extends TestCase
 
     public function testReferrerHistoryOnDifferentDays(): void
     {
-
         $work = new AccompanyingPeriodWork();
         $userA = new User();
         $userB = new User();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php
index 98b0f8019..336b81511 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php
@@ -18,6 +18,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ResourceTest extends TestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
index bb7e2e80a..5fdb51c15 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Entity;
 
-use ArrayIterator;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -19,12 +18,10 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTime;
-use DateTimeInterface;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
@@ -44,12 +41,12 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $this->assertCount(1, $period->getStepHistories());
         $this->assertEquals(AccompanyingPeriod::STEP_CONFIRMED, $period->getStepHistories()->first()->getStep());
 
-        $period->setOpeningDate($aMonthAgo = new DateTime('1 month ago'));
+        $period->setOpeningDate($aMonthAgo = new \DateTime('1 month ago'));
 
         $this->assertCount(1, $period->getStepHistories());
         $this->assertEquals($aMonthAgo, $period->getStepHistories()->first()->getStartDate(), 'when changing the opening date, the start date of the first history should change');
 
-        $period->setOpeningDate($tenDaysAgo = new DateTime('10 days ago'));
+        $period->setOpeningDate($tenDaysAgo = new \DateTime('10 days ago'));
 
         $this->assertCount(1, $period->getStepHistories());
         $this->assertEquals($tenDaysAgo, $period->getStepHistories()->first()->getStartDate(), 'when changing the opening date, the start date of the first history should change');
@@ -57,13 +54,13 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $period->setStep(AccompanyingPeriod::STEP_CLOSED);
         $this->assertCount(2, $period->getStepHistories());
 
-        $period->setOpeningDate($tomorrow = new DateTime('tomorrow'));
+        $period->setOpeningDate($tomorrow = new \DateTime('tomorrow'));
         $this->assertEquals($tenDaysAgo, $period->getStepHistories()->first()->getStartDate(), 'when changing the opening date to a later one and no history after, start date should change');
     }
 
     public function testClosingEqualOpening()
     {
-        $datetime = new DateTime('now');
+        $datetime = new \DateTime('now');
 
         $period = new AccompanyingPeriod($datetime);
         $period->setClosingDate($datetime);
@@ -73,8 +70,8 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
     public function testClosingIsAfterOpeningConsistency()
     {
-        $datetime1 = new DateTime('now');
-        $datetime2 = new DateTime('tomorrow');
+        $datetime1 = new \DateTime('now');
+        $datetime2 = new \DateTime('tomorrow');
 
         $period = new AccompanyingPeriod($datetime1);
         $period->setClosingDate($datetime2);
@@ -86,8 +83,8 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
     public function testClosingIsBeforeOpeningConsistency()
     {
-        $datetime1 = new DateTime('tomorrow');
-        $datetime2 = new DateTime('now');
+        $datetime1 = new \DateTime('tomorrow');
+        $datetime2 = new \DateTime('now');
 
         $period = new AccompanyingPeriod($datetime1);
         $period->setClosingDate($datetime2);
@@ -156,7 +153,7 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
         usort($locations, static fn (AccompanyingPeriod\AccompanyingPeriodLocationHistory $a, AccompanyingPeriod\AccompanyingPeriodLocationHistory $b) => $a->getStartDate() <=> $b->getStartDate());
 
-        $iterator = new ArrayIterator($locations);
+        $iterator = new \ArrayIterator($locations);
         $iterator->rewind();
 
         do {
@@ -174,7 +171,6 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         } while ($iterator->valid());
     }
 
-
     public function testHistoryLocationNotHavingBothAtStart()
     {
         $period = new AccompanyingPeriod();
@@ -197,15 +193,15 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
     public function testIsClosed()
     {
-        $period = new AccompanyingPeriod(new DateTime());
-        $period->setClosingDate(new DateTime('tomorrow'));
+        $period = new AccompanyingPeriod(new \DateTime());
+        $period->setClosingDate(new \DateTime('tomorrow'));
 
         $this->assertFalse($period->isOpen());
     }
 
     public function testIsOpen()
     {
-        $period = new AccompanyingPeriod(new DateTime());
+        $period = new AccompanyingPeriod(new \DateTime());
 
         $this->assertTrue($period->isOpen());
     }
@@ -215,7 +211,7 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $person = new Person();
         $person2 = new Person();
         $person3 = new Person();
-        $period = new AccompanyingPeriod(new DateTime());
+        $period = new AccompanyingPeriod(new \DateTime());
 
         $participation0 = $period->createParticipationFor($person);
         $period->createParticipationFor($person2);
@@ -238,7 +234,7 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
         if ($participationL instanceof AccompanyingPeriodParticipation) {
             $this->assertSame($participationL, $participation);
-            $this->assertTrue($participationL->getEndDate() instanceof DateTimeInterface);
+            $this->assertTrue($participationL->getEndDate() instanceof \DateTimeInterface);
         }
 
         $participation = $period->getOpenParticipationContainsPerson($person);
@@ -260,7 +256,7 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
     public function testPinnedComment()
     {
-        $period = new AccompanyingPeriod(new DateTime());
+        $period = new AccompanyingPeriod(new \DateTime());
         $comment = new Comment();
         $replacingComment = new Comment();
 
@@ -271,14 +267,14 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
         $this->assertSame($period->getPinnedComment(), $comment);
         $this->assertNull($comment->getAccompanyingPeriod());
-        $this->assertEquals(0, count($period->getComments()));
+        $this->assertEquals(0, \count($period->getComments()));
 
         $period->setPinnedComment($replacingComment);
 
         $this->assertSame($period->getPinnedComment(), $replacingComment);
         $this->assertNull($replacingComment->getAccompanyingPeriod());
         $this->assertSame($period, $comment->getAccompanyingPeriod());
-        $this->assertEquals(1, count($period->getComments()));
+        $this->assertEquals(1, \count($period->getComments()));
         $this->assertContains($comment, $period->getComments());
 
         $period->setPinnedComment(null);
@@ -286,14 +282,14 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $this->assertNull($period->getPinnedComment());
         $this->assertSame($period, $comment->getAccompanyingPeriod());
         $this->assertSame($period, $replacingComment->getAccompanyingPeriod());
-        $this->assertEquals(2, count($period->getComments()));
+        $this->assertEquals(2, \count($period->getComments()));
         $this->assertContains($comment, $period->getComments());
         $this->assertContains($replacingComment, $period->getComments());
     }
 
     public function testRequestor()
     {
-        $period = new AccompanyingPeriod(new DateTime());
+        $period = new AccompanyingPeriod(new \DateTime());
         $person = new Person();
         $thirdParty = new ThirdParty();
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php
index c728104ae..c5c6a38d1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php
@@ -17,6 +17,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdMemberTest extends TestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
index 7cbb4f95b..beb5ac073 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
@@ -16,12 +16,11 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdComposition;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
-use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdTest extends TestCase
@@ -31,38 +30,38 @@ final class HouseholdTest extends TestCase
         $household = new Household();
 
         $household->addMember($householdMemberA = (new HouseholdMember())
-            ->setStartDate(new DateTimeImmutable('2020-01-01'))
-            ->setEndDate(new DateTimeImmutable('2020-12-31'))
+            ->setStartDate(new \DateTimeImmutable('2020-01-01'))
+            ->setEndDate(new \DateTimeImmutable('2020-12-31'))
             ->setPerson(new Person()));
         $household->addMember($householdMemberB = (new HouseholdMember())
-            ->setStartDate(new DateTimeImmutable('2020-06-01'))
-            ->setEndDate(new DateTimeImmutable('2021-06-31'))
+            ->setStartDate(new \DateTimeImmutable('2020-06-01'))
+            ->setEndDate(new \DateTimeImmutable('2021-06-31'))
             ->setPerson(new Person()));
         $household->addMember($householdMemberC = (new HouseholdMember())
-            ->setStartDate(new DateTimeImmutable('2021-01-01'))
+            ->setStartDate(new \DateTimeImmutable('2021-01-01'))
             ->setEndDate(null)
             ->setPerson(new Person()));
 
-        $members = $household->getMembersOnRange(new DateTimeImmutable('2019-01-01'), null);
+        $members = $household->getMembersOnRange(new \DateTimeImmutable('2019-01-01'), null);
 
         $this->assertCount(3, $members);
         $this->assertContains($householdMemberA, $members);
         $this->assertContains($householdMemberB, $members);
         $this->assertContains($householdMemberC, $members);
 
-        $members = $household->getMembersOnRange(new DateTimeImmutable('2020-01-01'), new DateTimeImmutable('2020-07-01'));
+        $members = $household->getMembersOnRange(new \DateTimeImmutable('2020-01-01'), new \DateTimeImmutable('2020-07-01'));
         $this->assertCount(2, $members);
         $this->assertContains($householdMemberA, $members);
         $this->assertContains($householdMemberB, $members);
         $this->assertNotContains($householdMemberC, $members);
 
-        $members = $household->getMembersOnRange(new DateTimeImmutable('2020-01-01'), new DateTimeImmutable('2022-12-31'));
+        $members = $household->getMembersOnRange(new \DateTimeImmutable('2020-01-01'), new \DateTimeImmutable('2022-12-31'));
         $this->assertCount(3, $members);
         $this->assertContains($householdMemberA, $members);
         $this->assertContains($householdMemberB, $members);
         $this->assertContains($householdMemberC, $members);
 
-        $members = $household->getMembersOnRange(new DateTimeImmutable('2021-01-01'), new DateTimeImmutable('2022-12-31'));
+        $members = $household->getMembersOnRange(new \DateTimeImmutable('2021-01-01'), new \DateTimeImmutable('2022-12-31'));
         $this->assertCount(2, $members);
         $this->assertNotContains($householdMemberA, $members);
         $this->assertContains($householdMemberB, $members);
@@ -74,16 +73,16 @@ final class HouseholdTest extends TestCase
         $household = new Household();
 
         $lastAddress = new Address();
-        $lastAddress->setValidFrom($yesterday = new DateTime('yesterday'));
-        $lastAddress->setValidTo(new DateTime('tomorrow'));
+        $lastAddress->setValidFrom($yesterday = new \DateTime('yesterday'));
+        $lastAddress->setValidTo(new \DateTime('tomorrow'));
         $household->addAddress($lastAddress);
 
         $this->assertNull($lastAddress->getValidTo());
         $this->assertEquals($yesterday, $lastAddress->getValidFrom());
 
         $previousAddress = new Address();
-        $previousAddress->setValidFrom($oneMonthAgo = new DateTime('1 month ago'));
-        $previousAddress->setValidTo(new DateTime('now'));
+        $previousAddress->setValidFrom($oneMonthAgo = new \DateTime('1 month ago'));
+        $previousAddress->setValidTo(new \DateTime('now'));
         $household->addAddress($previousAddress);
 
         $addresses = $household->getAddressesOrdered();
@@ -96,8 +95,8 @@ final class HouseholdTest extends TestCase
         $this->assertNull($lastAddress->getValidTo());
 
         $futureAddress = new Address();
-        $futureAddress->setValidFrom($tomorrow = new DateTime('tomorrow'));
-        $futureAddress->setValidTo(new DateTime('2150-01-01'));
+        $futureAddress->setValidFrom($tomorrow = new \DateTime('tomorrow'));
+        $futureAddress->setValidTo(new \DateTime('2150-01-01'));
         $household->addAddress($futureAddress);
 
         $addresses = $household->getAddressesOrdered();
@@ -118,22 +117,22 @@ final class HouseholdTest extends TestCase
         $household = new Household();
 
         $household->addComposition(($first = new HouseholdComposition())
-            ->setStartDate(new DateTimeImmutable('2021-12-01')));
+            ->setStartDate(new \DateTimeImmutable('2021-12-01')));
 
         $this->assertNull($first->getEndDate());
 
         $household->addComposition(($second = new HouseholdComposition())
-            ->setStartDate(new DateTimeImmutable('2021-12-31')));
+            ->setStartDate(new \DateTimeImmutable('2021-12-31')));
 
-        $this->assertEquals(new DateTimeImmutable('2021-12-31'), $first->getEndDate());
-        $this->assertEquals(new DateTimeImmutable('2021-12-31'), $second->getStartDate());
+        $this->assertEquals(new \DateTimeImmutable('2021-12-31'), $first->getEndDate());
+        $this->assertEquals(new \DateTimeImmutable('2021-12-31'), $second->getStartDate());
 
         $household->addComposition(($inside = new HouseholdComposition())
-            ->setStartDate(new DateTimeImmutable('2021-12-15')));
+            ->setStartDate(new \DateTimeImmutable('2021-12-15')));
 
-        $this->assertEquals(new DateTimeImmutable('2021-12-15'), $first->getEndDate());
-        $this->assertEquals(new DateTimeImmutable('2021-12-31'), $second->getStartDate());
-        $this->assertEquals(new DateTimeImmutable('2021-12-31'), $inside->getEndDate());
+        $this->assertEquals(new \DateTimeImmutable('2021-12-15'), $first->getEndDate());
+        $this->assertEquals(new \DateTimeImmutable('2021-12-31'), $second->getStartDate());
+        $this->assertEquals(new \DateTimeImmutable('2021-12-31'), $inside->getEndDate());
     }
 
     public function testHouseholdGetPersonsDuringMembership()
@@ -145,29 +144,29 @@ final class HouseholdTest extends TestCase
 
         $household->addMember(
             $member1 = (new HouseholdMember())
-                ->setStartDate(new DateTimeImmutable('2021-01-01'))
-                ->setEndDate(new DateTimeImmutable('2021-12-01'))
+                ->setStartDate(new \DateTimeImmutable('2021-01-01'))
+                ->setEndDate(new \DateTimeImmutable('2021-12-01'))
                 ->setPerson($person1)
         );
 
         $household->addMember(
             $member2a = (new HouseholdMember())
-                ->setStartDate(new DateTimeImmutable('2021-01-01'))
-                ->setEndDate(new DateTimeImmutable('2021-05-01'))
+                ->setStartDate(new \DateTimeImmutable('2021-01-01'))
+                ->setEndDate(new \DateTimeImmutable('2021-05-01'))
                 ->setPerson($person2)
         );
 
         $household->addMember(
             $member2b = (new HouseholdMember())
-                ->setStartDate(new DateTimeImmutable('2021-11-01'))
-                ->setEndDate(new DateTimeImmutable('2022-06-01'))
+                ->setStartDate(new \DateTimeImmutable('2021-11-01'))
+                ->setEndDate(new \DateTimeImmutable('2022-06-01'))
                 ->setPerson($person2)
         );
 
         $household->addMember(
             $memberOut = (new HouseholdMember())
-                ->setStartDate(new DateTimeImmutable('2019-01-01'))
-                ->setEndDate(new DateTimeImmutable('2019-12-01'))
+                ->setStartDate(new \DateTimeImmutable('2019-01-01'))
+                ->setEndDate(new \DateTimeImmutable('2019-12-01'))
                 ->setPerson($personOut)
         );
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
index 3e1c03a6a..e30f2658c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
@@ -17,13 +17,12 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
-use DateTimeImmutable;
 
 /**
  * Unit tests for the person Entity.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PersonTest extends \PHPUnit\Framework\TestCase
@@ -34,18 +33,18 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
      */
     public function testAccompanyingPeriodOrderSameDateOpening()
     {
-        $d = new DateTime('2013/2/1');
+        $d = new \DateTime('2013/2/1');
         $p = new Person();
         $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
 
-        $g = new DateTime('2013/4/1');
+        $g = new \DateTime('2013/4/1');
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g);
         $p->close($period);
 
-        $f = new DateTime('2013/2/1');
+        $f = new \DateTime('2013/2/1');
         $p->open(new AccompanyingPeriod($f));
 
-        $e = new DateTime('2013/3/1');
+        $e = new \DateTime('2013/3/1');
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e);
         $p->close($period);
 
@@ -62,18 +61,18 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
      */
     public function testAccompanyingPeriodOrderWithUnorderedAccompanyingPeriod()
     {
-        $d = new DateTime('2013/2/1');
+        $d = new \DateTime('2013/2/1');
         $p = new Person();
         $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
 
-        $e = new DateTime('2013/3/1');
+        $e = new \DateTime('2013/3/1');
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e);
         $p->close($period);
 
-        $f = new DateTime('2013/1/1');
+        $f = new \DateTime('2013/1/1');
         $p->open(new AccompanyingPeriod($f));
 
-        $g = new DateTime('2013/4/1');
+        $g = new \DateTime('2013/4/1');
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g);
         $p->close($period);
 
@@ -91,18 +90,18 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
      */
     public function testDateCoveringWithCoveringAccompanyingPeriod()
     {
-        $d = new DateTime('2013/2/1');
+        $d = new \DateTime('2013/2/1');
         $p = new Person();
         $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
 
-        $e = new DateTime('2013/3/1');
+        $e = new \DateTime('2013/3/1');
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e);
         $p->close($period);
 
-        $f = new DateTime('2013/1/1');
+        $f = new \DateTime('2013/1/1');
         $p->open(new AccompanyingPeriod($f));
 
-        $g = new DateTime('2013/4/1');
+        $g = new \DateTime('2013/4/1');
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g);
         $p->close($period);
 
@@ -118,7 +117,7 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetCurrentAccompanyingPeriod()
     {
-        $d = new DateTime('yesterday');
+        $d = new \DateTime('yesterday');
         $p = new Person();
         $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
 
@@ -128,8 +127,8 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($period->isOpen());
         $this->assertEquals($d, $period->getOpeningDate());
 
-        //close and test
-        $period->setClosingDate(new DateTime('tomorrow'));
+        // close and test
+        $period->setClosingDate(new \DateTime('tomorrow'));
 
         $shouldBeNull = $p->getCurrentAccompanyingPeriod();
         $this->assertNull($shouldBeNull);
@@ -145,15 +144,15 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
             ->setShareHousehold(false);
 
         $membership1 = (new HouseholdMember())
-            ->setStartDate(new DateTimeImmutable('10 years ago'))
-            ->setEndDate(new DateTimeImmutable('5 years ago'))
+            ->setStartDate(new \DateTimeImmutable('10 years ago'))
+            ->setEndDate(new \DateTimeImmutable('5 years ago'))
             ->setPerson($person)
             ->setPosition($positionShare);
         $household->addMember($membership1);
 
         $membership2 = (new HouseholdMember())
-            ->setStartDate(new DateTimeImmutable('4 years ago'))
-            ->setEndDate(new DateTimeImmutable('2 years ago'))
+            ->setStartDate(new \DateTimeImmutable('4 years ago'))
+            ->setEndDate(new \DateTimeImmutable('2 years ago'))
             ->setPerson($person)
             ->setPosition($positionNotShare);
         $household->addMember($membership2);
@@ -163,10 +162,10 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
 
         $this->assertFalse($person->isSharingHousehold());
         $this->assertTrue($person->isSharingHousehold(
-            new DateTimeImmutable('6 years ago')
+            new \DateTimeImmutable('6 years ago')
         ));
         $this->assertFalse($person->isSharingHousehold(
-            new DateTimeImmutable('3 years ago')
+            new \DateTimeImmutable('3 years ago')
         ));
     }
 
@@ -177,15 +176,15 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
      */
     public function testNotOpenAFileReOpenedLater()
     {
-        $d = new DateTime('2013/2/1');
+        $d = new \DateTime('2013/2/1');
         $p = new Person();
         $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
 
-        $e = new DateTime('2013/3/1');
+        $e = new \DateTime('2013/3/1');
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e);
         $p->close($period);
 
-        $f = new DateTime('2013/1/1');
+        $f = new \DateTime('2013/1/1');
         $p->open(new AccompanyingPeriod($f));
 
         $r = $p->checkAccompanyingPeriodsAreNotCollapsing();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialActionTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialActionTest.php
index 2dcfa6b11..3684e6d68 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialActionTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialActionTest.php
@@ -16,6 +16,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialActionTest extends TestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php
index b846ae5f4..6660bd9c1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php
@@ -17,6 +17,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialIssueTest extends TestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Event/Person/PersonAddressMoveEventTest.php b/src/Bundle/ChillPersonBundle/Tests/Event/Person/PersonAddressMoveEventTest.php
index 36defe46e..0a64099b6 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Event/Person/PersonAddressMoveEventTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Event/Person/PersonAddressMoveEventTest.php
@@ -16,12 +16,11 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
-use DateTime;
-use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonAddressMoveEventTest extends TestCase
@@ -31,17 +30,17 @@ final class PersonAddressMoveEventTest extends TestCase
         $person = new Person();
 
         $household = (new Household())->addAddress(
-            ($previousAddress = new Address())->setValidFrom(new DateTime('1 year ago'))
+            ($previousAddress = new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $household->addAddress(
-            ($nextAddress = new Address())->setValidFrom(new DateTime('1 month ago'))
+            ($nextAddress = new Address())->setValidFrom(new \DateTime('1 month ago'))
         );
         $member = new HouseholdMember();
         $member
             ->setPerson($person)
             ->setHousehold($household)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -50,8 +49,8 @@ final class PersonAddressMoveEventTest extends TestCase
 
         $this->assertSame($previousAddress, $event->getPreviousAddress());
         $this->assertSame($nextAddress, $event->getNextAddress());
-        $this->assertEquals((new DateTime('1 month ago'))->format('Y-m-d'), $nextAddress->getValidFrom()->format('Y-m-d'));
-        $this->assertEquals((new DateTime('1 month ago'))->format('Y-m-d'), $event->getMoveDate()->format('Y-m-d'));
+        $this->assertEquals((new \DateTime('1 month ago'))->format('Y-m-d'), $nextAddress->getValidFrom()->format('Y-m-d'));
+        $this->assertEquals((new \DateTime('1 month ago'))->format('Y-m-d'), $event->getMoveDate()->format('Y-m-d'));
     }
 
     public function testPersonChangeHousehold()
@@ -59,23 +58,23 @@ final class PersonAddressMoveEventTest extends TestCase
         $person = new Person();
 
         $previousHousehold = (new Household())->addAddress(
-            ($previousAddress = new Address())->setValidFrom(new DateTime('1 year ago'))
+            ($previousAddress = new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $previousMembership = new HouseholdMember();
         $previousMembership
             ->setPerson($person)
             ->setHousehold($previousHousehold)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $nextHousehold = (new Household())->addAddress(
-            ($nextAddress = new Address())->setValidFrom(new DateTime('tomorrow'))
+            ($nextAddress = new Address())->setValidFrom(new \DateTime('tomorrow'))
         );
         $nextMembership = new HouseholdMember();
         $nextMembership
             ->setPerson($person)
             ->setHousehold($nextHousehold)
-            ->setStartDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('tomorrow'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -87,7 +86,7 @@ final class PersonAddressMoveEventTest extends TestCase
         $this->assertSame($nextAddress, $event->getNextAddress());
         $this->assertTrue($event->personChangeAddress());
         $this->assertFalse($event->personLeaveWithoutHousehold());
-        $this->assertEquals(new DateTimeImmutable('tomorrow'), $event->getMoveDate());
+        $this->assertEquals(new \DateTimeImmutable('tomorrow'), $event->getMoveDate());
     }
 
     public function testPersonLeaveHousehold()
@@ -95,14 +94,14 @@ final class PersonAddressMoveEventTest extends TestCase
         $person = new Person();
 
         $previousHousehold = (new Household())->addAddress(
-            ($previousAddress = new Address())->setValidFrom(new DateTime('1 year ago'))
+            ($previousAddress = new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $previousMembership = new HouseholdMember();
         $previousMembership
             ->setPerson($person)
             ->setHousehold($previousHousehold)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -113,6 +112,6 @@ final class PersonAddressMoveEventTest extends TestCase
         $this->assertNull($event->getNextAddress());
         $this->assertTrue($event->personChangeAddress());
         $this->assertTrue($event->personLeaveWithoutHousehold());
-        $this->assertEquals(new DateTimeImmutable('tomorrow'), $event->getMoveDate());
+        $this->assertEquals(new \DateTimeImmutable('tomorrow'), $event->getMoveDate());
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php b/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php
index 974dc0ed9..c05e5dd5d 100644
--- a/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php
@@ -16,6 +16,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonCreateEventTest extends TestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
index 433ed4831..0d2684046 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AdministrativeLocationAggregatorTest extends AbstractAggregatorTest
@@ -52,7 +53,7 @@ final class AdministrativeLocationAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
index 6393d446d..124b5c03a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ClosingMotiveAggregatorTest extends AbstractAggregatorTest
@@ -52,7 +53,7 @@ final class ClosingMotiveAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
index 2d998841a..796e3cfd1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ConfidentialAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
index de3f16811..a13af0293 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DurationAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
index fb3712521..9e4a14862 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EmergencyAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
index 664f9e8a9..70a76b2fb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EvaluationAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php
index d4093bcea..bd5dc5e87 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php
@@ -16,11 +16,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\GeographicalUnitStatAggregator;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GeographicalUnitStatAggregatorTest extends AbstractAggregatorTest
@@ -46,7 +46,7 @@ final class GeographicalUnitStatAggregatorTest extends AbstractAggregatorTest
         $levels = $repository->findAll();
 
         return [
-            ['date_calc' => new RollingDate(RollingDate::T_TODAY), 'level' => $levels]
+            ['date_calc' => new RollingDate(RollingDate::T_TODAY), 'level' => $levels],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
index c2e55b84d..769c6fa8a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class IntensityAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
index d06df71a2..1f3149c65 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class OriginAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
index ef99670e3..8951b61eb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ReferrerAggregator;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReferrerAggregatorTest extends AbstractAggregatorTest
@@ -41,7 +41,7 @@ final class ReferrerAggregatorTest extends AbstractAggregatorTest
     public function getFormData(): array
     {
         return [
-            ['date_calc' => new RollingDate(RollingDate::T_TODAY)]
+            ['date_calc' => new RollingDate(RollingDate::T_TODAY)],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php
index c69e775be..539b856ec 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php
@@ -19,13 +19,13 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ReferrerScopeAggregator;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReferrerScopeAggregatorTest extends AbstractAggregatorTest
@@ -43,7 +43,7 @@ final class ReferrerScopeAggregatorTest extends AbstractAggregatorTest
         );
 
         $dateConverter = $this->prophesize(RollingDateConverterInterface::class);
-        $dateConverter->convert(Argument::type(RollingDate::class))->willReturn(new DateTimeImmutable());
+        $dateConverter->convert(Argument::type(RollingDate::class))->willReturn(new \DateTimeImmutable());
 
         return new ReferrerScopeAggregator(
             $scopeRepository->reveal(),
@@ -56,7 +56,7 @@ final class ReferrerScopeAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'date_calc' => new RollingDate(RollingDate::T_TODAY)
+                'date_calc' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
@@ -70,7 +70,7 @@ final class ReferrerScopeAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
index 6b03a6716..298c3b020 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RequestorAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
index 596ee4342..833cca235 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeAggregatorTest extends AbstractAggregatorTest
@@ -56,7 +57,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest
                 ->join('acp.scopes', 'acpscope'),
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
index 271303ab7..b4ea4ec02 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialActionAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
index c33c3586b..9135b7d9c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialIssueAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
index f733e0fab..dee46e80a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\StepAggregator;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class StepAggregatorTest extends AbstractAggregatorTest
@@ -42,7 +42,7 @@ final class StepAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'on_date' => new RollingDate(RollingDate::T_TODAY)
+                'on_date' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php
index cd070aca8..a62886152 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class UserJobAggregatorTest extends AbstractAggregatorTest
@@ -59,7 +60,7 @@ final class UserJobAggregatorTest extends AbstractAggregatorTest
                 ->join('acp.job', 'acpjob'),
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
index 299a30a5f..98d7bf581 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EvaluationTypeAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
index 4611871a5..6e77e0ee9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\ChildrenNumberAggregator;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ChildrenNumberAggregatorTest extends AbstractAggregatorTest
@@ -42,7 +42,7 @@ final class ChildrenNumberAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'on_date' => new RollingDate(RollingDate::T_TODAY)
+                'on_date' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
index d9dc6ef2b..312ad86dc 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\CompositionAggregator;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CompositionAggregatorTest extends AbstractAggregatorTest
@@ -42,7 +42,7 @@ final class CompositionAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'on_date' => new RollingDate(RollingDate::T_TODAY)
+                'on_date' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php
index c0b234990..ce687655f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Aggregator\PersonAggregators\AgeAggregator;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AgeAggregatorTest extends AbstractAggregatorTest
@@ -42,7 +42,7 @@ final class AgeAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'date_age_calculation' => new RollingDate(RollingDate::T_TODAY)
+                'date_age_calculation' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
index eb6d0b2a9..e7ed46563 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CountryOfBirthAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php
index d5b256362..eaafa5ee2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GenderAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
index 609e95bfb..157d3ad08 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
@@ -16,12 +16,12 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Aggregator\PersonAggregators\HouseholdPositionAggregator;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdPositionAggregatorTest extends AbstractAggregatorTest
@@ -44,7 +44,7 @@ final class HouseholdPositionAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'date_position' => new RollingDate(RollingDate::T_TODAY)
+                'date_position' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
@@ -62,7 +62,7 @@ final class HouseholdPositionAggregatorTest extends AbstractAggregatorTest
                 ->join(HouseholdMember::class, 'householdmember', Expr\Join::WITH, 'householdmember.person = person'),
             $em->createQueryBuilder()
                 ->select('count(person.id)')
-                ->from(Person::class, 'person')
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
index 1dc66e0ae..00726199c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class MaritalStatusAggregatorTest extends AbstractAggregatorTest
@@ -56,7 +57,7 @@ final class MaritalStatusAggregatorTest extends AbstractAggregatorTest
                 ->join('person.maritalStatus', 'personmarital'),
             $em->createQueryBuilder()
                 ->select('count(person.id)')
-                ->from(Person::class, 'person')
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php
index 5e27b13d1..3179b12e7 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class NationalityAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
index f6d3d5b8c..84be8b8b3 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActionTypeAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
index 45a586c32..0c439d534 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GoalAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
index 52493e786..e34f665e9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GoalResultAggregatorTest extends AbstractAggregatorTest
@@ -60,7 +61,7 @@ final class GoalResultAggregatorTest extends AbstractAggregatorTest
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
                 ->join('acp.works', 'acpw')
-                ->join('acpw.goals', 'goal')
+                ->join('acpw.goals', 'goal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
index dfd6db053..1cdc27daf 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
-use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\JobAggregator;
@@ -19,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class JobAggregatorTest extends AbstractAggregatorTest
@@ -54,7 +54,7 @@ final class JobAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.works', 'acpw')
+                ->join('acp.works', 'acpw'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
index 19ca8b615..928ce33fc 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReferrerAggregatorTest extends AbstractAggregatorTest
@@ -42,8 +43,8 @@ final class ReferrerAggregatorTest extends AbstractAggregatorTest
         return [
             [], // there are previous saved export which does not contains any data
             [
-                'referrer_at' => new RollingDate(RollingDate::T_TODAY)
-            ]
+                'referrer_at' => new RollingDate(RollingDate::T_TODAY),
+            ],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
index dee9e3785..effbd4f18 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ResultAggregatorTest extends AbstractAggregatorTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
index 3cd8c93fe..1c5b462cd 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
-use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ScopeAggregator;
@@ -19,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeAggregatorTest extends AbstractAggregatorTest
@@ -54,7 +54,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.works', 'acpw')
+                ->join('acp.works', 'acpw'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php
index 3aa9651b8..2b7f8468c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php
@@ -17,6 +17,7 @@ use Chill\PersonBundle\Export\Export\CountAccompanyingCourse;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CountAccompanyingCourseTest extends AbstractExportTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingPeriodWorkTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingPeriodWorkTest.php
index 3a7ec051b..1ec36a0ab 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingPeriodWorkTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingPeriodWorkTest.php
@@ -17,6 +17,7 @@ use Chill\PersonBundle\Export\Export\CountAccompanyingPeriodWork;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CountAccompanyingPeriodWorkTest extends AbstractExportTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
index 74acdfbb0..91640e9a4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
@@ -18,13 +18,11 @@ use Chill\PersonBundle\Export\Export\CountPerson;
  * Test CountPerson export.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CountPersonTest extends AbstractExportTest
 {
-    /**
-     * @var
-     */
     private ?object $export = null;
 
     protected function setUp(): void
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php
index 24a49bab3..0a864050f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Export\Formatter\SpreadsheetListFormatter;
 use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\PersonBundle\Export\Export\ListAccompanyingPeriod;
@@ -21,6 +20,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class ListAccompanyingPeriodTest extends KernelTestCase
@@ -42,7 +42,7 @@ class ListAccompanyingPeriodTest extends KernelTestCase
     {
         $centers = $this->centerRepository->findAll();
 
-        $query = $this->listAccompanyingPeriod->initiateQuery([], array_map(fn (Center $c) => ['center' => $c ], $centers), $exportOpts = ['calc_date' => new RollingDate(RollingDate::T_TODAY)]);
+        $query = $this->listAccompanyingPeriod->initiateQuery([], array_map(fn (Center $c) => ['center' => $c], $centers), $exportOpts = ['calc_date' => new RollingDate(RollingDate::T_TODAY)]);
 
         $query->setMaxResults(1);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkTest.php
index 3467f15a7..08fa5141e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkTest.php
@@ -20,6 +20,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class ListAccompanyingPeriodWorkTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListEvaluationTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListEvaluationTest.php
index d7db24a82..7015fae11 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListEvaluationTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListEvaluationTest.php
@@ -20,6 +20,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class ListEvaluationTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php
index eefff0bee..11937c216 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php
@@ -11,16 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Export;
 
-use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 use Chill\PersonBundle\Export\Export\ListPerson;
-use DateTime;
 use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Test the export "ListPerson".
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ListPersonTest extends AbstractExportTest
@@ -58,7 +57,7 @@ final class ListPersonTest extends AbstractExportTest
             ['fields' => ['id', 'nationality']],
             ['fields' => ['id', 'countryOfBirth']],
         ] as $base) {
-            yield [...$base, 'address_date' => new \DateTimeImmutable('today') ];
+            yield [...$base, 'address_date' => new \DateTimeImmutable('today')];
         }
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php
index 8e13f91b7..a5ce35a7a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php
@@ -14,10 +14,10 @@ namespace Export\Export;
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Export\Export\StatAccompanyingCourseDuration;
-use DateTime;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class StatAccompanyingCourseDurationTest extends AbstractExportTest
@@ -39,7 +39,7 @@ final class StatAccompanyingCourseDurationTest extends AbstractExportTest
     public function getFormData(): array
     {
         return [
-            ['closingdate' => DateTime::createFromFormat('Y-m-d', '2022-06-30')],
+            ['closingdate' => \DateTime::createFromFormat('Y-m-d', '2022-06-30')],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php
index 22420c7d5..e88c22d7a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOnDateFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActiveOnDateFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php
index f857dca7a..459ccb775 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOneDayBetweenDatesFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActiveOneDayBetweenDatesFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php
index 580f1e7c4..22981759c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AdministrativeLocationFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php
index 2f1ddd52f..9e4d98f17 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ClosingMotiveFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php
index 431d5ba93..a0f1ec6a9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php
@@ -17,6 +17,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ConfidentialFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php
index 3c7489424..ddf88bf8c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php
@@ -17,6 +17,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EmergencyFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php
index bf4ef7de0..f300ad7b4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EvaluationFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php
index 235d6487f..540cb6c7a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php
@@ -11,17 +11,16 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
-use Chill\MainBundle\Entity\GeographicalUnit;
 use Chill\MainBundle\Repository\GeographicalUnitRepositoryInterface;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\GeographicalUnitStatFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GeographicalUnitStatFilterTest extends AbstractFilterTest
@@ -50,7 +49,7 @@ final class GeographicalUnitStatFilterTest extends AbstractFilterTest
         return [
             [
                 'date_calc' => new RollingDate(RollingDate::T_TODAY),
-                'units' => $units
+                'units' => $units,
             ],
         ];
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php
index b5b22da4e..149e94e57 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class IntensityFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php
index 56713b5a1..0ebded633 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OpenBetweenDatesFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class OpenBetweenDatesFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php
index 41a271e4b..5a5689f3f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class OriginFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php
index c79b5e9b8..a56741bd3 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php
@@ -15,13 +15,12 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
-use Chill\PersonBundle\Export\Export\CountAccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ReferrerFilter;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReferrerFilterTest extends AbstractFilterTest
@@ -82,6 +81,5 @@ final class ReferrerFilterTest extends AbstractFilterTest
         $qb->select('COUNT(DISTINCT acpw.id) as export_result');
 
         yield $qb;
-
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php
index 50b5941bc..1fe454c47 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RequestorFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php
index 7d4be6476..66768d966 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialActionFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php
index 74eb3534d..4f72d1ece 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php
@@ -20,6 +20,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialIssueFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php
index 5b9ef5f4f..6410c4094 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class StepFilterTest extends AbstractFilterTest
@@ -46,7 +47,7 @@ final class StepFilterTest extends AbstractFilterTest
             ['accepted_steps_multi' => [AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT]],
             ['accepted_steps_multi' => [AccompanyingPeriod::STEP_CLOSED]],
         ] as $d) {
-            yield ['calc_date' => new RollingDate(RollingDate::T_TODAY), ...$d]    ;
+            yield ['calc_date' => new RollingDate(RollingDate::T_TODAY), ...$d];
         }
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php
index 86cced5e1..115510ff5 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php
@@ -21,6 +21,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class UserJobFilterTest extends AbstractFilterTest
@@ -43,13 +44,13 @@ final class UserJobFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
         $jobs = self::$container->get(EntityManagerInterface::class)
-            ->createQuery('SELECT j FROM ' . UserJob::class . ' j')
+            ->createQuery('SELECT j FROM '.UserJob::class.' j')
             ->setMaxResults(1)
             ->getResult();
 
         yield [
             'jobs' => new ArrayCollection($jobs),
-            'date_calc' => new RollingDate(RollingDate::T_TODAY)
+            'date_calc' => new RollingDate(RollingDate::T_TODAY),
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php
index de2c397fa..c6828b721 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php
@@ -21,6 +21,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class UserScopeFilterTest extends AbstractFilterTest
@@ -43,7 +44,7 @@ final class UserScopeFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
         $scopes = self::$container->get(EntityManagerInterface::class)
-            ->createQuery('SELECT s FROM ' . Scope::class . ' s')
+            ->createQuery('SELECT s FROM '.Scope::class.' s')
             ->setMaxResults(1)
             ->getResult();
 
@@ -51,7 +52,7 @@ final class UserScopeFilterTest extends AbstractFilterTest
             [
                 'date_calc' => new RollingDate(RollingDate::T_TODAY),
                 'scopes' => new ArrayCollection($scopes),
-            ]
+            ],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php
index 5217e0d57..46c7ca853 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EvaluationTypeFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php
index 7b2262770..db1c29ab6 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class MaxDateFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
index 033e3fdbe..471dde032 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
@@ -16,11 +16,11 @@ use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
 use Chill\PersonBundle\Export\Filter\HouseholdFilters\CompositionFilter;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CompositionFilterTest extends AbstractFilterTest
@@ -77,7 +77,7 @@ final class CompositionFilterTest extends AbstractFilterTest
             ->join('acppart.accompanyingPeriod', 'acp')
             ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             ->andWhere('hmember.startDate <= :count_household_at_date AND (hmember.endDate IS NULL OR hmember.endDate > :count_household_at_date)')
-            ->setParameter('count_household_at_date', new DateTimeImmutable('today'));
+            ->setParameter('count_household_at_date', new \DateTimeImmutable('today'));
 
         $qb
             ->select('COUNT(DISTINCT household.id) AS household_export_result')
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php
index 243b94a2e..ca04a40a4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\AgeFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AgeFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php
index 25723f7ee..ee5e167be 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\BirthdateFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BirthdateFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php
index 27b06b19f..7c67cd6d2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\DeadOrAliveFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DeadOrAliveFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php
index 9f2cce4f1..9062bfc2a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\DeathdateFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DeathdateFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php
index 04ea4a997..2aac73fe6 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GenderFilterTest extends AbstractFilterTest
@@ -61,7 +62,7 @@ final class GenderFilterTest extends AbstractFilterTest
         return [
             $em->createQueryBuilder()
                 ->select('person.firstName')
-                ->from(Person::class, 'person')
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php
index 06d2fcdc4..c52bb98cd 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php
@@ -11,16 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
-use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\MaritalStatus;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\MaritalStatusFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class MaritalStatusFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php
index 565c75280..973b8c6eb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class NationalityFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php
index 6d1b2c398..c5f387463 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php
@@ -17,12 +17,12 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\ResidentialAddress;
 use Chill\PersonBundle\Export\Filter\PersonFilters\ResidentialAddressAtThirdpartyFilter;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ResidentialAddressAtThirdpartyFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php
index c357f7a65..d0e42b9c3 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php
@@ -20,6 +20,7 @@ use Doctrine\ORM\Query\Expr;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ResidentialAddressAtUserFilterTest extends AbstractFilterTest
@@ -41,7 +42,7 @@ final class ResidentialAddressAtUserFilterTest extends AbstractFilterTest
     public function getFormData(): array
     {
         return [
-            ['date_calc' => new RollingDate(RollingDate::T_TODAY)]
+            ['date_calc' => new RollingDate(RollingDate::T_TODAY)],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php
index e8ed85ad4..392ec656b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Entity\UserJob;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Filter\SocialWorkFilters\JobFilter;
@@ -21,6 +20,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class JobFilterTest extends AbstractFilterTest
@@ -44,14 +44,14 @@ final class JobFilterTest extends AbstractFilterTest
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        $jobs = $em->createQuery('SELECT j FROM ' . UserJob::class . ' j')
+        $jobs = $em->createQuery('SELECT j FROM '.UserJob::class.' j')
             ->setMaxResults(1)
             ->getResult();
 
         return [
             [
                 'job' => new ArrayCollection($jobs),
-            ]
+            ],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php
index a77c6d9c9..5459fdd18 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php
@@ -20,6 +20,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReferrerFilterTest extends AbstractFilterTest
@@ -54,7 +55,7 @@ final class ReferrerFilterTest extends AbstractFilterTest
 
             $data[] = [
                 'accepted_agents' => $u,
-                'agent_at' => new RollingDate(RollingDate::T_TODAY)
+                'agent_at' => new RollingDate(RollingDate::T_TODAY),
             ];
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php
index c3e29f71e..78051e0da 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Filter\SocialWorkFilters\ScopeFilter;
@@ -20,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeFilterTest extends AbstractFilterTest
@@ -43,14 +43,14 @@ final class ScopeFilterTest extends AbstractFilterTest
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        $scopes = $em->createQuery('SELECT s FROM ' . Scope::class . ' s')
+        $scopes = $em->createQuery('SELECT s FROM '.Scope::class.' s')
             ->setMaxResults(1)
             ->getResult();
 
         return [
             [
                 'scope' => $scopes,
-            ]
+            ],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php
index 422467d2a..88ee709f2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php
@@ -12,13 +12,12 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Form\Type;
 
 use Chill\PersonBundle\Form\Type\PickPersonType;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PickPersonTypeTest extends KernelTestCase
@@ -53,7 +52,7 @@ final class PickPersonTypeTest extends KernelTestCase
      */
     public function testWithInvalidOptionCenters(): never
     {
-        $this->expectException(RuntimeException::class);
+        $this->expectException(\RuntimeException::class);
 
         $this->markTestSkipped('need to inject locale into url generator without request');
         $this->formFactory
@@ -90,7 +89,7 @@ final class PickPersonTypeTest extends KernelTestCase
 
         $this->assertEquals(
             1,
-            count(array_unique($centerIds)),
+            \count(array_unique($centerIds)),
             'test that the form contains people from only one centers'
         );
 
@@ -123,7 +122,7 @@ final class PickPersonTypeTest extends KernelTestCase
 
         $this->assertEquals(
             2,
-            count(array_unique($centerIds)),
+            \count(array_unique($centerIds)),
             'test that the form contains people from only one centers'
         );
     }
@@ -140,7 +139,7 @@ final class PickPersonTypeTest extends KernelTestCase
         // transform into a view to have data-center attr
         $view = $form->createView();
 
-        $this->assertEquals(0, count($view->vars['choices']));
+        $this->assertEquals(0, \count($view->vars['choices']));
     }
 
     public function testWithoutOption()
@@ -168,7 +167,7 @@ final class PickPersonTypeTest extends KernelTestCase
 
         $this->assertEquals(
             2,
-            count(array_unique($centerIds)),
+            \count(array_unique($centerIds)),
             'test that the form contains people from 2 centers'
         );
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php b/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
index c3fb702e9..827b2a2e2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
@@ -17,16 +17,15 @@ use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
 use Chill\PersonBundle\Household\MembersEditorFactory;
-use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class MembersEditorTest extends TestCase
@@ -50,13 +49,13 @@ final class MembersEditorTest extends TestCase
         $factory = $this->buildMembersEditorFactory();
         $editor = $factory->createEditor($household);
 
-        $editor->addMovement($aMonthAgo = new DateTimeImmutable('1 month ago'), $person, $position);
+        $editor->addMovement($aMonthAgo = new \DateTimeImmutable('1 month ago'), $person, $position);
 
         // set a second time the person in position
         $factory = $this->buildMembersEditorFactory();
         $editor = $factory->createEditor($household);
 
-        $editor->addMovement($yesterday = new DateTimeImmutable('yesterday'), $person, $position);
+        $editor->addMovement($yesterday = new \DateTimeImmutable('yesterday'), $person, $position);
 
         $this->assertCount(2, $person->getHouseholdParticipationsNotShareHousehold());
 
@@ -75,8 +74,7 @@ final class MembersEditorTest extends TestCase
     }
 
     /**
-     * We test that a leave move is possible when member startdate is same as current date
-     *
+     * We test that a leave move is possible when member startdate is same as current date.
      */
     public function testLeaveMovementInSameHouseholdFromShareHouseholdToNotShareHouseholdOnSameDate()
     {
@@ -90,7 +88,7 @@ final class MembersEditorTest extends TestCase
 
         // create add move
         $editor = $factory->createEditor($household);
-        $editor->addMovement(new DateTimeImmutable('today'), $person, $positionSharing);
+        $editor->addMovement(new \DateTimeImmutable('today'), $person, $positionSharing);
         $editor->postMove();
 
         self::assertContains($person, $household->getCurrentPersons());
@@ -107,7 +105,7 @@ final class MembersEditorTest extends TestCase
             null
         );
         $editor = $factory->createEditor($household);
-        $editor->addMovement(new DateTimeImmutable('today'), $person, $positionNotSharing);
+        $editor->addMovement(new \DateTimeImmutable('today'), $person, $positionNotSharing);
         $editor->postMove();
 
         $participations = $household->getMembers();
@@ -120,7 +118,7 @@ final class MembersEditorTest extends TestCase
         self::assertCount(1, $notSharing);
 
         self::assertNotNull($sharing[0]->getEndDate());
-        self::assertEquals(new DateTimeImmutable('today'), $sharing[0]->getEndDate());
+        self::assertEquals(new \DateTimeImmutable('today'), $sharing[0]->getEndDate());
     }
 
     /**
@@ -141,7 +139,7 @@ final class MembersEditorTest extends TestCase
         $editor = $factory->createEditor($household);
 
         // we add the member to the household
-        $editor->addMovement(new DateTimeImmutable('1 month ago'), $person, $positionSharing);
+        $editor->addMovement(new \DateTimeImmutable('1 month ago'), $person, $positionSharing);
 
         // double check that the person is in the household
         $this->assertContains($person, $household->getCurrentPersons());
@@ -156,7 +154,7 @@ final class MembersEditorTest extends TestCase
             null
         );
         $editor = $factory->createEditor($household2 = new Household());
-        $editor->addMovement(new DateTimeImmutable('yesterday'), $person, $positionNotSharing);
+        $editor->addMovement(new \DateTimeImmutable('yesterday'), $person, $positionNotSharing);
         $editor->postMove();
 
         $sharings = $household->getCurrentMembers()->filter(static fn (HouseholdMember $m) => $m->getShareHousehold());
@@ -186,7 +184,7 @@ final class MembersEditorTest extends TestCase
         $editor = $factory->createEditor($household);
 
         // we add the member to the household
-        $editor->addMovement(new DateTimeImmutable('1 month ago'), $person, $positionSharing);
+        $editor->addMovement(new \DateTimeImmutable('1 month ago'), $person, $positionSharing);
 
         // double check that the person is in the household
         $this->assertContains($person, $household->getCurrentPersons());
@@ -201,7 +199,7 @@ final class MembersEditorTest extends TestCase
             null
         );
         $editor = $factory->createEditor($household);
-        $editor->addMovement(new DateTimeImmutable('yesterday'), $person, $positionNotSharing);
+        $editor->addMovement(new \DateTimeImmutable('yesterday'), $person, $positionNotSharing);
         $editor->postMove();
 
         $sharings = $household->getCurrentMembers()->filter(static fn (HouseholdMember $m) => $m->getShareHousehold());
@@ -231,14 +229,14 @@ final class MembersEditorTest extends TestCase
         $editor = $factory->createEditor($household);
 
         // we add the member to the household, at the position "not sharing"
-        $editor->addMovement(new DateTimeImmutable('1 month ago'), $person, $positionNotSharing);
+        $editor->addMovement(new \DateTimeImmutable('1 month ago'), $person, $positionNotSharing);
 
         // double check that the person is in the household
         $this->assertContains($person, $household->getCurrentPersons());
 
         // we do the move to the position sharing household
         $editor = $factory->createEditor($household);
-        $editor->addMovement(new DateTimeImmutable('yesterday'), $person, $positionSharing);
+        $editor->addMovement(new \DateTimeImmutable('yesterday'), $person, $positionSharing);
 
         self::assertCount(2, $household->getMembers());
 
@@ -270,14 +268,14 @@ final class MembersEditorTest extends TestCase
         $editor = $factory->createEditor($household);
 
         // we add the member to the household, at the position "not sharing"
-        $editor->addMovement(new DateTimeImmutable('today'), $person, $positionNotSharing);
+        $editor->addMovement(new \DateTimeImmutable('today'), $person, $positionNotSharing);
 
         // double check that the person is in the household
         $this->assertContains($person, $household->getCurrentPersons());
 
         // we do the move to the position sharing household
         $editor = $factory->createEditor($household);
-        $editor->addMovement(new DateTimeImmutable('today'), $person, $positionSharing);
+        $editor->addMovement(new \DateTimeImmutable('today'), $person, $positionSharing);
 
         self::assertCount(2, $household->getMembers());
 
@@ -303,20 +301,20 @@ final class MembersEditorTest extends TestCase
         $editor = $this->factory->createEditor($household1);
 
         $editor->addMovement(
-            DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01'),
+            \DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01'),
             $person,
             $position
         );
 
         $persistables = $editor->getPersistable();
-        $this->assertEquals(1, count($persistables));
+        $this->assertEquals(1, \count($persistables));
 
         $membership1 = $person->getHouseholdParticipations()->first();
         $this->assertSame($household1, $membership1->getHousehold());
         $this->assertNull($membership1->getEndDate());
 
         // move to another household
-        $date = DateTimeImmutable::createFromFormat('Y-m-d', '2021-01-01');
+        $date = \DateTimeImmutable::createFromFormat('Y-m-d', '2021-01-01');
         $editor = $this->factory->createEditor($household2);
         $editor->addMovement(
             $date,
@@ -325,7 +323,7 @@ final class MembersEditorTest extends TestCase
         );
 
         $persistables = $editor->getPersistable();
-        $this->assertEquals(1, count($persistables));
+        $this->assertEquals(1, \count($persistables));
 
         $membership2 = $person->getHouseholdParticipations()->last();
         $this->assertNull($membership2->getEndDate());
@@ -346,20 +344,20 @@ final class MembersEditorTest extends TestCase
         $editor = $this->factory->createEditor($household1);
 
         $editor->addMovement(
-            DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01'),
+            \DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01'),
             $person,
             $position
         );
 
         $persistables = $editor->getPersistable();
-        $this->assertEquals(count($persistables), 1);
+        $this->assertEquals(\count($persistables), 1);
 
         $membership1 = $persistables[0];
         $this->assertSame($household1, $membership1->getHousehold());
         $this->assertNull($membership1->getEndDate());
 
         // move to another household
-        $date = DateTimeImmutable::createFromFormat('Y-m-d', '2021-01-01');
+        $date = \DateTimeImmutable::createFromFormat('Y-m-d', '2021-01-01');
         $editor = $this->factory->createEditor($household2);
         $editor->addMovement(
             $date,
@@ -368,7 +366,7 @@ final class MembersEditorTest extends TestCase
         );
 
         $persistables = $editor->getPersistable();
-        $this->assertEquals(1, count($persistables));
+        $this->assertEquals(1, \count($persistables));
 
         $membership2 = $persistables[0];
         $this->assertSame($household2, $membership2->getHousehold());
@@ -391,7 +389,7 @@ final class MembersEditorTest extends TestCase
 
         $factory = $this->buildMembersEditorFactory();
         $editor = $factory->createEditor($household1);
-        $editor->addMovement(new DateTimeImmutable('today'), $person, $positionSharing);
+        $editor->addMovement(new \DateTimeImmutable('today'), $person, $positionSharing);
         $editor->postMove();
 
         self::assertContains($person, $household1->getCurrentPersons());
@@ -410,7 +408,7 @@ final class MembersEditorTest extends TestCase
         );
         $editor = $factory->createEditor($household2);
 
-        $editor->addMovement(new DateTimeImmutable('today'), $person, $positionNotSharing);
+        $editor->addMovement(new \DateTimeImmutable('today'), $person, $positionNotSharing);
         $editor->postMove();
 
         // $household1 still contains $person
@@ -442,7 +440,7 @@ final class MembersEditorTest extends TestCase
 
         $factory = $this->buildMembersEditorFactory();
         $editor = $factory->createEditor($household1);
-        $editor->addMovement(new DateTimeImmutable('1 year ago'), $person, $positionSharing);
+        $editor->addMovement(new \DateTimeImmutable('1 year ago'), $person, $positionSharing);
         $editor->postMove();
 
         self::assertContains($person, $household1->getCurrentPersons());
@@ -461,7 +459,7 @@ final class MembersEditorTest extends TestCase
         );
         $editor = $factory->createEditor($household2);
 
-        $editor->addMovement(new DateTimeImmutable('yesterday'), $person, $positionNotSharing);
+        $editor->addMovement(new \DateTimeImmutable('yesterday'), $person, $positionNotSharing);
         $editor->postMove();
 
         // $household1 still contains $person
@@ -494,7 +492,7 @@ final class MembersEditorTest extends TestCase
         // set into the first household
         $editor = $this->buildMembersEditorFactory()
             ->createEditor($household1);
-        $editor->addMovement(new DateTimeImmutable('1 year ago'), $person, $position);
+        $editor->addMovement(new \DateTimeImmutable('1 year ago'), $person, $position);
 
         // prepare for next move
         $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
@@ -507,7 +505,7 @@ final class MembersEditorTest extends TestCase
         );
         $editor = $factory->createEditor($household1);
 
-        $editor->addMovement(new DateTimeImmutable('now'), $person, $position2);
+        $editor->addMovement(new \DateTimeImmutable('now'), $person, $position2);
 
         $editor->postMove();
     }
@@ -523,7 +521,7 @@ final class MembersEditorTest extends TestCase
         // set into the first household
         $editor = $this->buildMembersEditorFactory()
             ->createEditor($household1);
-        $editor->addMovement(new DateTimeImmutable('1 year ago'), $person, $position);
+        $editor->addMovement(new \DateTimeImmutable('1 year ago'), $person, $position);
 
         // perform now the movement
         $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
@@ -536,7 +534,7 @@ final class MembersEditorTest extends TestCase
         );
         $editor = $factory->createEditor($household2);
 
-        $editor->addMovement(new DateTimeImmutable('now'), $person, $position);
+        $editor->addMovement(new \DateTimeImmutable('now'), $person, $position);
 
         $editor->postMove();
     }
@@ -557,14 +555,14 @@ final class MembersEditorTest extends TestCase
         );
         $editor = $factory->createEditor($household1);
 
-        $editor->addMovement(new DateTimeImmutable('now'), $person, $position);
+        $editor->addMovement(new \DateTimeImmutable('now'), $person, $position);
 
         $editor->postMove();
     }
 
     private function buildMembersEditorFactory(
-        ?EventDispatcherInterface $eventDispatcher = null,
-        ?ValidatorInterface $validator = null
+        EventDispatcherInterface $eventDispatcher = null,
+        ValidatorInterface $validator = null
     ) {
         if (null === $eventDispatcher) {
             $double = $this->getProphet()->prophesize();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Repository/AccompanyingPeriodACLAwareRepositoryTest.php b/src/Bundle/ChillPersonBundle/Tests/Repository/AccompanyingPeriodACLAwareRepositoryTest.php
index 83335c02a..87c57be86 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Repository/AccompanyingPeriodACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Repository/AccompanyingPeriodACLAwareRepositoryTest.php
@@ -32,6 +32,7 @@ use Symfony\Component\Workflow\Registry;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
@@ -76,7 +77,7 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
 
         foreach (self::$periodsIdsToDelete as $id) {
             if (null === $period = $repository->find($id)) {
-                throw new \RuntimeException("period not found while trying to delete it");
+                throw new \RuntimeException('period not found while trying to delete it');
             }
 
             foreach ($period->getParticipations() as $participation) {
@@ -87,7 +88,7 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
 
         foreach (self::$entitiesToDelete as [$class, $id]) {
             if (null === $entity = $em->find($class, $id)) {
-                throw new \RuntimeException(sprintf("entity %s with id %d not found", $class, $id));
+                throw new \RuntimeException(sprintf('entity %s with id %d not found', $class, $id));
             }
             $em->remove($entity);
         }
@@ -97,9 +98,10 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
 
     /**
      * @dataProvider provideDataFindByUserAndPostalCodesOpenedAccompanyingPeriod
+     *
      * @param list<array{center: Center, scopeOnRole: list<Scope>, scopeCanSeeConfidential: list<Scope>}> $centerScopes
-     * @param list<AccompanyingPeriod> $expectedContains
-     * @param list<AccompanyingPeriod> $expectedNotContains
+     * @param list<AccompanyingPeriod>                                                                    $expectedContains
+     * @param list<AccompanyingPeriod>                                                                    $expectedNotContains
      */
     public function testFindByUserAndPostalCodesOpenedAccompanyingPeriod(User $user, User $searched, array $centerScopes, array $expectedContains, array $expectedNotContains, string $message): void
     {
@@ -142,22 +144,22 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
     {
         $this->setUp();
 
-        if (null === $user = $this->entityManager->createQuery("SELECT u FROM " . User::class . " u")->setMaxResults(1)->getSingleResult()) {
-            throw new \RuntimeException("no user found");
+        if (null === $user = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u')->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('no user found');
         }
 
-        if (null === $anotherUser = $this->entityManager->createQuery("SELECT u FROM " . User::class . " u WHERE u.id != :uid")->setParameter('uid', $user->getId())
+        if (null === $anotherUser = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u WHERE u.id != :uid')->setParameter('uid', $user->getId())
             ->setMaxResults(1)->getSingleResult()) {
-            throw new \RuntimeException("no user found");
+            throw new \RuntimeException('no user found');
         }
 
         $persons = $this->entityManager
-            ->createQuery("SELECT p FROM " . Person::class . " p JOIN p.centerCurrent current_center")
+            ->createQuery('SELECT p FROM '.Person::class.' p JOIN p.centerCurrent current_center')
             ->setMaxResults(4)
             ->getResult();
 
         if (4 > count($persons)) {
-            throw new \RuntimeException("no person found");
+            throw new \RuntimeException('no person found');
         }
 
         /** @var Person $person */
@@ -166,16 +168,16 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
         $scopes = $this->scopeRepository->findAll();
 
         if (3 > count($scopes)) {
-            throw new \RuntimeException("not enough scopes for this test");
+            throw new \RuntimeException('not enough scopes for this test');
         }
-        $scopesCanSee = [ $scopes[0] ];
-        $scopesGroup2 = [ $scopes[1] ];
+        $scopesCanSee = [$scopes[0]];
+        $scopesGroup2 = [$scopes[1]];
 
         $centers = $this->centerRepository->findActive();
         $aCenterNotAssociatedToPerson = array_values(array_filter($centers, fn (Center $c) => $c !== $person->getCenter()))[0];
 
         if (2 > count($centers)) {
-            throw new \RuntimeException("not enough centers for this test");
+            throw new \RuntimeException('not enough centers for this test');
         }
 
         $period = $this->buildPeriod($person, $scopesCanSee, $user, true);
@@ -193,7 +195,7 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
             ],
             [$period],
             [],
-            "period should be visible with expected scopes",
+            'period should be visible with expected scopes',
         ];
 
         yield [
@@ -208,10 +210,10 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
             ],
             [],
             [$period],
-            "period should not be visible without expected scopes",
+            'period should not be visible without expected scopes',
         ];
 
-        yield  [
+        yield [
             $anotherUser,
             $user,
             [
@@ -228,7 +230,7 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
             ],
             [],
             [$period],
-            "period should not be visible for user having right in another scope (with multiple centers)"
+            'period should not be visible for user having right in another scope (with multiple centers)',
         ];
 
         $period = $this->buildPeriod($person, $scopesCanSee, $user, true);
@@ -247,7 +249,7 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
             ],
             [],
             [$period],
-            "period confidential should not be visible",
+            'period confidential should not be visible',
         ];
 
         yield [
@@ -262,7 +264,7 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
             ],
             [$period],
             [],
-            "period confidential be visible if user has required scopes",
+            'period confidential be visible if user has required scopes',
         ];
 
         $this->entityManager->flush();
@@ -270,9 +272,10 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
 
     /**
      * @dataProvider provideDataFindByUndispatched
+     *
      * @param list<array{center: Center, scopeOnRole: list<Scope>, scopeCanSeeConfidential: list<Scope>}> $centerScopes
-     * @param list<AccompanyingPeriod> $expectedContains
-     * @param list<AccompanyingPeriod> $expectedNotContains
+     * @param list<AccompanyingPeriod>                                                                    $expectedContains
+     * @param list<AccompanyingPeriod>                                                                    $expectedNotContains
      */
     public function testFindByUndispatched(User $user, array $centerScopes, array $expectedContains, array $expectedNotContains, string $message): void
     {
@@ -315,23 +318,23 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
     {
         $this->setUp();
 
-        if (null === $user = $this->entityManager->createQuery("SELECT u FROM " . User::class . " u")->setMaxResults(1)->getSingleResult()) {
-            throw new \RuntimeException("no user found");
+        if (null === $user = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u')->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('no user found');
         }
 
-        if (null === $anotherUser = $this->entityManager->createQuery("SELECT u FROM " . User::class . " u WHERE u.id != :uid")->setParameter('uid', $user->getId())
+        if (null === $anotherUser = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u WHERE u.id != :uid')->setParameter('uid', $user->getId())
             ->setMaxResults(1)->getSingleResult()) {
-            throw new \RuntimeException("no user found");
+            throw new \RuntimeException('no user found');
         }
 
         /** @var Person $person */
         $persons = $this->entityManager
-            ->createQuery("SELECT p FROM " . Person::class . " p ")
+            ->createQuery('SELECT p FROM '.Person::class.' p ')
             ->setMaxResults(4)
             ->getResult();
 
         if (4 > count($persons)) {
-            throw new \RuntimeException("no person found");
+            throw new \RuntimeException('no person found');
         }
 
         [$person, $anotherPerson, $person2, $person3] = $persons;
@@ -339,20 +342,19 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
         $scopes = $this->scopeRepository->findAll();
 
         if (3 > count($scopes)) {
-            throw new \RuntimeException("not enough scopes for this test");
+            throw new \RuntimeException('not enough scopes for this test');
         }
-        $scopesCanSee = [ $scopes[0] ];
-        $scopesGroup2 = [ $scopes[1] ];
+        $scopesCanSee = [$scopes[0]];
+        $scopesGroup2 = [$scopes[1]];
 
         $centers = $this->centerRepository->findActive();
 
         if (2 > count($centers)) {
-            throw new \RuntimeException("not enough centers for this test");
+            throw new \RuntimeException('not enough centers for this test');
         }
 
         $period = $this->buildPeriod($person, $scopesCanSee, $user, true);
 
-
         // expected scope: can see the period
         yield [
             $anotherUser,
@@ -365,7 +367,7 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
             ],
             [$period],
             [],
-            "period should be visible with expected scopes",
+            'period should be visible with expected scopes',
         ];
 
         // no scope visible
@@ -380,11 +382,11 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
             ],
             [],
             [$period],
-            "period should not be visible without expected scopes",
+            'period should not be visible without expected scopes',
         ];
 
         // another center
-        yield  [
+        yield [
             $anotherUser,
             [
                 [
@@ -400,7 +402,7 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
             ],
             [],
             [$period],
-            "period should not be visible for user having right in another scope (with multiple centers)"
+            'period should not be visible for user having right in another scope (with multiple centers)',
         ];
 
         $this->entityManager->flush();
@@ -410,9 +412,10 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
      * For testing this method, we mock the authorization helper to return different Scope that a user
      * can see, or that a user can see confidential periods.
      *
-     * @param array<Scope> $scopeUserCanSee
-     * @param array<Scope> $scopeUserCanSeeConfidential
+     * @param array<Scope>              $scopeUserCanSee
+     * @param array<Scope>              $scopeUserCanSeeConfidential
      * @param array<AccompanyingPeriod> $expectedPeriod
+     *
      * @dataProvider provideDataForFindByPerson
      */
     public function testFindByPersonTestUser(User $user, Person $person, array $scopeUserCanSee, array $scopeUserCanSeeConfidential, array $expectedPeriod, string $message): void
@@ -446,18 +449,18 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
     {
         $this->setUp();
 
-        if (null === $user = $this->entityManager->createQuery("SELECT u FROM " . User::class . " u")->setMaxResults(1)->getSingleResult()) {
-            throw new \RuntimeException("no user found");
+        if (null === $user = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u')->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('no user found');
         }
 
-        if (null === $anotherUser = $this->entityManager->createQuery("SELECT u FROM " . User::class . " u WHERE u.id != :uid")->setParameter('uid', $user->getId())
+        if (null === $anotherUser = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u WHERE u.id != :uid')->setParameter('uid', $user->getId())
             ->setMaxResults(1)->getSingleResult()) {
-            throw new \RuntimeException("no user found");
+            throw new \RuntimeException('no user found');
         }
 
-        if (null === $centerA = $this->entityManager->createQuery("SELECT c FROM " . Center::class . " c WHERE c.name LIKE :cn")->setParameter('cn', 'Center A')
+        if (null === $centerA = $this->entityManager->createQuery('SELECT c FROM '.Center::class.' c WHERE c.name LIKE :cn')->setParameter('cn', 'Center A')
             ->setMaxResults(1)->getSingleResult()) {
-            throw new \RuntimeException("Center A not found");
+            throw new \RuntimeException('Center A not found');
         }
         $persons = [new Person(), new Person(), new Person(), new Person()];
         $firstnames = ['alpha', 'beta', 'gamma', 'delta'];
@@ -467,7 +470,7 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
             $p
                 ->setFirstName($firstnames[$k])
                 ->setLastName($lastnames[$k])
-                ->setBirthdate((new \DateTime('today'))->sub(new \DateInterval('P' . random_int(18, 100) . 'Y')))
+                ->setBirthdate((new \DateTime('today'))->sub(new \DateInterval('P'.random_int(18, 100).'Y')))
                 ->setCenter($centerA)
             ;
             $this->entityManager->persist($p);
@@ -479,39 +482,39 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
         $scopes = $this->scopeRepository->findAll();
 
         if (3 > count($scopes)) {
-            throw new \RuntimeException("not enough scopes for this test");
+            throw new \RuntimeException('not enough scopes for this test');
         }
-        $scopesCanSee = [ $scopes[0] ];
-        $scopesGroup2 = [ $scopes[1] ];
+        $scopesCanSee = [$scopes[0]];
+        $scopesGroup2 = [$scopes[1]];
 
         // case: a period is in draft state
         $period = $this->buildPeriod($person, $scopesCanSee, $user, false);
 
-        yield [$user, $person, $scopesCanSee, [], [$period], "a user can see his period during draft state"];
+        yield [$user, $person, $scopesCanSee, [], [$period], 'a user can see his period during draft state'];
 
         // another user is not allowed to see this period, because it is in DRAFT state
-        yield [$anotherUser, $person, $scopesCanSee, [], [], "another user is not allowed to see the period of someone else in draft state"];
+        yield [$anotherUser, $person, $scopesCanSee, [], [], 'another user is not allowed to see the period of someone else in draft state'];
 
         // the period is confirmed
         $period = $this->buildPeriod($anotherPerson, $scopesCanSee, $user, true);
 
         // the other user can now see it
-        yield [$user, $anotherPerson, $scopesCanSee, [], [$period], "a user see his period when confirmed"];
-        yield [$anotherUser, $anotherPerson, $scopesCanSee, [], [$period], "another user with required scopes is allowed to see the period when not draft"];
-        yield [$anotherUser, $anotherPerson, $scopesGroup2, [], [], "another user without the required scopes is not allowed to see the period when not draft"];
+        yield [$user, $anotherPerson, $scopesCanSee, [], [$period], 'a user see his period when confirmed'];
+        yield [$anotherUser, $anotherPerson, $scopesCanSee, [], [$period], 'another user with required scopes is allowed to see the period when not draft'];
+        yield [$anotherUser, $anotherPerson, $scopesGroup2, [], [], 'another user without the required scopes is not allowed to see the period when not draft'];
 
         // this period will be confidential
         $period = $this->buildPeriod($person2, $scopesCanSee, $user, true);
         $period->setConfidential(true)->setUser($user, true);
 
-        yield [$user, $person2, $scopesCanSee, [], [$period], "a user see his period when confirmed and confidential with required scopes"];
-        yield [$user, $person2, $scopesGroup2, [], [$period], "a user see his period when confirmed and confidential without required scopes"];
+        yield [$user, $person2, $scopesCanSee, [], [$period], 'a user see his period when confirmed and confidential with required scopes'];
+        yield [$user, $person2, $scopesGroup2, [], [$period], 'a user see his period when confirmed and confidential without required scopes'];
         yield [$anotherUser, $person2, $scopesCanSee, [], [], "a user don't see a confidential period, even if he has required scopes"];
-        yield [$anotherUser, $person2, $scopesCanSee, $scopesCanSee, [$period], "a user see the period when confirmed and confidential if he has required scope to see the period"];
+        yield [$anotherUser, $person2, $scopesCanSee, $scopesCanSee, [$period], 'a user see the period when confirmed and confidential if he has required scope to see the period'];
 
         // period draft with creator = null
         $period = $this->buildPeriod($person3, $scopesCanSee, null, false);
-        yield [$user, $person3, $scopesCanSee, [], [$period], "a user see a period when draft if no creator on the period"];
+        yield [$user, $person3, $scopesCanSee, [], [$period], 'a user see a period when draft if no creator on the period'];
         $this->entityManager->flush();
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php b/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
index 72059847a..493e71e3a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
@@ -23,10 +23,10 @@ use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Security\Core\Security;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonACLAwareRepositoryTest extends KernelTestCase
@@ -91,11 +91,11 @@ final class PersonACLAwareRepositoryTest extends KernelTestCase
 
         $results = $repository->findBySearchCriteria(0, 5, false, 'diallo');
 
-        $this->assertGreaterThan(0, count($results));
+        $this->assertGreaterThan(0, \count($results));
         $this->assertContainsOnlyInstancesOf(Person::class, $results);
 
         foreach ($results as $person) {
-            $this->assertStringContainsString('diallo', strtolower($person->getFirstName() . ' ' . $person->getLastName()));
+            $this->assertStringContainsString('diallo', strtolower($person->getFirstName().' '.$person->getLastName()));
         }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Repository/UserRepositoryTest.php b/src/Bundle/ChillPersonBundle/Tests/Repository/UserRepositoryTest.php
index 5a99b8e4c..3f81f1ebe 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Repository/UserRepositoryTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Repository/UserRepositoryTest.php
@@ -16,6 +16,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class UserRepositoryTest extends KernelTestCase
@@ -37,7 +38,7 @@ class UserRepositoryTest extends KernelTestCase
         $i = 0;
         foreach ($userIterator as $u) {
             self::assertIsArray($u);
-            $i++;
+            ++$i;
         }
         self::assertGreaterThan(0, $i);
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php b/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php
index 2c6dd3871..1577ef2fe 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  * Test Person search.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PersonSearchTest extends WebTestCase
@@ -171,7 +172,7 @@ final class PersonSearchTest extends WebTestCase
         $crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu firstname:Jean');
 
         $this->assertMatchesRegularExpression('/Depardieu/', $crawler->filter('.list-with-period')->text());
-        //if this is a AND clause, Jean Depardieu should not appears
+        // if this is a AND clause, Jean Depardieu should not appears
         $this->assertDoesNotMatchRegularExpression(
             '/Gérard/',
             $crawler->filter('.list-with-period')->text(),
@@ -185,7 +186,7 @@ final class PersonSearchTest extends WebTestCase
         $crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu nationality:RU');
 
         $this->assertMatchesRegularExpression('/Gérard/', $crawler->filter('.list-with-period')->text());
-        //if this is a AND clause, Jean Depardieu should not appears
+        // if this is a AND clause, Jean Depardieu should not appears
         $this->assertDoesNotMatchRegularExpression(
             '/Jean/',
             $crawler->filter('.list-with-period')->text(),
diff --git a/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php b/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
index e6651028c..1dbbceb3e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
@@ -24,6 +24,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
  * Test PersonVoter.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PersonVoterTest extends KernelTestCase
@@ -154,11 +155,11 @@ final class PersonVoterTest extends KernelTestCase
      *
      * @return \Symfony\Component\Security\Core\Authentication\Token\TokenInterface
      */
-    protected function prepareToken(?array $permissions = null)
+    protected function prepareToken(array $permissions = null)
     {
         $token = $this->prophet->prophesize();
         $token
-            ->willImplement('\\' . \Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
+            ->willImplement('\\'.\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
 
         if (null === $permissions) {
             $token->getUser()->willReturn(null);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
index 9e5a8090e..3825f1404 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodOriginNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodOriginNormalizerTest.php
index cba5ed875..f69496b4d 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodOriginNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodOriginNormalizerTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodOriginNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodResourceNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodResourceNormalizerTest.php
index 0c4188826..8c76d6d86 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodResourceNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodResourceNormalizerTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodResourceNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
index ce226834b..c438be5f0 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
@@ -17,13 +17,13 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Chill\PersonBundle\Entity\SocialWork\Result;
-use DateTimeImmutable;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodWorkDocGenNormalizerTest extends KernelTestCase
@@ -67,8 +67,8 @@ final class AccompanyingPeriodWorkDocGenNormalizerTest extends KernelTestCase
             ->addPerson((new Person())->setFirstName('hello')->setLastName('name'))
             ->addGoal($g = new AccompanyingPeriodWorkGoal())
             ->addResult($r = new Result())
-            ->setCreatedAt(new DateTimeImmutable())
-            ->setUpdatedAt(new DateTimeImmutable())
+            ->setCreatedAt(new \DateTimeImmutable())
+            ->setUpdatedAt(new \DateTimeImmutable())
             ->setCreatedBy($user = new User())
             ->setUpdatedBy($user);
         $g->addResult($r)->setGoal($goal = new Goal());
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizerTest.php
index b56cb1fd9..4ab4b667e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizerTest.php
@@ -16,11 +16,11 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluatio
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
 use Chill\PersonBundle\Serializer\Normalizer\AccompanyingPeriodWorkEvaluationDenormalizer;
 use PHPUnit\Framework\TestCase;
-use ReflectionProperty;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodWorkEvaluationDenormalizerTest extends TestCase
@@ -102,7 +102,7 @@ final class AccompanyingPeriodWorkEvaluationDenormalizerTest extends TestCase
         $evaluation = new AccompanyingPeriodWorkEvaluation();
         $doc = new AccompanyingPeriodWorkEvaluationDocument();
         $doc->setStoredObject($storedObject = new StoredObject());
-        $reflectionProperty = new ReflectionProperty(AccompanyingPeriodWorkEvaluationDocument::class, 'id');
+        $reflectionProperty = new \ReflectionProperty(AccompanyingPeriodWorkEvaluationDocument::class, 'id');
         $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($doc, 1);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
index ab09a6db3..9cbeabea0 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
@@ -15,7 +15,6 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
@@ -23,6 +22,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdNormalizerTest extends KernelTestCase
@@ -52,8 +52,8 @@ final class HouseholdNormalizerTest extends KernelTestCase
             ->setAllowHolder(true);
 
         $member->setPerson($person)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('1 month ago'))
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('1 month ago'))
             ->setPosition($position);
 
         $household->addMember($member);
@@ -87,8 +87,8 @@ final class HouseholdNormalizerTest extends KernelTestCase
             ->setAllowHolder(true);
 
         $member->setPerson($previousPerson)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('1 month ago'))
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('1 month ago'))
             ->setPosition($position);
 
         $household->addMember($member);
@@ -98,7 +98,7 @@ final class HouseholdNormalizerTest extends KernelTestCase
         $this->entityManager->persist($currentPerson1);
         $member = new HouseholdMember();
         $member->setPerson($currentPerson1)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
             ->setPosition($position);
         $household->addMember($member);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
index bf4031970..59bb0a731 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
@@ -28,10 +28,10 @@ use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_merge;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonDocGenNormalizerTest extends KernelTestCase
@@ -237,12 +237,12 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
     }
 
     private function buildNormalizer(
-        ?PersonRender $personRender = null,
-        ?RelationshipRepository $relationshipRepository = null,
-        ?TranslatorInterface $translator = null,
-        ?TranslatableStringHelper $translatableStringHelper = null,
-        ?NormalizerInterface $normalizer = null,
-        ?SummaryBudgetInterface $summaryBudget = null
+        PersonRender $personRender = null,
+        RelationshipRepository $relationshipRepository = null,
+        TranslatorInterface $translator = null,
+        TranslatableStringHelper $translatableStringHelper = null,
+        NormalizerInterface $normalizer = null,
+        SummaryBudgetInterface $summaryBudget = null
     ): PersonDocGenNormalizer {
         if (null === $summaryBudget) {
             $summaryBudget = $this->prophesize(SummaryBudgetInterface::class);
@@ -274,11 +274,11 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
     }
 
     private function buildPersonNormalizer(
-        ?PersonRender $personRender = null,
-        ?RelationshipRepository $relationshipRepository = null,
-        ?TranslatorInterface $translator = null,
-        ?TranslatableStringHelper $translatableStringHelper = null,
-        ?SummaryBudgetInterface $summaryBudget = null
+        PersonRender $personRender = null,
+        RelationshipRepository $relationshipRepository = null,
+        TranslatorInterface $translator = null,
+        TranslatableStringHelper $translatableStringHelper = null,
+        SummaryBudgetInterface $summaryBudget = null
     ): PersonDocGenNormalizer {
         if (null === $relationshipRepository) {
             $relationshipRepository = $this->prophesize(RelationshipRepository::class);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
index 6e602436a..4c2c3b038 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
@@ -26,6 +26,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonJsonNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
index 6b3f49fde..ead8b7284 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
@@ -20,10 +20,10 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use function is_object;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RelationshipDocGenNormalizerTest extends TestCase
@@ -145,7 +145,7 @@ final class RelationshipDocGenNormalizerTest extends TestCase
                     return $r;
                 }
 
-                if (is_object($args[0])) {
+                if (\is_object($args[0])) {
                     return ['fake' => true, 'hash' => null !== $args[0] ? spl_object_hash($args[0]) : null];
                 }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/ResourceJsonNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/ResourceJsonNormalizerTest.php
index 19c8b9156..c55dc3f90 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/ResourceJsonNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/ResourceJsonNormalizerTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ResourceJsonNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialActionNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialActionNormalizerTest.php
index d3b9b2967..a0aa62013 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialActionNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialActionNormalizerTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialActionNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialIssueNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialIssueNormalizerTest.php
index 98a459cc7..ccafddfe3 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialIssueNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialIssueNormalizerTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialIssueNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/AccompanyingPeriodContextTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/AccompanyingPeriodContextTest.php
index b5f656702..fe8fac217 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/AccompanyingPeriodContextTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/AccompanyingPeriodContextTest.php
@@ -30,6 +30,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class AccompanyingPeriodContextTest extends KernelTestCase
@@ -86,17 +87,17 @@ class AccompanyingPeriodContextTest extends KernelTestCase
     }
 
     /**
-     * This test run the methods executed when a document is generated:
+     * This test run the methods executed when a document is generated:.
      *
      * - normalized data from the form in a way that they are stored in message queue;
      * - denormalize the data from the message queue,
      * - and get the data, as they will be transmitted to the GeneratorDriver
      *
-     * @param array $options the options, as they are stored in the DocGeneratorTemplate (the admin form data)
-     * @param AccompanyingPeriod $entity The entity from which the data will be extracted
-     * @param array $data The data, from the public form
-     * @param array $expectedNormalized, how the normalized data are expected (allow to check that this data will be compliant with the storage in messenger queue)
-     * @param callable $assertionsOnData some test that will be executed on the normalized data
+     * @param array              $options          the options, as they are stored in the DocGeneratorTemplate (the admin form data)
+     * @param AccompanyingPeriod $entity           The entity from which the data will be extracted
+     * @param array              $data             The data, from the public form
+     * @param callable           $assertionsOnData some test that will be executed on the normalized data
+     *
      * @dataProvider provideNormalizedData
      */
     public function testContextGenerationDataNormalizeDenormalizeGetData(
@@ -108,8 +109,8 @@ class AccompanyingPeriodContextTest extends KernelTestCase
     ): void {
         $context = $this->buildContext();
         $template = new DocGeneratorTemplate();
-        $template->setName(["fr" => "test"])->setContext(AccompanyingPeriodContext::class)
-            ->setDescription("description")->setActive(true)
+        $template->setName(['fr' => 'test'])->setContext(AccompanyingPeriodContext::class)
+            ->setDescription('description')->setActive(true)
             ->setOptions($options);
 
         $normalized = $context->contextGenerationDataNormalize($template, $entity, $data);
@@ -128,28 +129,28 @@ class AccompanyingPeriodContextTest extends KernelTestCase
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        $thirdParty = $em->createQuery("SELECT t FROM " . ThirdParty::class . " t")
+        $thirdParty = $em->createQuery('SELECT t FROM '.ThirdParty::class.' t')
             ->setMaxResults(1)
             ->getSingleResult();
 
         if (null === $thirdParty) {
-            throw new \RuntimeException("No thirdparty in database");
+            throw new \RuntimeException('No thirdparty in database');
         }
 
-        $period = $em->createQuery("SELECT a FROM " . AccompanyingPeriod::class . " a WHERE a.step = 'CONFIRMED'")
+        $period = $em->createQuery('SELECT a FROM '.AccompanyingPeriod::class." a WHERE a.step = 'CONFIRMED'")
             ->setMaxResults(1)
             ->getSingleResult();
 
         if (null === $period) {
-            throw new \RuntimeException("No confirmed period in database");
+            throw new \RuntimeException('No confirmed period in database');
         }
 
-        $person = $em->createQuery("SELECT p FROM " . Person::class . " p")
+        $person = $em->createQuery('SELECT p FROM '.Person::class.' p')
             ->setMaxResults(1)
             ->getSingleResult();
 
         if (null === $person) {
-            throw new \RuntimeException("No confirmed period in database");
+            throw new \RuntimeException('No confirmed period in database');
         }
 
         yield [
@@ -162,11 +163,11 @@ class AccompanyingPeriodContextTest extends KernelTestCase
                 'person2' => false,
                 'person2Label' => 'person2',
                 'thirdParty' => true,
-                'thirdPartyLabel' => '3party'
+                'thirdPartyLabel' => '3party',
             ],
             $period,
             [
-                'thirdParty' => $thirdParty
+                'thirdParty' => $thirdParty,
             ],
             [
                 'thirdParty' => $thirdParty->getId(),
@@ -193,7 +194,7 @@ class AccompanyingPeriodContextTest extends KernelTestCase
                 'person2' => false,
                 'person2Label' => 'person2',
                 'thirdParty' => false,
-                'thirdPartyLabel' => '3party'
+                'thirdPartyLabel' => '3party',
             ],
             $period,
             [
@@ -224,7 +225,7 @@ class AccompanyingPeriodContextTest extends KernelTestCase
                 'person2' => true,
                 'person2Label' => 'person2',
                 'thirdParty' => true,
-                'thirdPartyLabel' => '3party'
+                'thirdPartyLabel' => '3party',
             ],
             $period,
             [
@@ -267,7 +268,7 @@ class AccompanyingPeriodContextTest extends KernelTestCase
                 'person2' => false,
                 'person2Label' => 'person2',
                 'thirdParty' => false,
-                'thirdPartyLabel' => '3party'
+                'thirdPartyLabel' => '3party',
             ],
             $period,
             [
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php
index e3523d0c4..772e669bb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php
@@ -28,7 +28,6 @@ use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\PersonBundle\Service\DocGenerator\AccompanyingPeriodContext;
@@ -37,7 +36,6 @@ use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\ORM\EntityManagerInterface;
-use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Exception\Prediction\FailedPredictionException;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -50,10 +48,10 @@ use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonContextTest extends KernelTestCase
@@ -61,17 +59,17 @@ final class PersonContextTest extends KernelTestCase
     use ProphecyTrait;
 
     /**
-     * This test run the methods executed when a document is generated:
+     * This test run the methods executed when a document is generated:.
      *
      * - normalized data from the form in a way that they are stored in message queue;
      * - denormalize the data from the message queue,
      * - and get the data, as they will be transmitted to the GeneratorDriver
      *
-     * @param array $options the options, as they are stored in the DocGeneratorTemplate (the admin form data)
-     * @param Person $entity The entity from which the data will be extracted
-     * @param array $data The data, from the public form
-     * @param array $expectedNormalized, how the normalized data are expected (allow to check that this data will be compliant with the storage in messenger queue)
+     * @param array    $options          the options, as they are stored in the DocGeneratorTemplate (the admin form data)
+     * @param Person   $entity           The entity from which the data will be extracted
+     * @param array    $data             The data, from the public form
      * @param callable $assertionsOnData some test that will be executed on the normalized data
+     *
      * @dataProvider provideNormalizedData
      */
     public function testContextGenerationDataNormalizeDenormalizeGetData(
@@ -93,7 +91,7 @@ final class PersonContextTest extends KernelTestCase
             self::$container->get(DocumentCategoryRepository::class),
             self::$container->get(EntityManagerInterface::class),
             self::$container->get(NormalizerInterface::class),
-            (new ParameterBag(['chill_main' => ['acl' => ['form_show_scopes' => false]]])),
+            new ParameterBag(['chill_main' => ['acl' => ['form_show_scopes' => false]]]),
             null,
             self::$container->get(Security::class),
             null,
@@ -102,8 +100,8 @@ final class PersonContextTest extends KernelTestCase
             self::$container->get(ThirdPartyRepository::class)
         );
         $template = new DocGeneratorTemplate();
-        $template->setName(["fr" => "test"])->setContext(AccompanyingPeriodContext::class)
-            ->setDescription("description")->setActive(true)
+        $template->setName(['fr' => 'test'])->setContext(AccompanyingPeriodContext::class)
+            ->setDescription('description')->setActive(true)
             ->setOptions($options);
 
         $normalized = $context->contextGenerationDataNormalize($template, $entity, $data);
@@ -122,27 +120,27 @@ final class PersonContextTest extends KernelTestCase
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        $thirdParty = $em->createQuery("SELECT t FROM " . ThirdParty::class . " t")
+        $thirdParty = $em->createQuery('SELECT t FROM '.ThirdParty::class.' t')
             ->setMaxResults(1)
             ->getSingleResult();
 
         if (null === $thirdParty) {
-            throw new \RuntimeException("No thirdparty in database");
+            throw new \RuntimeException('No thirdparty in database');
         }
 
-        $person = $em->createQuery("SELECT p FROM " . Person::class . " p")
+        $person = $em->createQuery('SELECT p FROM '.Person::class.' p')
             ->setMaxResults(1)
             ->getSingleResult();
 
         if (null === $person) {
-            throw new \RuntimeException("No confirmed period in database");
+            throw new \RuntimeException('No confirmed period in database');
         }
 
         $category = self::$container->get(DocumentCategoryRepository::class)
             ->findAll()[0];
 
         if (null === $category) {
-            throw new \RuntimeException("no document category in database");
+            throw new \RuntimeException('no document category in database');
         }
 
         yield [
@@ -167,7 +165,7 @@ final class PersonContextTest extends KernelTestCase
 
                 self::assertArrayHasKey('thirdParty', $data);
                 self::assertEquals($thirdParty->getId(), $data['thirdParty']['id']);
-            }
+            },
         ];
 
         yield [
@@ -185,10 +183,10 @@ final class PersonContextTest extends KernelTestCase
                 'scope_id' => null,
                 'thirdParty' => null,
             ],
-            function ($data) use ($person, $thirdParty) {
+            function ($data) use ($person) {
                 self::assertArrayHasKey('person', $data);
                 self::assertEquals($person->getId(), $data['person']['id']);
-            }
+            },
         ];
     }
 
@@ -205,8 +203,8 @@ final class PersonContextTest extends KernelTestCase
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->persist(Argument::type(PersonDocument::class))
             ->should(static function ($calls, $object, $method) {
-                if (1 !== count($calls)) {
-                    throw new FailedPredictionException(sprintf('the persist should be called exactly once, %d receivved', count($calls)));
+                if (1 !== \count($calls)) {
+                    throw new FailedPredictionException(sprintf('the persist should be called exactly once, %d receivved', \count($calls)));
                 }
 
                 /** @var PersonDocument $personDocument */
@@ -247,8 +245,8 @@ final class PersonContextTest extends KernelTestCase
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->persist(Argument::type(PersonDocument::class))
             ->should(static function ($calls, $object, $method) use ($scope) {
-                if (1 !== count($calls)) {
-                    throw new FailedPredictionException(sprintf('the persist should be called exactly once, %d receivved', count($calls)));
+                if (1 !== \count($calls)) {
+                    throw new FailedPredictionException(sprintf('the persist should be called exactly once, %d receivved', \count($calls)));
                 }
 
                 /** @var PersonDocument $personDocument */
@@ -291,8 +289,8 @@ final class PersonContextTest extends KernelTestCase
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->persist(Argument::type(PersonDocument::class))
             ->should(static function ($calls, $object, $method) use ($scope) {
-                if (1 !== count($calls)) {
-                    throw new FailedPredictionException(sprintf('the persist should be called exactly once, %d received', count($calls)));
+                if (1 !== \count($calls)) {
+                    throw new FailedPredictionException(sprintf('the persist should be called exactly once, %d received', \count($calls)));
                 }
 
                 /** @var PersonDocument $personDocument */
@@ -343,20 +341,20 @@ final class PersonContextTest extends KernelTestCase
     }
 
     private function buildPersonContext(
-        ?AuthorizationHelperInterface $authorizationHelper = null,
-        ?BaseContextData $baseContextData = null,
-        ?CenterResolverManagerInterface $centerResolverManager = null,
-        ?DocumentCategoryRepository $documentCategoryRepository = null,
-        ?EntityManagerInterface $em = null,
-        ?NormalizerInterface $normalizer = null,
-        ?ParameterBagInterface $parameterBag = null,
-        ?ScopeRepositoryInterface $scopeRepository = null,
-        ?Security $security = null,
-        ?TranslatorInterface $translator = null,
-        ?TranslatableStringHelperInterface $translatableStringHelper = null,
-        ?ThirdPartyRender $thirdPartyRender = null,
-        ?ThirdPartyRepository $thirdPartyRepository = null,
-        ?ResidentialAddressRepository $residentialAddressRepository = null
+        AuthorizationHelperInterface $authorizationHelper = null,
+        BaseContextData $baseContextData = null,
+        CenterResolverManagerInterface $centerResolverManager = null,
+        DocumentCategoryRepository $documentCategoryRepository = null,
+        EntityManagerInterface $em = null,
+        NormalizerInterface $normalizer = null,
+        ParameterBagInterface $parameterBag = null,
+        ScopeRepositoryInterface $scopeRepository = null,
+        Security $security = null,
+        TranslatorInterface $translator = null,
+        TranslatableStringHelperInterface $translatableStringHelper = null,
+        ThirdPartyRender $thirdPartyRender = null,
+        ThirdPartyRepository $thirdPartyRepository = null,
+        ResidentialAddressRepository $residentialAddressRepository = null
     ): PersonContext {
         if (null === $authorizationHelper) {
             $authorizationHelper = $this->prophesize(AuthorizationHelperInterface::class)->reveal();
@@ -435,7 +433,7 @@ final class PersonContextTest extends KernelTestCase
                     (new Person\ResidentialAddress())
                         ->setAddress((new Address())
                             ->setStreet('test street')
-                            ->setPostcode(new PostalCode()))
+                            ->setPostcode(new PostalCode())),
                 ]);
             $residentialAddressRepository = $residentialAddressRepository->reveal();
         }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextWithThirdPartyTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextWithThirdPartyTest.php
index fc3063ebc..60d958a88 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextWithThirdPartyTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextWithThirdPartyTest.php
@@ -24,6 +24,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonContextWithThirdPartyTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProviderTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProviderTest.php
index 8aff23673..6f378f02b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProviderTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProviderTest.php
@@ -24,6 +24,7 @@ use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class AccompanyingPeriodCalendarGenericDocProviderTest extends KernelTestCase
@@ -102,33 +103,33 @@ class AccompanyingPeriodCalendarGenericDocProviderTest extends KernelTestCase
     {
         $this->setUp();
 
-        if (null === $person = $this->entityManager->createQuery("SELECT p FROM " . Person::class . " p WHERE SIZE(p.accompanyingPeriodParticipations) > 0")
+        if (null === $person = $this->entityManager->createQuery('SELECT p FROM '.Person::class.' p WHERE SIZE(p.accompanyingPeriodParticipations) > 0')
             ->setMaxResults(1)->getSingleResult()) {
-            throw new \RuntimeException("There is no person");
+            throw new \RuntimeException('There is no person');
         }
 
         yield [$person, null, null, null];
-        yield [$person, new \DateTimeImmutable("1 year ago"), null, null];
-        yield [$person, new \DateTimeImmutable("1 year ago"), new \DateTimeImmutable("6 month ago"), null];
-        yield [$person, new \DateTimeImmutable("1 year ago"), new \DateTimeImmutable("6 month ago"), "text"];
-        yield [$person, null, null, "text"];
-        yield [$person, null, new \DateTimeImmutable("6 month ago"), null];
+        yield [$person, new \DateTimeImmutable('1 year ago'), null, null];
+        yield [$person, new \DateTimeImmutable('1 year ago'), new \DateTimeImmutable('6 month ago'), null];
+        yield [$person, new \DateTimeImmutable('1 year ago'), new \DateTimeImmutable('6 month ago'), 'text'];
+        yield [$person, null, null, 'text'];
+        yield [$person, null, new \DateTimeImmutable('6 month ago'), null];
     }
 
     public function provideDataForAccompanyingPeriod(): iterable
     {
         $this->setUp();
 
-        if (null === $period = $this->entityManager->createQuery("SELECT p FROM " . AccompanyingPeriod::class . " p ")
+        if (null === $period = $this->entityManager->createQuery('SELECT p FROM '.AccompanyingPeriod::class.' p ')
             ->setMaxResults(1)->getSingleResult()) {
-            throw new \RuntimeException("There is no accompanying period");
+            throw new \RuntimeException('There is no accompanying period');
         }
 
         yield [$period, null, null, null];
-        yield [$period, new \DateTimeImmutable("1 year ago"), null, null];
-        yield [$period, new \DateTimeImmutable("1 year ago"), new \DateTimeImmutable("6 month ago"), null];
-        yield [$period, new \DateTimeImmutable("1 year ago"), new \DateTimeImmutable("6 month ago"), "text"];
-        yield [$period, null, null, "text"];
-        yield [$period, null, new \DateTimeImmutable("6 month ago"), null];
+        yield [$period, new \DateTimeImmutable('1 year ago'), null, null];
+        yield [$period, new \DateTimeImmutable('1 year ago'), new \DateTimeImmutable('6 month ago'), null];
+        yield [$period, new \DateTimeImmutable('1 year ago'), new \DateTimeImmutable('6 month ago'), 'text'];
+        yield [$period, null, null, 'text'];
+        yield [$period, null, new \DateTimeImmutable('6 month ago'), null];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProviderTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProviderTest.php
index c9ed96581..afbc0b2ab 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProviderTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProviderTest.php
@@ -21,6 +21,7 @@ use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class AccompanyingPeriodWorkEvaluationGenericDocProviderTest extends KernelTestCase
@@ -38,11 +39,11 @@ class AccompanyingPeriodWorkEvaluationGenericDocProviderTest extends KernelTestC
      * @dataProvider provideSearchArguments
      */
     public function testBuildFetchQueryForAccompanyingPeriod(
-        ?\DateTimeImmutable $startDate = null,
-        ?\DateTimeImmutable $endDate = null,
-        ?string $content = null
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null
     ): void {
-        $period = $this->entityManager->createQuery("SELECT a FROM " . AccompanyingPeriod::class . ' a')
+        $period = $this->entityManager->createQuery('SELECT a FROM '.AccompanyingPeriod::class.' a')
             ->setMaxResults(1)
             ->getSingleResult();
 
@@ -66,7 +67,7 @@ class AccompanyingPeriodWorkEvaluationGenericDocProviderTest extends KernelTestC
             $types
         )->fetchOne();
 
-        self::assertIsInt($nb, "Test that there are no errors");
+        self::assertIsInt($nb, 'Test that there are no errors');
     }
 
     public function provideSearchArguments(): iterable
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/PersonCalendarGenericDocProviderTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/PersonCalendarGenericDocProviderTest.php
index dbad052ca..97ed90503 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/PersonCalendarGenericDocProviderTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/PersonCalendarGenericDocProviderTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class PersonCalendarGenericDocProviderTest extends KernelTestCase
@@ -55,16 +56,16 @@ class PersonCalendarGenericDocProviderTest extends KernelTestCase
     {
         $this->setUp();
 
-        if (null === $person = $this->entityManager->createQuery("SELECT p FROM " . Person::class . " p ")
+        if (null === $person = $this->entityManager->createQuery('SELECT p FROM '.Person::class.' p ')
             ->setMaxResults(1)->getSingleResult()) {
-            throw new \RuntimeException("There is no person");
+            throw new \RuntimeException('There is no person');
         }
 
         yield [$person, null, null, null];
-        yield [$person, new \DateTimeImmutable("1 year ago"), null, null];
-        yield [$person, new \DateTimeImmutable("1 year ago"), new \DateTimeImmutable("6 month ago"), null];
-        yield [$person, new \DateTimeImmutable("1 year ago"), new \DateTimeImmutable("6 month ago"), "text"];
-        yield [$person, null, null, "text"];
-        yield [$person, null, new \DateTimeImmutable("6 month ago"), null];
+        yield [$person, new \DateTimeImmutable('1 year ago'), null, null];
+        yield [$person, new \DateTimeImmutable('1 year ago'), new \DateTimeImmutable('6 month ago'), null];
+        yield [$person, new \DateTimeImmutable('1 year ago'), new \DateTimeImmutable('6 month ago'), 'text'];
+        yield [$person, null, null, 'text'];
+        yield [$person, null, new \DateTimeImmutable('6 month ago'), null];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Templating/Entity/ClosingMotiveRenderTest.php b/src/Bundle/ChillPersonBundle/Tests/Templating/Entity/ClosingMotiveRenderTest.php
index 8667576bc..cb7eb423a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Templating/Entity/ClosingMotiveRenderTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Templating/Entity/ClosingMotiveRenderTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class ClosingMotiveRenderTest extends KernelTestCase
@@ -31,7 +32,6 @@ class ClosingMotiveRenderTest extends KernelTestCase
 
     /**
      * @dataProvider provideClosingMotiveWithRenderString
-     * @return void
      */
     public function testRenderString(ClosingMotive $closingMotive, string $expected): void
     {
@@ -42,14 +42,12 @@ class ClosingMotiveRenderTest extends KernelTestCase
 
     /**
      * @dataProvider provideClosingMotiveWithRenderString
-     * @return void
      */
     public function testRenderBox(ClosingMotive $closingMotive, string $expectedContent): void
     {
         $actual = strip_tags(self::$closingMotiveRender->renderBox($closingMotive, []));
 
         self::assertStringContainsString($expectedContent, $actual);
-
     }
 
     public function provideClosingMotiveWithRenderString(): iterable
@@ -73,9 +71,5 @@ class ClosingMotiveRenderTest extends KernelTestCase
         $closingMotiveParent->addChildren($closingMotive);
 
         yield [$closingMotive, 'Parent > Children (annulé)'];
-
     }
-
-
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
index ce372c49e..2670b2402 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
@@ -15,14 +15,13 @@ use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use function array_pop;
-use function shuffle;
 
 /**
  * This class tests entries are shown for closing and opening
  * periods in timeline.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class TimelineAccompanyingPeriodTest extends WebTestCase
@@ -48,13 +47,13 @@ final class TimelineAccompanyingPeriodTest extends WebTestCase
             ->getQuery()
             ->getResult();
 
-        shuffle($personIds);
+        \shuffle($personIds);
 
-        yield [array_pop($personIds)['id']];
+        yield [\array_pop($personIds)['id']];
 
-        yield [array_pop($personIds)['id']];
+        yield [\array_pop($personIds)['id']];
 
-        yield [array_pop($personIds)['id']];
+        yield [\array_pop($personIds)['id']];
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validation/PersonValidationTest.php b/src/Bundle/ChillPersonBundle/Tests/Validation/PersonValidationTest.php
index b2b9e7602..636a059c5 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validation/PersonValidationTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validation/PersonValidationTest.php
@@ -13,12 +13,12 @@ namespace Chill\PersonBundle\Tests\Validation;
 
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class PersonValidationTest extends KernelTestCase
@@ -39,7 +39,7 @@ class PersonValidationTest extends KernelTestCase
     {
         $errors = self::$validator->validate($person);
 
-        $errorsFiltered = array_filter(iterator_to_array($errors), fn (ConstraintViolationInterface $e) => $path === $e->getPropertyPath() /*&& $code === $e->getCode()*/);
+        $errorsFiltered = array_filter(iterator_to_array($errors), fn (ConstraintViolationInterface $e) => $path === $e->getPropertyPath() /* && $code === $e->getCode() */);
 
         self::assertCount($expectedCountErrors, $errorsFiltered);
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php
index ca77c9632..72747b478 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LocationValidityValidatorTest extends ConstraintValidatorTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/ParticipationOverlapValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/ParticipationOverlapValidatorTest.php
index a4c67f565..8adfcf634 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/ParticipationOverlapValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/ParticipationOverlapValidatorTest.php
@@ -24,6 +24,7 @@ use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class ParticipationOverlapValidatorTest extends ConstraintValidatorTestCase
@@ -69,7 +70,7 @@ class ParticipationOverlapValidatorTest extends ConstraintValidatorTestCase
                 '{{ start }}' => (new \DateTimeImmutable('today'))->format('d-m-Y'),
                 '{{ end }}' => null,
                 '{{ ids }}' => [null, null],
-                '{{ name }}' => 'person'
+                '{{ name }}' => 'person',
             ])
             ->assertRaised();
     }
@@ -95,6 +96,7 @@ class ParticipationOverlapValidatorTest extends ConstraintValidatorTestCase
 
         $this->assertNoViolation();
     }
+
     protected function createValidator(): ParticipationOverlapValidator
     {
         $personRender = $this->prophesize(PersonRenderInterface::class);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php
index dee497ae4..da747a52c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php
@@ -18,11 +18,11 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Templating\Entity\PersonRender;
 use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential;
 use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequentialValidator;
-use DateTimeImmutable;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdMembershipSequentialValidatorTest extends ConstraintValidatorTestCase
@@ -48,11 +48,11 @@ final class HouseholdMembershipSequentialValidatorTest extends ConstraintValidat
             ->setShareHousehold(true);
         $membership = (new HouseholdMember())
             ->setPosition($position)
-            ->setStartDate(new DateTimeImmutable('2010-01-01'))
+            ->setStartDate(new \DateTimeImmutable('2010-01-01'))
             ->setPerson($person);
         $membership = (new HouseholdMember())
             ->setPosition($position)
-            ->setStartDate(new DateTimeImmutable('2011-01-01'))
+            ->setStartDate(new \DateTimeImmutable('2011-01-01'))
             ->setPerson($person);
 
         $this->validator->validate($person, $constraint);
@@ -76,11 +76,11 @@ final class HouseholdMembershipSequentialValidatorTest extends ConstraintValidat
             ->setShareHousehold(false);
         $membership = (new HouseholdMember())
             ->setPosition($position)
-            ->setStartDate(new DateTimeImmutable('2010-01-01'))
+            ->setStartDate(new \DateTimeImmutable('2010-01-01'))
             ->setPerson($person);
         $membership = (new HouseholdMember())
             ->setPosition($position)
-            ->setStartDate(new DateTimeImmutable('2011-01-01'))
+            ->setStartDate(new \DateTimeImmutable('2011-01-01'))
             ->setPerson($person);
 
         $this->validator->validate($person, $constraint);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php
index ac7530fca..c01682804 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php
@@ -16,11 +16,11 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Validator\Constraints\Household\MaxHolder;
 use Chill\PersonBundle\Validator\Constraints\Household\MaxHolderValidator;
-use DateTimeImmutable;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class MaxHolderValidatorTest extends ConstraintValidatorTestCase
@@ -34,20 +34,20 @@ final class MaxHolderValidatorTest extends ConstraintValidatorTestCase
             ->addMember(
                 (new HouseholdMember())
                     ->setHolder(true)
-                    ->setStartDate(new DateTimeImmutable('2010-01-01'))
-                    ->setEndDate(new DateTimeImmutable('2010-12-01'))
+                    ->setStartDate(new \DateTimeImmutable('2010-01-01'))
+                    ->setEndDate(new \DateTimeImmutable('2010-12-01'))
             )
             ->addMember(
                 (new HouseholdMember())
                     ->setHolder(true)
-                    ->setStartDate(new DateTimeImmutable('2010-06-01'))
-                    ->setEndDate(new DateTimeImmutable('2010-07-01'))
+                    ->setStartDate(new \DateTimeImmutable('2010-06-01'))
+                    ->setEndDate(new \DateTimeImmutable('2010-07-01'))
             )
             ->addMember(
                 (new HouseholdMember())
                     ->setHolder(true)
-                    ->setStartDate(new DateTimeImmutable('2010-01-01'))
-                    ->setEndDate(new DateTimeImmutable('2010-12-01'))
+                    ->setStartDate(new \DateTimeImmutable('2010-01-01'))
+                    ->setEndDate(new \DateTimeImmutable('2010-12-01'))
             );
 
         yield [
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
index ba4e7b27b..4be918d60 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Tests\Validator\Person;
 
 use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
 use Chill\PersonBundle\Validator\Constraints\Person\BirthdateValidator;
-use DateTime;
 use Symfony\Component\Clock\MockClock;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
@@ -22,44 +21,45 @@ use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
  * Test the behaviour of BirthdayValidator.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class BirthdateValidatorTest extends ConstraintValidatorTestCase
 {
     public function testTomorrowInvalid()
     {
-        $bornAfter = new DateTime('2023-08-31');
+        $bornAfter = new \DateTime('2023-08-31');
         $this->validator->validate($bornAfter, $this->createConstraint());
         $this->buildViolation('msg')
-            ->setParameter('%date%', (new DateTime('2023-08-29'))->format('d-m-Y'))
+            ->setParameter('%date%', (new \DateTime('2023-08-29'))->format('d-m-Y'))
             ->setCode('3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4')
             ->assertRaised();
     }
 
     public function testValidateTodayInvalid()
     {
-        $bornToday = new DateTime('2023-08-30');
+        $bornToday = new \DateTime('2023-08-30');
         $this->validator->validate($bornToday, $this->createConstraint());
         $this->buildViolation('msg')
-            ->setParameter('%date%', (new DateTime('2023-08-29'))->format('d-m-Y'))
+            ->setParameter('%date%', (new \DateTime('2023-08-29'))->format('d-m-Y'))
             ->setCode('3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4')
             ->assertRaised();
     }
 
     public function testValidateTooEarlyDate(): void
     {
-        $bornLongTimeAgo = new DateTime('1871-03-18');
+        $bornLongTimeAgo = new \DateTime('1871-03-18');
         $this->validator->validate($bornLongTimeAgo, $this->createConstraint());
 
         $this->buildViolation('below')
-            ->setParameter('%date%', (new DateTime('1873-08-30'))->format('d-m-Y'))
+            ->setParameter('%date%', (new \DateTime('1873-08-30'))->format('d-m-Y'))
             ->setCode('3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4')
             ->assertRaised();
     }
 
     public function testValidateYesterdayValid()
     {
-        $bornYesterday = new DateTime('2023-08-29');
+        $bornYesterday = new \DateTime('2023-08-29');
         $this->validator->validate($bornYesterday, $this->createConstraint());
         $this->assertNoViolation();
     }
@@ -76,7 +76,7 @@ final class BirthdateValidatorTest extends ConstraintValidatorTestCase
     {
         return new Birthdate([
             'message' => 'msg',
-            'belowMessage' => 'below'
+            'belowMessage' => 'below',
         ]);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
index 930df8c60..a14f77bda 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
@@ -23,6 +23,7 @@ use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonHasCenterValidatorTest extends ConstraintValidatorTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
index 1d73e1a59..efa273d22 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
@@ -13,14 +13,13 @@ namespace Validator\Person;
 
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
-use Datetime;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use function str_repeat;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonValidationTest extends KernelTestCase
@@ -36,7 +35,7 @@ final class PersonValidationTest extends KernelTestCase
     public function testBirthdateInFuture()
     {
         $person = (new Person())
-            ->setBirthdate(new Datetime('+2 months'));
+            ->setBirthdate(new \DateTime('+2 months'));
         $errors = $this->validator->validate($person, null);
 
         foreach ($errors->getIterator() as $error) {
@@ -58,7 +57,7 @@ final class PersonValidationTest extends KernelTestCase
     public function testFirstnameValidation()
     {
         $person = (new Person())
-            ->setFirstname(str_repeat('a', 500));
+            ->setFirstname(\str_repeat('a', 500));
         $errors = $this->validator->validate($person, null);
 
         foreach ($errors->getIterator() as $error) {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php b/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php
index 231fabccb..c64696b0e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php
@@ -12,12 +12,12 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Workflows;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTime;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Workflow\Registry;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodLifecycle extends KernelTestCase
@@ -30,7 +30,7 @@ final class AccompanyingPeriodLifecycle extends KernelTestCase
     public function testConfirm()
     {
         $registry = self::$container->get(Registry::class);
-        $period = new AccompanyingPeriod(new DateTime('now'));
+        $period = new AccompanyingPeriod(new \DateTime('now'));
         $workflow = $registry->get($period);
 
         $this->assertArrayHasKey('DRAFT', $workflow->getMarking($period)->getPlaces());
diff --git a/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
index feda9d7b7..6973eba1d 100644
--- a/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
@@ -19,12 +19,8 @@ use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManager;
-use LogicException;
 use Symfony\Component\Security\Core\Security;
 
-use function implode;
-use function in_array;
-
 /**
  * Provide method to build timeline for accompanying periods.
  *
@@ -43,7 +39,7 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
             ->getRepository('ChillPersonBundle:AccompanyingPeriod')
             ->findBy(['id' => $ids]);
 
-        //set results in an associative array with id as indexes
+        // set results in an associative array with id as indexes
         $results = [];
 
         foreach ($periods as $period) {
@@ -58,15 +54,14 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
      *
      * @param string $context
      *
-     * @throws LogicException
-     *
      * @return array
+     *
+     * @throws \LogicException
      */
     protected function basicFetchQuery($context, array $args)
     {
-        if (false === in_array($context, self::SUPPORTED_CONTEXTS, true)) {
-            throw new LogicException('TimelineAccompanyingPeriod is not able '
-                    . 'to render context ' . $context);
+        if (false === \in_array($context, self::SUPPORTED_CONTEXTS, true)) {
+            throw new \LogicException('TimelineAccompanyingPeriod is not able to render context '.$context);
         }
 
         $metadata = $this->em
@@ -98,7 +93,7 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
                 $questionMarks[] = '?';
                 $params[] = $c->getId();
             }
-            $query .= implode(', ', $questionMarks) . ')';
+            $query .= \implode(', ', $questionMarks).')';
 
             return [$query, $params];
         }
@@ -107,7 +102,7 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
             return ["{$participation->getTableName()}.{$join['name']} = ?", [$args['person']->getId()]];
         }
 
-        throw new LogicException("this context is not supported: {$context}");
+        throw new \LogicException("this context is not supported: {$context}");
     }
 
     /**
@@ -115,6 +110,7 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
      *
      * @param string $template the template for rendering
      * @param string $context
+     *
      * @return array
      */
     protected function getBasicEntityTemplate($template, mixed $entity, $context, array $args)
@@ -134,18 +130,18 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
         $joinPerson = $participation->getAssociationMapping('person')['joinColumns'][0];
 
         if ('person' === $context) {
-            return "{$period->getTableName()} " .
-                "JOIN {$participation->getTableName()} " .
-                "ON {$participation->getTableName()}.{$join['name']} = " .
+            return "{$period->getTableName()} ".
+                "JOIN {$participation->getTableName()} ".
+                "ON {$participation->getTableName()}.{$join['name']} = ".
                 "{$period->getTableName()}.{$join['referencedColumnName']}";
         }
 
-        return "{$period->getTableName()} " .
-                "JOIN {$participation->getTableName()} " .
-                "ON {$participation->getTableName()}.{$join['name']} = " .
-                "{$period->getTableName()}.{$join['referencedColumnName']} " .
-                "JOIN {$person->getTableName()} " .
-                "ON {$participation->getTableName()}.{$joinPerson['name']} = " .
+        return "{$period->getTableName()} ".
+                "JOIN {$participation->getTableName()} ".
+                "ON {$participation->getTableName()}.{$join['name']} = ".
+                "{$period->getTableName()}.{$join['referencedColumnName']} ".
+                "JOIN {$person->getTableName()} ".
+                "ON {$participation->getTableName()}.{$joinPerson['name']} = ".
                 "{$person->getTableName()}.{$joinPerson['referencedColumnName']}";
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
index 0ce7d10e3..6198e4e47 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
@@ -21,8 +21,6 @@ use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
-use function in_array;
-
 class AccompanyingPeriodValidityValidator extends ConstraintValidator
 {
     public function __construct(private readonly ActivityRepository $activityRepository, private readonly SocialIssueRender $socialIssueRender, private readonly TokenStorageInterface $token) {}
@@ -70,7 +68,7 @@ class AccompanyingPeriodValidityValidator extends ConstraintValidator
         }
 
         foreach ($socialIssuesByKey as $key => $si) {
-            if (!in_array($key, $periodIssuesWithAncestors, true)) {
+            if (!\in_array($key, $periodIssuesWithAncestors, true)) {
                 $this->context
                     ->buildViolation(
                         $constraint->messageSocialIssueCannotBeDeleted
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
index e844d95df..4b4a13c18 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
@@ -32,7 +32,7 @@ class LocationValidityValidator extends ConstraintValidator
             throw new UnexpectedValueException($period, AccompanyingPeriod::class);
         }
 
-        if ($period->getLocationStatus() === 'person') {
+        if ('person' === $period->getLocationStatus()) {
             if (
                 null === $period->getOpenParticipationContainsPerson(
                     $period->getPersonLocation()
@@ -48,8 +48,8 @@ class LocationValidityValidator extends ConstraintValidator
         }
 
         if (
-            $period->getStep() !== AccompanyingPeriod::STEP_DRAFT
-            && $period->getLocationStatus() === 'none'
+            AccompanyingPeriod::STEP_DRAFT !== $period->getStep()
+            && 'none' === $period->getLocationStatus()
         ) {
             $this->context
                 ->buildViolation(
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
index decf36c62..d3c25199b 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
@@ -20,8 +20,6 @@ use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
-use function count;
-
 class ParticipationOverlapValidator extends ConstraintValidator
 {
     private const MAX_PARTICIPATION = 1;
@@ -38,11 +36,11 @@ class ParticipationOverlapValidator extends ConstraintValidator
             throw new UnexpectedTypeException($participations, 'This should be a collection');
         }
 
-        if (count($participations) <= self::MAX_PARTICIPATION) {
+        if (\count($participations) <= self::MAX_PARTICIPATION) {
             return;
         }
 
-        if (0 === count($participations)) {
+        if (0 === \count($participations)) {
             return;
         }
 
@@ -59,7 +57,7 @@ class ParticipationOverlapValidator extends ConstraintValidator
         }
 
         foreach ($participationList as $group) {
-            if (count($group) > 1) {
+            if (\count($group) > 1) {
                 $overlaps = new DateRangeCovering(self::MAX_PARTICIPATION, $participations[0]->getStartDate()->getTimezone());
 
                 foreach ($group as $p) {
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php
index 3759a2347..d7573c400 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php
@@ -19,9 +19,6 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
-use function count;
-use function in_array;
-
 class ResourceDuplicateCheckValidator extends ConstraintValidator
 {
     public function __construct(private readonly PersonRenderInterface $personRender, private readonly ThirdPartyRender $thirdpartyRender) {}
@@ -36,7 +33,7 @@ class ResourceDuplicateCheckValidator extends ConstraintValidator
             throw new UnexpectedTypeException($resources, Collection::class);
         }
 
-        if (0 === count($resources)) {
+        if (0 === \count($resources)) {
             return;
         }
 
@@ -44,9 +41,9 @@ class ResourceDuplicateCheckValidator extends ConstraintValidator
 
         foreach ($resources as $resource) {
             $id = ($resource->getResource() instanceof Person ? 'p' :
-                't') . $resource->getResource()->getId();
+                't').$resource->getResource()->getId();
 
-            if (in_array($id, $resourceList, true)) {
+            if (\in_array($id, $resourceList, true)) {
                 $this->context->buildViolation($constraint->message)
                     ->setParameter('{{ name }}', $resource->getResource() instanceof Person ? $this->personRender->renderString($resource->getResource(), []) :
                         $this->thirdpartyRender->renderString($resource->getResource(), []))
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
index c2e5a32b6..2ca0af42c 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
@@ -18,8 +18,6 @@ use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
-use function count;
-
 /**
  * Validate that a person does not belong to two household at
  * the same time.
@@ -36,7 +34,7 @@ class HouseholdMembershipSequentialValidator extends ConstraintValidator
 
         $participations = $person->getHouseholdParticipationsShareHousehold();
 
-        if ($participations->count() === 0) {
+        if (0 === $participations->count()) {
             return;
         }
 
@@ -52,7 +50,7 @@ class HouseholdMembershipSequentialValidator extends ConstraintValidator
         if ($covers->hasIntersections()) {
             foreach ($covers->getIntersections() as [$start, $end, $metadata]) {
                 $participation = $participations[$metadata[0]];
-                $nbHousehold = count($metadata);
+                $nbHousehold = \count($metadata);
 
                 $this->context
                     ->buildViolation($constraint->message)
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
index 4966d5ff2..1a7634136 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
@@ -11,18 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Validator\Constraints\Person;
 
-use DateInterval;
-use DateTime;
-use LogicException;
 use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-use function get_class;
-use function gettype;
-use function is_object;
 
 class BirthdateValidator extends ConstraintValidator
 {
@@ -43,9 +36,8 @@ class BirthdateValidator extends ConstraintValidator
             return;
         }
 
-        if (!$value instanceof DateTime) {
-            throw new LogicException('The input should a be a \DateTime interface,'
-                    . (get_debug_type($value)));
+        if (!$value instanceof \DateTime) {
+            throw new \LogicException('The input should a be a \DateTime interface,'.get_debug_type($value));
         }
 
         if (!$constraint instanceof Birthdate) {
@@ -69,15 +61,15 @@ class BirthdateValidator extends ConstraintValidator
         }
     }
 
-    private function getLimitDate(): DateTime
+    private function getLimitDate(): \DateTime
     {
-        $interval = new DateInterval($this->interval_spec);
+        $interval = new \DateInterval($this->interval_spec);
 
-        return DateTime::createFromImmutable($this->clock->now()->sub($interval));
+        return \DateTime::createFromImmutable($this->clock->now()->sub($interval));
     }
 
-    private function getBelowLimitDate(): DateTime
+    private function getBelowLimitDate(): \DateTime
     {
-        return DateTime::createFromImmutable($this->clock->now()->sub(new DateInterval($this->below_interval)));
+        return \DateTime::createFromImmutable($this->clock->now()->sub(new \DateInterval($this->below_interval)));
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
index fb723ea3b..aab72f148 100644
--- a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
+++ b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
@@ -15,19 +15,12 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Templating\Widget\WidgetInterface;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use DateTime;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr;
-use RuntimeException;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Twig\Environment;
-use UnexpectedValueException;
-
-use function array_key_exists;
-use function count;
 
 /**
  * add a widget with person list.
@@ -43,9 +36,6 @@ class PersonListWidget implements WidgetInterface
 
     public function __construct(protected PersonRepository $personRepository, protected EntityManagerInterface $entityManager, protected AuthorizationHelperInterface $authorizationHelper, protected TokenStorageInterface $tokenStorage) {}
 
-    /**
-     * @param mixed $place
-     */
     public function render(Environment $env, $place, array $context, array $config)
     {
         $numberOfItems = $config['number_of_items'] ?? 20;
@@ -61,7 +51,7 @@ class PersonListWidget implements WidgetInterface
         $qb->setParameter('centers', $centers);
 
         // add the "only active" query
-        if (array_key_exists('only_active', $config) && true === $config['only_active']) {
+        if (\array_key_exists('only_active', $config) && true === $config['only_active']) {
             $qb->join('person.accompanyingPeriods', 'ap');
             $or = new Expr\Orx();
             // add the case where closingDate IS NULL
@@ -74,19 +64,14 @@ class PersonListWidget implements WidgetInterface
                 (new Expr())->between(':now', 'ap.openingDate', 'ap.closingDate')
             );
             $and->add($or);
-            $qb->setParameter('now', new DateTime(), Types::DATE_MUTABLE);
+            $qb->setParameter('now', new \DateTime(), Types::DATE_MUTABLE);
         }
 
-        if (array_key_exists('filtering_class', $config) && null !== $config['filtering_class']) {
+        if (\array_key_exists('filtering_class', $config) && null !== $config['filtering_class']) {
             $filteringClass = new $config['filtering_class']();
 
             if (!$filteringClass instanceof PersonListWidget\PersonFilteringInterface) {
-                throw new UnexpectedValueException(sprintf(
-                    'the class %s does not '
-                        . 'implements %s',
-                    $config['filtering_class'],
-                    PersonListWidget\PersonFilteringInterface::class
-                ));
+                throw new \UnexpectedValueException(sprintf('the class %s does not implements %s', $config['filtering_class'], PersonListWidget\PersonFilteringInterface::class));
             }
             $ids = $filteringClass->getPersonIds(
                 $this->entityManager,
@@ -113,7 +98,7 @@ class PersonListWidget implements WidgetInterface
         $cfields = [];
 
         if (isset($config['custom_fields'])) {
-            if (count($config['custom_fields']) > 0) {
+            if (\count($config['custom_fields']) > 0) {
                 $cfs = $this->entityManager
                     ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomField::class)
                     ->findBy(['slug' => $config['custom_fields']]);
@@ -138,15 +123,13 @@ class PersonListWidget implements WidgetInterface
         $token = $this->tokenStorage->getToken();
 
         if (null === $token) {
-            throw new RuntimeException('the token should not be null');
+            throw new \RuntimeException('the token should not be null');
         }
 
         $user = $token->getUser();
 
         if (null === $user) {
-            throw new RuntimeException(
-                'The user should implement UserInterface. Are you logged in ?'
-            );
+            throw new \RuntimeException('The user should implement UserInterface. Are you logged in ?');
         }
 
         return $user;
diff --git a/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php b/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
index fc6104810..204b6c7c7 100644
--- a/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
+++ b/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
@@ -34,7 +34,7 @@ class PersonListWidgetFactory extends AbstractWidgetFactory
         $node->arrayNode('custom_fields')
             ->prototype('scalar')->end()
             ->info('Add some custom field to the view. Add the slug of some custom field'
-                        . ' if you want to override the view and show their value in the list')
+                        .' if you want to override the view and show their value in the list')
             ->example(['custom-field-slug-1', 'custom-field-slug-2'])
             ->requiresAtLeastOneElement()
             ->end();
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index 04a68d4c0..0fc13224e 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -57,8 +57,8 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
         return $this->translator->trans(
             'workflow.Doc for evaluation (n°%eval%)',
             ['%eval%' => $entityWorkflow->getRelatedEntityId()]
-        ) . ' (' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
-            ->getEvaluation()->getTitle()) . ') ' . $doc->getTitle();
+        ).' ('.$this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
+            ->getEvaluation()->getTitle()).') '.$doc->getTitle();
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluationDocument
@@ -121,7 +121,7 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
 
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
-        return $entityWorkflow->getRelatedEntityClass() === AccompanyingPeriodWorkEvaluationDocument::class;
+        return AccompanyingPeriodWorkEvaluationDocument::class === $entityWorkflow->getRelatedEntityClass();
     }
 
     public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
index 3e8408ba8..63b34d1dc 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
@@ -45,7 +45,7 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
         return $this->translator->trans(
             'workflow.Evaluation (n°%eval%)',
             ['%eval%' => $entityWorkflow->getRelatedEntityId()]
-        ) . ' - ' . $this->translatableStringHelper->localize($evaluation->getEvaluation()->getTitle());
+        ).' - '.$this->translatableStringHelper->localize($evaluation->getEvaluation()->getTitle());
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluation
@@ -107,7 +107,7 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
 
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
-        return $entityWorkflow->getRelatedEntityClass() === AccompanyingPeriodWorkEvaluation::class;
+        return AccompanyingPeriodWorkEvaluation::class === $entityWorkflow->getRelatedEntityClass();
     }
 
     public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
index 69bcf7bf8..5c74e5b17 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
@@ -47,7 +47,7 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
 
         return
             $this->translator->trans('workflow.Work (n°%w%)', ['%w%' => $entityWorkflow->getRelatedEntityId()])
-            . ' - ' . $this->translatableStringHelper->localize($work->getSocialAction()->getTitle());
+            .' - '.$this->translatableStringHelper->localize($work->getSocialAction()->getTitle());
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWork
@@ -114,7 +114,7 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
 
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
-        return $entityWorkflow->getRelatedEntityClass() === AccompanyingPeriodWork::class;
+        return AccompanyingPeriodWork::class === $entityWorkflow->getRelatedEntityClass();
     }
 
     public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php b/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php
index 06922359e..96028c079 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php
@@ -23,7 +23,7 @@ class Version20150607231010 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -35,13 +35,13 @@ class Version20150607231010 extends AbstractMigration
     public function getDescription(): string
     {
         return 'Add a center on the person entity. The default center is the first '
-        . 'recorded.';
+        .'recorded.';
     }
 
     public function up(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -63,8 +63,8 @@ class Version20150607231010 extends AbstractMigration
         // time of writing (2021-11-09)
         $this->addSql('ALTER TABLE person ALTER center_id SET NOT NULL');
         $this->addSql('ALTER TABLE person '
-                . 'ADD CONSTRAINT FK_person_center FOREIGN KEY (center_id) '
-                . 'REFERENCES centers (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_person_center FOREIGN KEY (center_id) '
+                .'REFERENCES centers (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX IDX_person_center ON person (center_id)');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php b/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php
index 7b218dbf9..a2432a498 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php
@@ -25,7 +25,7 @@ class Version20150811152608 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -36,7 +36,7 @@ class Version20150811152608 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php b/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php
index 82c94efe4..80144eb54 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php
@@ -22,7 +22,7 @@ class Version20150812110708 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -34,7 +34,7 @@ class Version20150812110708 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php b/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php
index 9df778a08..ec45ab12a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php
@@ -23,7 +23,7 @@ class Version20150820113409 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -35,7 +35,7 @@ class Version20150820113409 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php b/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php
index be8c91af6..4e6935bca 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php
@@ -21,7 +21,7 @@ class Version20160310161006 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP TABLE chill_person_persons_to_addresses');
     }
@@ -29,23 +29,23 @@ class Version20160310161006 extends AbstractMigration
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE TABLE chill_person_persons_to_addresses ('
-              . 'person_id INT NOT NULL, '
-              . 'address_id INT NOT NULL, '
-              . 'PRIMARY KEY(person_id, address_id))');
+              .'person_id INT NOT NULL, '
+              .'address_id INT NOT NULL, '
+              .'PRIMARY KEY(person_id, address_id))');
         $this->addSql('CREATE INDEX IDX_4655A196217BBB47 '
-              . 'ON chill_person_persons_to_addresses (person_id)');
+              .'ON chill_person_persons_to_addresses (person_id)');
         $this->addSql('CREATE INDEX IDX_4655A196F5B7AF75 '
-              . 'ON chill_person_persons_to_addresses (address_id)');
+              .'ON chill_person_persons_to_addresses (address_id)');
         $this->addSql('ALTER TABLE chill_person_persons_to_addresses '
-              . 'ADD CONSTRAINT FK_4655A196217BBB47 '
-              . 'FOREIGN KEY (person_id) '
-              . 'REFERENCES Person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'ADD CONSTRAINT FK_4655A196217BBB47 '
+              .'FOREIGN KEY (person_id) '
+              .'REFERENCES Person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_persons_to_addresses '
-              . 'ADD CONSTRAINT FK_4655A196F5B7AF75 '
-              . 'FOREIGN KEY (address_id) '
-              . 'REFERENCES chill_main_address (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'ADD CONSTRAINT FK_4655A196F5B7AF75 '
+              .'FOREIGN KEY (address_id) '
+              .'REFERENCES chill_main_address (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php b/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php
index 4399b36d8..159e969a3 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php
@@ -14,8 +14,6 @@ namespace Chill\Migrations\Person;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-use function count;
-
 /**
  * Check if each person do not have multiple addresses with the same valideFrom.
  */
@@ -34,11 +32,11 @@ class Version20160422000000 extends AbstractMigration
         $personWithTwoAddressWithSameValidFrom = $stmt->fetchAll();
 
         foreach ($personWithTwoAddressWithSameValidFrom as $p) {
-            $this->warnIf(true, 'The person with id ' . $p['id'] . ' has two adresses with the same validFrom date');
+            $this->warnIf(true, 'The person with id '.$p['id'].' has two adresses with the same validFrom date');
         }
 
         $this->abortIf(
-            count($personWithTwoAddressWithSameValidFrom) !== 0,
+            0 !== \count($personWithTwoAddressWithSameValidFrom),
             'There exists some person with multiple adress with the same validFrom'
         );
     }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php b/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php
index f1c0ddd92..d1d782b42 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php
@@ -21,7 +21,7 @@ final class Version20180518144221 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_person_person DROP contactInfo');
         $this->addSql('ALTER TABLE chill_person_person DROP mobilenumber');
@@ -30,7 +30,7 @@ final class Version20180518144221 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_person_person ADD contactInfo TEXT DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_person_person ADD mobilenumber TEXT DEFAULT NULL');
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php b/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php
index 23f6875cc..950754659 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php
@@ -23,7 +23,7 @@ final class Version20180820120000 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('UPDATE chill_person_person SET email=contactInfo');
         $this->addSql('UPDATE chill_person_person SET contactInfo=\'\'');
@@ -31,7 +31,7 @@ final class Version20180820120000 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('UPDATE chill_person_person SET contactInfo=email');
         $this->addSql('UPDATE chill_person_person SET email=\'\'');
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php b/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php
index 05c467379..3222aaade 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php
@@ -21,14 +21,14 @@ final class Version20181005140249 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_person_person ALTER gender SET NOT NULL');
     }
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_person_person ALTER gender DROP NOT NULL');
     }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php b/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php
index d3adb3401..b4bf23c7c 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php
@@ -21,7 +21,7 @@ final class Version20181023101621 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP INDEX fullnameCanonical_trgm_idx');
         $this->addSql('ALTER TABLE chill_person_person DROP fullnameCanonical');
@@ -33,7 +33,7 @@ final class Version20181023101621 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql("ALTER TABLE chill_person_person ADD fullnameCanonical VARCHAR(255) DEFAULT '' ");
         $this->addSql("UPDATE chill_person_person SET fullnameCanonical=LOWER(UNACCENT(CONCAT(firstname, ' ', lastname)))");
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php b/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php
index efc885b15..5f869d138 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php
@@ -21,7 +21,7 @@ final class Version20200128084445 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP INDEX IDX_2628668E217BBB47');
         $this->addSql('DROP TABLE chill_person_alt_name');
@@ -30,7 +30,7 @@ final class Version20200128084445 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE chill_person_alt_name_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_person_alt_name (id INT NOT NULL, person_id INT DEFAULT NULL, key VARCHAR(255) NOT NULL, label TEXT NOT NULL, PRIMARY KEY(id))');
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php b/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php
index ef6b0b59a..bb3aa9304 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php
@@ -21,7 +21,7 @@ final class Version20200310090632 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_person_closingmotive DROP parent_id');
         $this->addSql('ALTER TABLE chill_person_closingmotive DROP ordering');
@@ -29,7 +29,7 @@ final class Version20200310090632 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_person_closingmotive ADD parent_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_person_closingmotive ADD CONSTRAINT FK_92351ECE727ACA70 FOREIGN KEY (parent_id) REFERENCES chill_person_closingmotive (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php b/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
index 23744a603..4ff268051 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
@@ -35,12 +35,12 @@ final class Version20210326113045 extends AbstractMigration
 
         // insert datas in existing table
         $this->addSql('UPDATE chill_person_accompanying_period AS ap '
-            . 'SET person_id = jt.person_id '
-            . 'FROM ( '
-            . 'SELECT DISTINCT ON (accompanyingperiod_id) accompanyingperiod_id AS id, person_id FROM persons_accompanying_periods '
-            . 'ORDER BY id, person_id ASC '
-            . ') AS jt '
-            . 'WHERE ap.id = jt.id');
+            .'SET person_id = jt.person_id '
+            .'FROM ( '
+            .'SELECT DISTINCT ON (accompanyingperiod_id) accompanyingperiod_id AS id, person_id FROM persons_accompanying_periods '
+            .'ORDER BY id, person_id ASC '
+            .') AS jt '
+            .'WHERE ap.id = jt.id');
 
         // drop join table
         $this->addSql('DROP TABLE persons_accompanying_periods');
@@ -65,7 +65,7 @@ final class Version20210326113045 extends AbstractMigration
 
         // insert datas in new join table
         $this->addSql('INSERT INTO persons_accompanying_periods (person_id, accompanyingperiod_id) '
-            . 'SELECT person_id, id as accompagnying_period_id FROM chill_person_accompanying_period WHERE person_id IS NOT NULL');
+            .'SELECT person_id, id as accompagnying_period_id FROM chill_person_accompanying_period WHERE person_id IS NOT NULL');
 
         // drop column
         $this->addSql('DROP INDEX idx_64a4a621217bbb47');
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php b/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php
index 02ff252fa..7e8cd1b45 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php
@@ -22,7 +22,7 @@ final class Version20210419105054 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_person_accompanying_period_closingmotive_id_seq '
-            . 'RENAME TO chill_person_closingmotive_id_seq');
+            .'RENAME TO chill_person_closingmotive_id_seq');
     }
 
     public function getDescription(): string
@@ -33,6 +33,6 @@ final class Version20210419105054 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_person_closingmotive_id_seq RENAME TO '
-            . 'chill_person_accompanying_period_closingmotive_id_seq');
+            .'chill_person_accompanying_period_closingmotive_id_seq');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php b/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php
index 93e0cf8a2..175d9e4a3 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php
@@ -23,9 +23,9 @@ final class Version20210419105940 extends AbstractMigration
     {
         // this will keep the '"' at first and last character, but is acceptable
         $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
-            . 'ALTER label TYPE VARCHAR(255) USING label->\'fr\'::text');
+            .'ALTER label TYPE VARCHAR(255) USING label->\'fr\'::text');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
-            . 'ALTER label DROP DEFAULT');
+            .'ALTER label DROP DEFAULT');
     }
 
     public function getDescription(): string
@@ -36,8 +36,8 @@ final class Version20210419105940 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
-            . 'ALTER label TYPE JSON USING json_build_object(\'fr\', label)::jsonb');
+            .'ALTER label TYPE JSON USING json_build_object(\'fr\', label)::jsonb');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
-            . 'ALTER label DROP DEFAULT');
+            .'ALTER label DROP DEFAULT');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php b/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php
index 1b9b0a501..92bcc3aa8 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php
@@ -49,7 +49,7 @@ final class Version20210528092625 extends AbstractMigration
 
         // create constraint 'householdmembers not overlaps'
         $this->addSql('ALTER TABLE chill_person_household_members ADD CHECK (startdate < enddate)');
-        $this->addSql('ALTER TABLE chill_person_household_members ADD CONSTRAINT ' .
+        $this->addSql('ALTER TABLE chill_person_household_members ADD CONSTRAINT '.
             'household_members_not_overlaps EXCLUDE USING GIST(
               -- extension btree_gist required to include comparaison with integer
               person_id WITH =,
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php b/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php
index f115f9313..268c3f391 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php
@@ -32,18 +32,18 @@ final class Version20210616102900 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->addSql(
-            'CREATE VIEW view_chill_person_household_address AS ' .
-            'SELECT ' .
-                'members.person_id AS person_id, ' .
-                'members.household_id AS household_id, ' .
-                'members.id AS member_id, ' .
-                'address.id AS address_id, ' .
-                'CASE WHEN address.validFrom < members.startDate THEN members.startDate ELSE address.validFrom END AS validFrom, ' .
-                "CASE WHEN COALESCE(address.validTo, 'infinity') < COALESCE(members.endDate, 'infinity') THEN address.validTo ELSE members.endDate END AS validTo " .
-            'FROM chill_person_household_members AS members ' .
-            'JOIN chill_person_household_to_addresses AS household_to_addr ON household_to_addr.household_id = members.household_id ' .
-            'JOIN chill_main_address AS address ON household_to_addr.address_id = address.id ' .
-                'AND daterange(address.validFrom, address.validTo) && daterange(members.startDate, members.endDate) ' .
+            'CREATE VIEW view_chill_person_household_address AS '.
+            'SELECT '.
+                'members.person_id AS person_id, '.
+                'members.household_id AS household_id, '.
+                'members.id AS member_id, '.
+                'address.id AS address_id, '.
+                'CASE WHEN address.validFrom < members.startDate THEN members.startDate ELSE address.validFrom END AS validFrom, '.
+                "CASE WHEN COALESCE(address.validTo, 'infinity') < COALESCE(members.endDate, 'infinity') THEN address.validTo ELSE members.endDate END AS validTo ".
+            'FROM chill_person_household_members AS members '.
+            'JOIN chill_person_household_to_addresses AS household_to_addr ON household_to_addr.household_id = members.household_id '.
+            'JOIN chill_main_address AS address ON household_to_addr.address_id = address.id '.
+                'AND daterange(address.validFrom, address.validTo) && daterange(members.startDate, members.endDate) '.
             'WHERE members.sharedhousehold IS TRUE '
         );
     }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php b/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php
index 40b12f331..bc067c44d 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php
@@ -32,7 +32,7 @@ final class Version20211021125359 extends AbstractMigration
     public function up(Schema $schema): void
     {
         // creates a constraint 'participations may not overlap'
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD CONSTRAINT ' .
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD CONSTRAINT '.
             'participations_no_overlap EXCLUDE USING GIST(
             -- extension btree_gist required to include comparaison with integer
             person_id WITH =, accompanyingperiod_id WITH =,
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211213203147.php b/src/Bundle/ChillPersonBundle/migrations/Version20211213203147.php
index d6e9d2b77..99c04364d 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211213203147.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211213203147.php
@@ -40,7 +40,7 @@ final class Version20211213203147 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_social_work_evaluation_action ADD CONSTRAINT FK_DF34CCFB456C5646 FOREIGN KEY (evaluation_id) REFERENCES chill_person_social_work_evaluation (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_social_work_evaluation_action ADD CONSTRAINT FK_DF34CCFB3DC32179 FOREIGN KEY (socialaction_id) REFERENCES chill_person_social_action (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
 
-        $this->addSql('INSERT INTO chill_person_social_work_evaluation_action (evaluation_id, socialaction_id) ' .
+        $this->addSql('INSERT INTO chill_person_social_work_evaluation_action (evaluation_id, socialaction_id) '.
             'SELECT id, socialaction_ID FROM chill_person_social_work_evaluation');
 
         $this->addSql('ALTER TABLE chill_person_social_work_evaluation DROP CONSTRAINT fk_2e23f3febf32a3da');
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php b/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php
index 2260e73c5..e87bb6f0a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php
@@ -38,7 +38,7 @@ final class Version20220128133039 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD CONSTRAINT FK_6C258C49D7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD CONSTRAINT FK_6C258C49A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD CHECK (startdate <= enddate)');
-        $this->addSql('INSERT INTO chill_person_accompanying_period_user_history (id, user_id, accompanyingperiod_id, startDate, endDate) ' .
+        $this->addSql('INSERT INTO chill_person_accompanying_period_user_history (id, user_id, accompanyingperiod_id, startDate, endDate) '.
             'SELECT nextval(\'chill_person_accompanying_period_user_history_id_seq\'), user_id, id, openingDate, null FROM chill_person_accompanying_period WHERE user_id IS NOT NULL');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL;');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD createdBy_id INT DEFAULT NULL;');
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php b/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php
index 4ea2a17a1..5c7106e77 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php
@@ -13,9 +13,7 @@ namespace Chill\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
-use Exception;
 use libphonenumber\PhoneNumberUtil;
-use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
@@ -25,7 +23,7 @@ final class Version20220215135509 extends AbstractMigration implements Container
 
     public function down(Schema $schema): void
     {
-        throw new Exception('You should not do that.');
+        throw new \Exception('You should not do that.');
     }
 
     public function getDescription(): string
@@ -39,7 +37,7 @@ final class Version20220215135509 extends AbstractMigration implements Container
             ->getParameter('chill_main')['phone_helper']['default_carrier_code'];
 
         if (null === $carrier_code) {
-            throw new RuntimeException('no carrier code');
+            throw new \RuntimeException('no carrier code');
         }
 
         $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber TYPE TEXT');
@@ -53,9 +51,9 @@ final class Version20220215135509 extends AbstractMigration implements Container
         $this->addSql('COMMENT ON COLUMN chill_person_person.mobilenumber IS NULL');
 
         $this->addSql(
-            'UPDATE chill_person_person SET ' .
-            $this->buildMigrationPhonenumberClause($carrier_code, 'phonenumber') .
-            ', ' .
+            'UPDATE chill_person_person SET '.
+            $this->buildMigrationPhonenumberClause($carrier_code, 'phonenumber').
+            ', '.
             $this->buildMigrationPhoneNumberClause($carrier_code, 'mobilenumber')
         );
 
@@ -65,7 +63,7 @@ final class Version20220215135509 extends AbstractMigration implements Container
         $this->addSql('COMMENT ON COLUMN chill_person_phone.phonenumber IS NULL');
 
         $this->addSql(
-            'UPDATE chill_person_phone SET ' .
+            'UPDATE chill_person_phone SET '.
             $this->buildMigrationPhoneNumberClause($carrier_code, 'phonenumber')
         );
     }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220926154347.php b/src/Bundle/ChillPersonBundle/migrations/Version20220926154347.php
index 9f42abdfe..a55d35fbe 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220926154347.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220926154347.php
@@ -51,7 +51,7 @@ final class Version20220926154347 extends AbstractMigration
 
         // check consistency of history on database side
         $this->addSql('ALTER TABLE chill_person_person_center_history ADD CHECK (startdate <= enddate)');
-        $this->addSql('ALTER TABLE chill_person_person_center_history ADD CONSTRAINT ' .
+        $this->addSql('ALTER TABLE chill_person_person_center_history ADD CONSTRAINT '.
             'chill_internal_person_person_center_history_not_overlaps EXCLUDE USING GIST(
               -- extension btree_gist required to include comparaison with integer
               person_id WITH =,
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20221014115500.php b/src/Bundle/ChillPersonBundle/migrations/Version20221014115500.php
index fe7b920d9..ec14dd8f0 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20221014115500.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20221014115500.php
@@ -37,7 +37,7 @@ final class Version20221014115500 extends AbstractMigration
             ');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_step_history ADD CHECK (startDate <= endDate)');
 
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_step_history ADD CONSTRAINT ' .
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_step_history ADD CONSTRAINT '.
             'chill_internal_acp_steps_not_overlaps EXCLUDE USING GIST(
             -- extension btree_gist required to include comparaison with integer
               period_id WITH =,
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20230918115305.php b/src/Bundle/ChillPersonBundle/migrations/Version20230918115305.php
index 3e3a3c643..b127c146d 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20230918115305.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20230918115305.php
@@ -15,7 +15,7 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add isCanceledAccompanyingPeriod property to ClosingMotive
+ * Add isCanceledAccompanyingPeriod property to ClosingMotive.
  */
 final class Version20230918115305 extends AbstractMigration
 {
diff --git a/src/Bundle/ChillReportBundle/Controller/ReportController.php b/src/Bundle/ChillReportBundle/Controller/ReportController.php
index 99016e485..a44b49c48 100644
--- a/src/Bundle/ChillReportBundle/Controller/ReportController.php
+++ b/src/Bundle/ChillReportBundle/Controller/ReportController.php
@@ -17,16 +17,11 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\ReportBundle\Entity\Report;
 use Chill\ReportBundle\Form\ReportType;
-use DateTime;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Security\Core\Role\Role;
-
-use function count;
 
 /**
  * Class ReportController.
@@ -64,11 +59,11 @@ class ReportController extends AbstractController
     /**
      * Create a new report for a given person and of a given type.
      *
-     * @param int $person_id The id of the person.
-     * @param int $cf_group_id The id of the report type.
-     * @param Request $request The request containing the form data (from the newAction)
+     * @param int     $person_id   the id of the person
+     * @param int     $cf_group_id the id of the report type
+     * @param Request $request     The request containing the form data (from the newAction)
      *
-     * @return Response The web page.
+     * @return Response the web page
      */
     public function createAction($person_id, $cf_group_id, Request $request)
     {
@@ -127,10 +122,10 @@ class ReportController extends AbstractController
     /**
      * Display a form to edit an existing Report entity.
      *
-     * @param int|string $person_id The id of the person.
-     * @param int|string $report_id The id of the report.
+     * @param int|string $person_id the id of the person
+     * @param int|string $report_id the id of the report
      *
-     * @return Response The web page.
+     * @return Response the web page
      */
     public function editAction(int|string $person_id, int|string $report_id)
     {
@@ -140,16 +135,11 @@ class ReportController extends AbstractController
         $report = $em->getRepository('ChillReportBundle:Report')->find($report_id);
 
         if (!$report) {
-            throw $this->createNotFoundException(
-                $this->get('translator')->trans('Unable to find this report.')
-            );
+            throw $this->createNotFoundException($this->get('translator')->trans('Unable to find this report.'));
         }
 
         if ((int) $person_id !== (int) $report->getPerson()->getId()) {
-            throw new RuntimeException(
-                $this->get('translator')->trans('This is not the report of the person.'),
-                1
-            );
+            throw new \RuntimeException($this->get('translator')->trans('This is not the report of the person.'), 1);
         }
 
         $this->denyAccessUnlessGranted('CHILL_REPORT_UPDATE', $report);
@@ -174,8 +164,8 @@ class ReportController extends AbstractController
     /**
      * Return a csv file with all the reports of a given type.
      *
-     * @param int $cf_group_id The id of the report type to export
-     * @param Request $request The request
+     * @param int     $cf_group_id The id of the report type to export
+     * @param Request $request     The request
      *
      * @return A csv file with all the reports of the selected type
      */
@@ -200,10 +190,10 @@ class ReportController extends AbstractController
     /**
      * List all the report entities for a given person.
      *
-     * @param int $person_id The id of the person.
-     * @param Request $request The request
+     * @param int     $person_id the id of the person
+     * @param Request $request   The request
      *
-     * @return Response The web page.
+     * @return Response the web page
      */
     public function listAction($person_id, Request $request)
     {
@@ -222,7 +212,7 @@ class ReportController extends AbstractController
 
         $total = $em
             ->createQuery('SELECT COUNT(r.id) FROM ChillReportBundle:Report r '
-                . 'WHERE r.person = :person AND r.scope IN (:scopes) ')
+                .'WHERE r.person = :person AND r.scope IN (:scopes) ')
             ->setParameter('person', $person)
             ->setParameter('scopes', $reachableScopes)
             ->getSingleScalarResult();
@@ -256,11 +246,11 @@ class ReportController extends AbstractController
     /**
      * Display a form for creating a new report for a given person and of a given type.
      *
-     * @param int $person_id The id of the person.
-     * @param int $cf_group_id The id of the report type.
-     * @param Request $request The request
+     * @param int     $person_id   the id of the person
+     * @param int     $cf_group_id the id of the report type
+     * @param Request $request     The request
      *
-     * @return Response The web page.
+     * @return Response the web page
      */
     public function newAction($person_id, $cf_group_id, Request $request)
     {
@@ -289,7 +279,7 @@ class ReportController extends AbstractController
 
         $entity = new Report();
         $entity->setUser($this->get('security.token_storage')->getToken()->getUser());
-        $entity->setDate(new DateTime('now'));
+        $entity->setDate(new \DateTime('now'));
 
         $entity->setCFGroup($cFGroup);
 
@@ -305,10 +295,10 @@ class ReportController extends AbstractController
     /**
      * Display a form for selecting which type of report to add for a given person.
      *
-     * @param int $person_id The id of the person.
-     * @param Request $request The request
+     * @param int     $person_id the id of the person
+     * @param Request $request   The request
      *
-     * @return Response The web page.
+     * @return Response the web page
      */
     public function selectReportTypeAction($person_id, Request $request)
     {
@@ -338,7 +328,7 @@ class ReportController extends AbstractController
         $cFGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->findByEntity(\Chill\ReportBundle\Entity\Report::class);
 
-        if (count($cFGroups) === 1) {
+        if (1 === \count($cFGroups)) {
             return $this->redirectToRoute('report_new', ['person_id' => $person_id, 'cf_group_id' => $cFGroups[0]->getId()]);
         }
 
@@ -372,7 +362,7 @@ class ReportController extends AbstractController
      *
      * @param Request $request The request
      *
-     * @return Response The web page.
+     * @return Response the web page
      */
     public function selectReportTypeForExportAction(Request $request)
     {
@@ -387,7 +377,7 @@ class ReportController extends AbstractController
         $cFGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->findByEntity(\Chill\ReportBundle\Entity\Report::class);
 
-        if (count($cFGroups) === 1) {
+        if (1 === \count($cFGroups)) {
             return $this->redirectToRoute('report_export_list', ['cf_group_id' => $cFGroups[0]->getId()]);
         }
 
@@ -416,10 +406,10 @@ class ReportController extends AbstractController
     /**
      * Web page for editing an existing report.
      *
-     * @param int $person_id The id of the person.
-     * @param int $report_id The id of the report.
+     * @param int $person_id the id of the person
+     * @param int $report_id the id of the report
      *
-     * @return Response The web page.
+     * @return Response the web page
      */
     public function updateAction($person_id, $report_id, Request $request)
     {
@@ -428,9 +418,7 @@ class ReportController extends AbstractController
         $report = $em->getRepository('ChillReportBundle:Report')->find($report_id);
 
         if (!$report) {
-            throw $this->createNotFoundException(
-                $this->get('translator')->trans('Unable to find this report.')
-            );
+            throw $this->createNotFoundException($this->get('translator')->trans('Unable to find this report.'));
         }
 
         $this->denyAccessUnlessGranted('CHILL_REPORT_UPDATE', $report);
@@ -478,10 +466,10 @@ class ReportController extends AbstractController
     /**
      * Find and display a report.
      *
-     * @param int $report_id The id of the report.
-     * @param int $person_id The id of the person.
+     * @param int $report_id the id of the report
+     * @param int $person_id the id of the person
      *
-     * @return Response The web page.
+     * @return Response the web page
      */
     public function viewAction($report_id, $person_id)
     {
@@ -492,9 +480,7 @@ class ReportController extends AbstractController
         $entity = $em->getRepository('ChillReportBundle:Report')->find($report_id);
 
         if (!$entity || !$person) {
-            throw $this->createNotFoundException(
-                $this->get('translator')->trans('Unable to find this report.')
-            );
+            throw $this->createNotFoundException($this->get('translator')->trans('Unable to find this report.'));
         }
 
         $this->denyAccessUnlessGranted('CHILL_REPORT_SEE', $entity);
@@ -537,7 +523,7 @@ class ReportController extends AbstractController
     /**
      * Creates a form to edit a Report entity.
      *
-     * @param Report $entity The report to edit.
+     * @param Report $entity the report to edit
      *
      * @return \Symfony\Component\Form\Form The form
      */
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
index a9b8edc30..e32b73544 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
@@ -16,8 +16,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function count;
-
 /**
  * Load CustomField for Report into database.
  */
@@ -68,7 +66,7 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
         ];
 
         for ($i = 0; 25 >= $i; ++$i) {
-            $cFType = $cFTypes[random_int(0, count($cFTypes) - 1)];
+            $cFType = $cFTypes[random_int(0, \count($cFTypes) - 1)];
 
             $customField = (new CustomField())
                 ->setSlug("cf_report_{$i}")
@@ -76,7 +74,7 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
                 ->setOptions($cFType['options'])
                 ->setName(['fr' => "CustomField {$i}"])
                 ->setOrdering(random_int(0, 1000) / 1000)
-                ->setCustomFieldsGroup($this->getReference('cf_group_report_' . (random_int(0, 3))));
+                ->setCustomFieldsGroup($this->getReference('cf_group_report_'.random_int(0, 3)));
 
             $manager->persist($customField);
         }
@@ -88,7 +86,7 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
 
     private function createExpectedFields(ObjectManager $manager)
     {
-        //report logement
+        // report logement
         $reportLogement = $this->getReference('cf_group_report_logement');
 
         $houseTitle = (new CustomField())
@@ -144,7 +142,7 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
             ->setCustomFieldsGroup($reportLogement);
         $manager->persist($descriptionLogement);
 
-        //report problems
+        // report problems
         $reportEducation = $this->getReference('cf_group_report_education');
 
         $title = (new CustomField())
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php
index 32bd5c346..af2f06e69 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php
@@ -44,9 +44,9 @@ class LoadCustomFieldsGroup extends AbstractFixture implements OrderedFixtureInt
         $this->addReference('cf_group_report_education', $report);
 
         for ($i = 0; 3 >= $i; ++$i) {
-            $report = $this->createReport($manager, ['fr' => 'ZZ Rapport aléatoire ' . $i]);
+            $report = $this->createReport($manager, ['fr' => 'ZZ Rapport aléatoire '.$i]);
 
-            $this->addReference('cf_group_report_' . $i, $report);
+            $this->addReference('cf_group_report_'.$i, $report);
         }
 
         $manager->flush();
@@ -62,7 +62,7 @@ class LoadCustomFieldsGroup extends AbstractFixture implements OrderedFixtureInt
         array $name,
         array $options = []
     ) {
-        echo $name['fr'] . " \n";
+        echo $name['fr']." \n";
 
         $cFGroup = (new CustomFieldsGroup())
             ->setName($name)
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
index 29dff7eae..2aa175b80 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
@@ -18,8 +18,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function in_array;
-
 /**
  * Add a role CHILL_REPORT_UPDATE & CHILL_REPORT_CREATE for all groups except administrative,
  * and a role CHILL_REPORT_SEE for administrative.
@@ -40,10 +38,10 @@ class LoadReportACL extends AbstractFixture implements OrderedFixtureInterface
             foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
                 printf("processing scope %s \n", $scope->getName()['en']);
-                //create permission group
+                // create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
-                        if ($scope->getName()['en'] === 'administrative') {
+                        if ('administrative' === $scope->getName()['en']) {
                             printf("denying power on administrative \n");
 
                             break 2; // we do not want any power on administrative
@@ -53,7 +51,7 @@ class LoadReportACL extends AbstractFixture implements OrderedFixtureInterface
 
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
+                        if (\in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             printf("denying power on %s\n", $scope->getName()['en']);
 
                             break 2; // we do not want any power on social or administrative
@@ -64,7 +62,7 @@ class LoadReportACL extends AbstractFixture implements OrderedFixtureInterface
 
                 printf(
                     'Adding CHILL_REPORT_UPDATE & CHILL_REPORT_CREATE to %s '
-                        . "permission group, scope '%s' \n",
+                        ."permission group, scope '%s' \n",
                     $permissionsGroup->getName(),
                     $scope->getName()['en']
                 );
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
index 3593b612c..6c61b1914 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
@@ -16,16 +16,11 @@ use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
 use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ReportBundle\Entity\Report;
-use DateTime;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectManager;
 use Faker\Factory as FakerFactory;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-
-use function count;
-use function in_array;
 
 /**
  * Load reports into DB.
@@ -49,7 +44,7 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa
     {
         $this->createExpected($manager);
 
-        //create random 2 times, to allow multiple report on some people
+        // create random 2 times, to allow multiple report on some people
         $this->createRandom($manager, 90);
         $this->createRandom($manager, 30);
 
@@ -66,7 +61,7 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa
             $report = (new Report())
                 ->setPerson($charline)
                 ->setCFGroup($this->getReference('cf_group_report_logement'))
-                ->setDate(new DateTime('2015-01-05'))
+                ->setDate(new \DateTime('2015-01-05'))
                 ->setScope($this->getReference('scope_social'));
             $this->fillReport($report);
 
@@ -81,7 +76,7 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa
         $people = $this->getPeopleRandom($percentage);
 
         foreach ($people as $person) {
-            //create a report, set logement or education report
+            // create a report, set logement or education report
             $report = (new Report())
                 ->setPerson($person)
                 ->setCFGroup(
@@ -97,16 +92,16 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa
 
     private function fillReport(Report $report)
     {
-        //setUser
+        // setUser
         $usernameRef = array_rand(LoadUsers::$refs);
         $report->setUser(
             $this->getReference($usernameRef)
         );
 
-        //set date if null
-        if ($report->getDate() === null) {
-            //set date. 30% of the dates are 2015-05-01
-            $expectedDate = new DateTime('2015-01-05');
+        // set date if null
+        if (null === $report->getDate()) {
+            // set date. 30% of the dates are 2015-05-01
+            $expectedDate = new \DateTime('2015-01-05');
 
             if (random_int(0, 100) < 30) {
                 $report->setDate($expectedDate);
@@ -116,7 +111,7 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa
             }
         }
 
-        //fill data
+        // fill data
         $datas = [];
 
         foreach ($report->getCFGroup()->getCustomFields() as $field) {
@@ -148,7 +143,7 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa
             ->getRepository(Person::class)
             ->findAll();
 
-        //keep only a part ($percentage) of the people
+        // keep only a part ($percentage) of the people
         $selectedPeople = [];
 
         foreach ($people as $person) {
@@ -171,16 +166,16 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa
         $multiple = $field->getOptions()['multiple'];
         $other = $field->getOptions()['other'];
 
-        //add other if allowed
+        // add other if allowed
         if ($other) {
             $choices[] = ['slug' => '_other'];
         }
 
-        //initialize results
+        // initialize results
         $picked = [];
 
         if ($multiple) {
-            $numberSelected = random_int(1, count($choices) - 1);
+            $numberSelected = random_int(1, \count($choices) - 1);
 
             for ($i = 0; $i < $numberSelected; ++$i) {
                 $picked[] = $this->pickChoice($choices);
@@ -189,7 +184,7 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa
             if ($other) {
                 $result = ['_other' => null, '_choices' => $picked];
 
-                if (in_array('_other', $picked, true)) {
+                if (\in_array('_other', $picked, true)) {
                     $result['_other'] = $this->faker->realText(70);
                 }
 
diff --git a/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php b/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php
index 8f1c5d0d4..a4d2a58d5 100644
--- a/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php
+++ b/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php
@@ -62,7 +62,7 @@ class ChillReportExtension extends Extension implements PrependExtensionInterfac
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/fixtures.yaml');
         $loader->load('services/export.yaml');
diff --git a/src/Bundle/ChillReportBundle/Entity/Report.php b/src/Bundle/ChillReportBundle/Entity/Report.php
index 7b6a25104..1db2ed080 100644
--- a/src/Bundle/ChillReportBundle/Entity/Report.php
+++ b/src/Bundle/ChillReportBundle/Entity/Report.php
@@ -25,7 +25,9 @@ use Doctrine\ORM\Mapping as ORM;
  * Class Report.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="report")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Report implements HasCenterInterface, HasScopeInterface
@@ -47,10 +49,10 @@ class Report implements HasCenterInterface, HasScopeInterface
     private ?\DateTime $date = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -101,7 +103,7 @@ class Report implements HasCenterInterface, HasScopeInterface
     /**
      * Get date.
      */
-    public function getDate(): ?DateTime
+    public function getDate(): ?\DateTime
     {
         return $this->date;
     }
@@ -173,7 +175,7 @@ class Report implements HasCenterInterface, HasScopeInterface
     /**
      * Set date.
      *
-     * @param DateTime $date
+     * @param \DateTime $date
      *
      * @return Report
      */
diff --git a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
index 93685bdec..1761e3522 100644
--- a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+++ b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
@@ -25,28 +25,14 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\ReportBundle\Entity\Report;
 use Chill\ReportBundle\Security\Authorization\ReportVoter;
-use Closure;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
-use Exception;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-use function array_keys;
-use function array_merge;
-use function count;
-use function in_array;
-use function strlen;
-use function strtolower;
-use function ucfirst;
-use function uniqid;
-
 class ReportList implements ExportElementValidatedInterface, ListInterface
 {
     protected array $fields = [
@@ -86,16 +72,16 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
                 return [];
             },
             'choice_label' => fn (string $key, string $label): string => match (substr($key, 0, 7)) {
-                'person_' => $this->translator->trans(substr($key, 7, strlen($key) - 7)) .
-                    ' (' . $this->translator->trans('Person') . ')',
-                'report_' => $this->translator->trans(ucfirst(substr($key, 7, strlen($key) - 7))) .
-                    ' (' . $this->translator->trans('Report') . ')',
-                default => $label .
-                    ' (' . $this->translator->trans("Report's question") . ')',
+                'person_' => $this->translator->trans(substr($key, 7, \strlen($key) - 7)).
+                    ' ('.$this->translator->trans('Person').')',
+                'report_' => $this->translator->trans(\ucfirst(substr($key, 7, \strlen($key) - 7))).
+                    ' ('.$this->translator->trans('Report').')',
+                default => $label.
+                    ' ('.$this->translator->trans("Report's question").')',
             },
             'constraints' => [new Callback([
                 'callback' => static function ($selected, ExecutionContextInterface $context) {
-                    if (count($selected) === 0) {
+                    if (0 === \count($selected)) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
@@ -110,9 +96,10 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
             'block_name' => 'list_export_form_address_date',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
-        return ['address_date' => new DateTime()];
+        return ['address_date' => new \DateTime()];
     }
 
     public function getAllowedFormattersTypes()
@@ -147,14 +134,13 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
                     }
 
                     if ('person_birthdate' === $key) {
-                        $date = DateTime::createFromFormat('Y-m-d', $value);
+                        $date = \DateTime::createFromFormat('Y-m-d', $value);
                     } else {
-                        $date = DateTime::createFromFormat('Y-m-d H:i:s', $value);
+                        $date = \DateTime::createFromFormat('Y-m-d H:i:s', $value);
                     }
                     // check that the creation could occurs.
                     if (false === $date) {
-                        throw new Exception(sprintf('The value %s could '
-                            . 'not be converted to %s', $value, DateTime::class));
+                        throw new \Exception(sprintf('The value %s could not be converted to %s', $value, \DateTime::class));
                     }
 
                     return $date->format('d-m-Y');
@@ -224,7 +210,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
 
                 return function ($value) use ($key, $countryRepository) {
                     if ('_header' === $value) {
-                        return strtolower($key);
+                        return \strtolower($key);
                     }
 
                     if (null === $value) {
@@ -241,7 +227,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
             case 'person_address_country_name':
                 return function ($value) use ($key) {
                     if ('_header' === $value) {
-                        return strtolower($key);
+                        return \strtolower($key);
                     }
 
                     if (null === $value) {
@@ -253,10 +239,10 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
 
             default:
                 // for fields which are associated with person
-                if (in_array($key, $this->fields, true)) {
+                if (\in_array($key, $this->fields, true)) {
                     return static function ($value) use ($key) {
                         if ('_header' === $value) {
-                            return strtolower($key);
+                            return \strtolower($key);
                         }
 
                         return $value;
@@ -272,13 +258,13 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
         $fields = [];
 
         foreach ($data['fields'] as $key) {
-            if (in_array($key, $this->fields, true)) {
+            if (\in_array($key, $this->fields, true)) {
                 $fields[] = $key;
             }
         }
 
         // add the key from slugs and return
-        return [...$fields, ...array_keys($this->slugs)];
+        return [...$fields, ...\array_keys($this->slugs)];
     }
 
     public function getResult($query, $data)
@@ -306,9 +292,8 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         // throw an error if any fields are present
-        if (!array_key_exists('fields', $data)) {
-            throw new \Doctrine\DBAL\Exception\InvalidArgumentException('any fields '
-                . 'have been checked');
+        if (!\array_key_exists('fields', $data)) {
+            throw new \Doctrine\DBAL\Exception\InvalidArgumentException('any fields have been checked');
         }
 
         $qb = $this->em->createQueryBuilder();
@@ -316,7 +301,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
         // process fields which are not custom fields
         foreach ($this->fields as $f) {
             // do not add fields which are not selected
-            if (!in_array($f, $data['fields'], true)) {
+            if (!\in_array($f, $data['fields'], true)) {
                 continue;
             }
 
@@ -367,8 +352,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
                         'person_' => $qb->addSelect(sprintf('person.%s as %s', $suffix, $f)),
                         'report_' => $qb->addSelect(sprintf('report.%s as %s', $suffix, $f)),
                         // no break
-                        default => throw new LogicException("this prefix {$prefix} should "
-                            . "not be encountered. Full field: {$f}"),
+                        default => throw new \LogicException("this prefix {$prefix} should not be encountered. Full field: {$f}"),
                     };
             }
         }
@@ -376,7 +360,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
         // process fields which are custom fields
         foreach ($this->getCustomFields() as $cf) {
             // do not add custom fields which are not selected
-            if (!in_array($cf->getSlug(), $data['fields'], true)) {
+            if (!\in_array($cf->getSlug(), $data['fields'], true)) {
                 continue;
             }
 
@@ -438,7 +422,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
         );
 
         // check if there is one field starting with address in data
-        if (count(array_intersect($data['fields'], $addressFields)) > 0) {
+        if (\count(array_intersect($data['fields'], $addressFields)) > 0) {
             // if a field address is checked, the date must not be empty
             if (empty($data['address_date'])) {
                 $context
@@ -467,7 +451,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
     private function getCustomFields()
     {
         return array_filter($this->customfieldsGroup
-            ->getCustomFields()->toArray(), static fn (CustomField $cf) => $cf->getType() !== 'title');
+            ->getCustomFields()->toArray(), static fn (CustomField $cf) => 'title' !== $cf->getType());
     }
 
     private function getLabelForCustomField($key, array $values, $data)
@@ -498,7 +482,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
                     $label = $cfType->getChoices($cf)[$slugChoice];
 
                     return $this->translatableStringHelper->localize($cf->getName())
-                            . ' | ' . $label;
+                            .' | '.$label;
                 }
 
                 if ('_other' === $slugChoice && $cfType->isChecked($cf, $slugChoice, $decoded)) {
@@ -514,7 +498,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
 
     private function slugToDQL($slug, $type = 'default', array $additionalInfos = [])
     {
-        $uid = 'slug_' . uniqid('', true);
+        $uid = 'slug_'.\uniqid('', true);
 
         $this->slugs[$uid] = [
             'slug' => $slug,
diff --git a/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php b/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
index 49854cbb4..0346f2ab3 100644
--- a/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
+++ b/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
@@ -67,6 +67,7 @@ class ReportDateFilter implements FilterInterface
             'label' => 'Report is before this date',
         ]);
     }
+
     public function getFormDefaultData(): array
     {
         return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
@@ -75,7 +76,7 @@ class ReportDateFilter implements FilterInterface
     public function describeAction($data, $format = 'string')
     {
         return ['Filtered by report\'s date: '
-            . 'between %date_from% and %date_to%', [
+            .'between %date_from% and %date_to%', [
                 '%date_from%' => $this->rollingDateConverter->convert($data['date_from'])->format('d-m-Y'),
                 '%date_to%' => $this->rollingDateConverter->convert($data['date_to'])->format('d-m-Y'),
             ], ];
diff --git a/src/Bundle/ChillReportBundle/Search/ReportSearch.php b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
index f8fec653f..4737edd99 100644
--- a/src/Bundle/ChillReportBundle/Search/ReportSearch.php
+++ b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
@@ -17,12 +17,8 @@ use Chill\MainBundle\Search\ParsingException;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
-use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
-
-use function array_key_exists;
 
 /**
  * Search amongst reports.
@@ -39,7 +35,7 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
         TokenStorageInterface $tokenStorage
     ) {
         if (!$tokenStorage->getToken()->getUser() instanceof \Chill\MainBundle\Entity\User) {
-            throw new RuntimeException('an user must be associated with token');
+            throw new \RuntimeException('an user must be associated with token');
         }
         $this->user = $tokenStorage->getToken()->getUser();
     }
@@ -70,7 +66,7 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
 
     private function addACL(QueryBuilder $qb)
     {
-        //adding join
+        // adding join
         $qb->join('r.person', 'p');
 
         $role = 'CHILL_REPORT_SEE';
@@ -86,12 +82,12 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
             );
             $whereElement->add(
                 $qb->expr()->andX(
-                    $qb->expr()->eq('p.center', ':center_' . $i),
-                    $qb->expr()->in('r.scope', ':reachable_scopes_' . $i)
+                    $qb->expr()->eq('p.center', ':center_'.$i),
+                    $qb->expr()->in('r.scope', ':reachable_scopes_'.$i)
                 )
             );
-            $qb->setParameter('center_' . $i, $center);
-            $qb->setParameter('reachable_scopes_' . $i, $reachableScopesId);
+            $qb->setParameter('center_'.$i, $center);
+            $qb->setParameter('reachable_scopes_'.$i, $reachableScopesId);
         }
 
         return $whereElement;
@@ -108,19 +104,19 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
 
         $query->from('ChillReportBundle:Report', 'r');
 
-        //throw a parsing exception if key 'date' and default is set
-        if (array_key_exists('date', $terms) && '' !== $terms['_default']) {
+        // throw a parsing exception if key 'date' and default is set
+        if (\array_key_exists('date', $terms) && '' !== $terms['_default']) {
             throw new ParsingException('You may not set a date argument and a date in default');
         }
-        //throw a parsing exception if no argument except report
-        if (!array_key_exists('date', $terms) && '' === $terms['_default']) {
+        // throw a parsing exception if no argument except report
+        if (!\array_key_exists('date', $terms) && '' === $terms['_default']) {
             throw new ParsingException('You must provide either a date:YYYY-mm-dd argument or a YYYY-mm-dd default search');
         }
 
-        if (array_key_exists('date', $terms)) {
+        if (\array_key_exists('date', $terms)) {
             $query->andWhere($query->expr()->eq('r.date', ':date'))
                 ->setParameter('date', $this->parseDate($terms['date']));
-        } elseif (array_key_exists('_default', $terms)) {
+        } elseif (\array_key_exists('_default', $terms)) {
             $query->andWhere($query->expr()->eq('r.date', ':date'))
                 ->setParameter('date', $this->parseDate($terms['_default']));
         }
diff --git a/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php b/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
index 2caf57305..f93d140ee 100644
--- a/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
+++ b/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
@@ -19,8 +19,6 @@ use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\ReportBundle\Entity\Report;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
-use function in_array;
-
 class ReportVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
     final public const CREATE = 'CHILL_REPORT_CREATE';
@@ -59,7 +57,7 @@ class ReportVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
     protected function supports($attribute, $subject)
     {
         if ($subject instanceof Report) {
-            return in_array($attribute, [
+            return \in_array($attribute, [
                 self::CREATE, self::UPDATE, self::SEE,
             ], true);
         }
diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
index b1ff04b83..a16653601 100644
--- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
@@ -13,17 +13,14 @@ namespace Chill\ReportBundle\Tests\Controller;
 
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\BrowserKit\Client;
-use function in_array;
 
 /**
  * This class is much well writtend than ReportControllerTest class, and will
  * replace ReportControllerTest in the future.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ReportControllerNextTest extends WebTestCase
@@ -55,9 +52,7 @@ final class ReportControllerNextTest extends WebTestCase
             );
 
         if (null === $this->person) {
-            throw new RuntimeException('The expected person is not present in the database. '
-                    . 'Did you run `php app/console doctrine:fixture:load` before launching tests ? '
-                    . "(expecting person is 'Charline Depardieu'");
+            throw new \RuntimeException('The expected person is not present in the database. Did you run `php app/console doctrine:fixture:load` before launching tests ? '."(expecting person is 'Charline Depardieu'");
         }
 
         // get custom fields group from fixture
@@ -65,10 +60,10 @@ final class ReportControllerNextTest extends WebTestCase
             ->get('doctrine.orm.entity_manager')
             ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->findBy(['entity' => \Chill\ReportBundle\Entity\Report::class]);
-        //filter customFieldsGroup to get only "situation de logement"
+        // filter customFieldsGroup to get only "situation de logement"
         $filteredCustomFieldsGroupHouse = array_filter(
             $customFieldsGroups,
-            static fn (CustomFieldsGroup $group) => in_array('Situation de logement', $group->getName(), true)
+            static fn (CustomFieldsGroup $group) => \in_array('Situation de logement', $group->getName(), true)
         );
         $this->group = $filteredCustomFieldsGroupHouse[0];
     }
@@ -85,7 +80,7 @@ final class ReportControllerNextTest extends WebTestCase
             403,
             $client->getResponse()->getStatusCode(),
             'assert that user for center b has a 403 status code when listing'
-                . 'reports on person from center a'
+                .'reports on person from center a'
         );
     }
 
@@ -107,7 +102,7 @@ final class ReportControllerNextTest extends WebTestCase
             403,
             $client->getResponse()->getStatusCode(),
             'assert that user for center b has a 403 status code when '
-                . 'trying to watch a report from person from center a'
+                .'trying to watch a report from person from center a'
         );
     }
 
@@ -124,7 +119,7 @@ final class ReportControllerNextTest extends WebTestCase
             403,
             $clientCenterB->getResponse()->getStatusCode(),
             'assert that user is denied on trying to show a form "new" for'
-                . ' a person on another center'
+                .' a person on another center'
         );
     }
 
@@ -142,7 +137,7 @@ final class ReportControllerNextTest extends WebTestCase
             403,
             $client->getResponse()->getStatusCode(),
             'assert that user is denied on trying to show a form "new" for'
-                . ' a person on another center'
+                .' a person on another center'
         );
     }
 
@@ -152,7 +147,7 @@ final class ReportControllerNextTest extends WebTestCase
         $form = $this->getReportForm($this->person, $this->group, $client);
 
         $form->get('chill_reportbundle_report[date]')->setValue(
-            (new DateTime())->format('d-m-Y')
+            (new \DateTime())->format('d-m-Y')
         );
 
         $client->submit($form);
diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
index bd45d9048..1259e4b5f 100644
--- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
@@ -13,20 +13,17 @@ namespace Chill\ReportBundle\Tests\Controller;
 
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\DomCrawler\Form;
 use Symfony\Component\DomCrawler\Link;
-use function count;
-use function in_array;
 
 /**
  * Test the life cycles of controllers, according to
  * https://redmine.champs-libres.coop/projects/report/wiki/Test_plan_for_report_lifecycle.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ReportControllerTest extends WebTestCase
@@ -59,7 +56,7 @@ final class ReportControllerTest extends WebTestCase
         self::$em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
-        //get a random person
+        // get a random person
         self::$person = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository(\Chill\PersonBundle\Entity\Person::class)
@@ -71,19 +68,17 @@ final class ReportControllerTest extends WebTestCase
             );
 
         if (null === self::$person) {
-            throw new RuntimeException('The expected person is not present in the database. '
-                    . 'Did you run `php app/console doctrine:fixture:load` before launching tests ? '
-                    . "(expecting person is 'Charline Depardieu'");
+            throw new \RuntimeException('The expected person is not present in the database. Did you run `php app/console doctrine:fixture:load` before launching tests ? '."(expecting person is 'Charline Depardieu'");
         }
 
         $customFieldsGroups = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->findBy(['entity' => \Chill\ReportBundle\Entity\Report::class]);
-        //filter customFieldsGroup to get only "situation de logement"
+        // filter customFieldsGroup to get only "situation de logement"
         $filteredCustomFieldsGroupHouse = array_filter(
             $customFieldsGroups,
-            static fn (CustomFieldsGroup $group) => in_array('Situation de logement', $group->getName(), true)
+            static fn (CustomFieldsGroup $group) => \in_array('Situation de logement', $group->getName(), true)
         );
         self::$group = $filteredCustomFieldsGroupHouse[0];
 
@@ -116,6 +111,7 @@ final class ReportControllerTest extends WebTestCase
 
     /**
      * @return type
+     *
      * @depends testMenu
      */
     public function testChooseReportModelPage(Link $link)
@@ -134,7 +130,7 @@ final class ReportControllerTest extends WebTestCase
 
         $this->assertGreaterThan(
             1,
-            count($form->get(self::REPORT_NAME_FIELD)
+            \count($form->get(self::REPORT_NAME_FIELD)
                 ->availableOptionValues()),
             'I can choose between report models'
         );
@@ -161,7 +157,7 @@ final class ReportControllerTest extends WebTestCase
     {
         $client = $this->getAuthenticatedClient();
         $this->markTestSkipped('This test raise an error since symfony 2.7. '
-                . 'The user is not correctly reloaded from database.');
+                .'The user is not correctly reloaded from database.');
         $filledForm = $this->fillCorrectForm($form);
         $filledForm->get('chill_reportbundle_report[date]')->setValue('invalid date value');
 
@@ -206,7 +202,7 @@ final class ReportControllerTest extends WebTestCase
         $this->assertTrue($client->getResponse()->isSuccessful());
 
         $linkSee = $crawler->filter('.bt-view')->links();
-        $this->assertGreaterThan(0, count($linkSee));
+        $this->assertGreaterThan(0, \count($linkSee));
         $this->assertMatchesRegularExpression(sprintf(
             '|/fr/person/%s/report/[0-9]*/view$|',
             self::$person->getId(),
@@ -214,7 +210,7 @@ final class ReportControllerTest extends WebTestCase
         ), $linkSee[0]->getUri());
 
         $linkUpdate = $crawler->filter('.bt-update')->links();
-        $this->assertGreaterThan(0, count($linkUpdate));
+        $this->assertGreaterThan(0, \count($linkUpdate));
         $this->assertMatchesRegularExpression(sprintf(
             '|/fr/person/%s/report/[0-9]*/edit$|',
             self::$person->getId(),
@@ -241,7 +237,7 @@ final class ReportControllerTest extends WebTestCase
         if (!$client->getResponse()->isSuccessful()) {
             var_dump($crawlerPersonPage->html());
 
-            throw new RuntimeException('the request at person page failed');
+            throw new \RuntimeException('the request at person page failed');
         }
 
         $link = $crawlerPersonPage->selectLink("AJOUT D'UN RAPPORT")->link();
@@ -264,6 +260,7 @@ final class ReportControllerTest extends WebTestCase
 
     /**
      * @return type
+     *
      * @depends testChooseReportModelPage
      */
     public function testNewReportPage(Crawler $crawlerNewReportPage)
@@ -294,10 +291,10 @@ final class ReportControllerTest extends WebTestCase
             self::$group,
             $client
         );
-        //var_dump($form);
+        // var_dump($form);
         $filledForm = $this->fillCorrectForm($form);
         $filledForm->get('chill_reportbundle_report[date]')->setValue('');
-        //$this->markTestSkipped();
+        // $this->markTestSkipped();
         $crawler = $this->getAuthenticatedClient('center a_administrative')->submit($filledForm);
 
         $this->assertFalse($client->getResponse()->isRedirect());
@@ -326,7 +323,7 @@ final class ReportControllerTest extends WebTestCase
             ->form();
 
         $form->get('chill_reportbundle_report[date]')->setValue(
-            (new DateTime('yesterday'))->format('d-m-Y')
+            (new \DateTime('yesterday'))->format('d-m-Y')
         );
 
         $client->submit($form);
@@ -339,7 +336,7 @@ final class ReportControllerTest extends WebTestCase
             )
         ));
 
-        $this->assertEquals(new DateTime('yesterday'), self::$kernel->getContainer()
+        $this->assertEquals(new \DateTime('yesterday'), self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('ChillReportBundle:Report')
             ->find($reportId)
@@ -355,7 +352,7 @@ final class ReportControllerTest extends WebTestCase
     public function testValidCreate()
     {
         $client = $this->getAuthenticatedClient();
-        //$this->markTestSkipped("This test raise an error since symfony 2.7. "
+        // $this->markTestSkipped("This test raise an error since symfony 2.7. "
         //        . "The user is not correctly reloaded from database.");
         $addForm = $this->getReportForm(self::$person, self::$group, $client);
         $filledForm = $this->fillCorrectForm($addForm);
@@ -368,7 +365,7 @@ final class ReportControllerTest extends WebTestCase
         $client->followRedirect();
 
         $this->assertMatchesRegularExpression(
-            '|/fr/person/' . self::$person->getId() . '/report/[0-9]*/view$|',
+            '|/fr/person/'.self::$person->getId().'/report/[0-9]*/view$|',
             $client->getHistory()->current()->getUri(),
             "The next page is a redirection to the new report's view page"
         );
@@ -433,7 +430,7 @@ final class ReportControllerTest extends WebTestCase
     private function fillCorrectForm(Form $form)
     {
         $form->get('chill_reportbundle_report[date]')->setValue(
-            (new DateTime())->format('d-m-Y')
+            (new \DateTime())->format('d-m-Y')
         );
 
         return $form;
@@ -459,14 +456,14 @@ final class ReportControllerTest extends WebTestCase
             ->getType(), 'the user field is a select input');
 
         if ($isDefault) {
-            $date = new DateTime('now');
+            $date = new \DateTime('now');
             $this->assertEquals(
                 $date->format('d-m-Y'),
                 $form->get('chill_reportbundle_report[date]')->getValue(),
                 'the date field contains the current date by default'
             );
 
-            //resolve the user
+            // resolve the user
             $userId = $form->get('chill_reportbundle_report[user]')->getValue();
 
             $this->assertEquals(
diff --git a/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php b/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php
index b8a4e6eb6..ae01d8d90 100644
--- a/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php
@@ -11,11 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\ReportBundle\Tests\DependencyInjection;
 
-use Exception;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ChillReportExtensionTest extends KernelTestCase
@@ -41,7 +41,7 @@ final class ChillReportExtensionTest extends KernelTestCase
         }
 
         if (!$reportFounded) {
-            throw new Exception('Class Chill\\ReportBundle\\Entity\\Report not found in chill_custom_fields.customizables_entities', 1);
+            throw new \Exception('Class Chill\\ReportBundle\\Entity\\Report not found in chill_custom_fields.customizables_entities', 1);
         }
     }
 }
diff --git a/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php b/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php
index 8ddc1357e..8125d5413 100644
--- a/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\ReportBundle\Entity\Report;
 use Chill\ReportBundle\Export\Filter\ReportDateFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReportDateFilterTest extends AbstractFilterTest
diff --git a/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php b/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php
index ec47d1357..6d001c0df 100644
--- a/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php
@@ -11,13 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\ReportBundle\Tests\Search;
 
-use DateTime;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * Test for report search.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ReportSearchTest extends WebTestCase
@@ -27,7 +27,7 @@ final class ReportSearchTest extends WebTestCase
         $client = $this->getAuthenticatedClient();
 
         $crawler = $client->request('GET', '/fr/search', [
-            'q' => '@report ' . (new DateTime('tomorrow'))->format('Y-m-d'), //there should be any result for future. And future is tomorrow
+            'q' => '@report '.(new \DateTime('tomorrow'))->format('Y-m-d'), // there should be any result for future. And future is tomorrow
             'name' => 'report',
         ]);
 
diff --git a/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php b/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
index 3255b2edc..5d4261d8a 100644
--- a/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
@@ -23,6 +23,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReportVoterTest extends KernelTestCase
@@ -123,7 +124,6 @@ final class ReportVoterTest extends KernelTestCase
      * @dataProvider dataProvider
      *
      * @param type $expectedResult
-     * @param User $user
      * @param type $action
      * @param type $message
      */
@@ -132,7 +132,7 @@ final class ReportVoterTest extends KernelTestCase
         Report $report,
         $action,
         $message,
-        ?User $user = null
+        User $user = null
     ) {
         $token = $this->prepareToken($user);
         $result = $this->voter->vote($token, $report, [$action]);
@@ -157,15 +157,13 @@ final class ReportVoterTest extends KernelTestCase
      *
      * if $permissions = null, user will be null (no user associated with token
      *
-     * @param User $user
-     *
      * @return \Symfony\Component\Security\Core\Authentication\Token\TokenInterface
      */
-    protected function prepareToken(?User $user = null)
+    protected function prepareToken(User $user = null)
     {
         $token = $this->prophet->prophesize();
         $token
-            ->willImplement('\\' . \Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
+            ->willImplement('\\'.\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
 
         if (null === $user) {
             $token->getUser()->willReturn(null);
diff --git a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
index 6c4ac1d10..6e7a6dad1 100644
--- a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
@@ -15,14 +15,13 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Tests\TestHelper as MainTestHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ReportBundle\Entity\Report;
-use DateTime;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use function count;
 
 /**
  * Test a report is shown into timeline.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class TimelineProviderTest extends WebTestCase
@@ -49,7 +48,7 @@ final class TimelineProviderTest extends WebTestCase
         $center = self::$em->getRepository(\Chill\MainBundle\Entity\Center::class)
             ->findOneBy(['name' => 'Center A']);
 
-        $person = (new Person(new DateTime('2015-05-01')))
+        $person = (new Person(new \DateTime('2015-05-01')))
             ->setGender(Person::FEMALE_GENDER)
             ->setFirstName('Nelson')
             ->setLastName('Mandela')
@@ -61,13 +60,13 @@ final class TimelineProviderTest extends WebTestCase
             self::$em
                 ->getRepository(\Chill\MainBundle\Entity\Scope::class)
                 ->findAll(),
-            static fn (Scope $scope) => $scope->getName()['en'] === 'social'
+            static fn (Scope $scope) => 'social' === $scope->getName()['en']
         );
 
         $report = (new Report())
             ->setUser(self::$em->getRepository(\Chill\MainBundle\Entity\User::class)
                 ->findOneByUsername('center a_social'))
-            ->setDate(new DateTime('2015-05-02'))
+            ->setDate(new \DateTime('2015-05-02'))
             ->setPerson($this->person)
             ->setCFGroup($this->getHousingCustomFieldsGroup())
             ->setCFData(['has_logement' => 'own_house',
@@ -82,10 +81,10 @@ final class TimelineProviderTest extends WebTestCase
 
     protected function tearDown(): void
     {
-        //static::$em->refresh($this->person);
-        //static::$em->refresh($this->report);
+        // static::$em->refresh($this->person);
+        // static::$em->refresh($this->report);
         // static::$em->remove($this->person);
-        //static::$em->remove($this->report);
+        // static::$em->remove($this->report);
     }
 
     public function testReportIsNotVisibleToUngrantedUsers()
@@ -95,8 +94,8 @@ final class TimelineProviderTest extends WebTestCase
             MainTestHelper::getAuthenticatedClientOptions('center a_administrative')
         );
 
-        $crawler = $client->request('GET', '/fr/person/' . $this->person->getId()
-              . '/timeline');
+        $crawler = $client->request('GET', '/fr/person/'.$this->person->getId()
+              .'/timeline');
 
         $this->assertEquals(
             0,
@@ -116,8 +115,8 @@ final class TimelineProviderTest extends WebTestCase
             MainTestHelper::getAuthenticatedClientOptions()
         );
 
-        $crawler = $client->request('GET', '/fr/person/' . $this->person->getId()
-              . '/timeline');
+        $crawler = $client->request('GET', '/fr/person/'.$this->person->getId()
+              .'/timeline');
 
         $this->assertTrue(
             $client->getResponse()->isSuccessful(),
@@ -132,16 +131,16 @@ final class TimelineProviderTest extends WebTestCase
 
     public function testTimelineReportWithSummaryField()
     {
-        //load the page
+        // load the page
         $client = self::createClient(
             [],
             MainTestHelper::getAuthenticatedClientOptions()
         );
 
-        $crawler = $client->request('GET', '/fr/person/' . $this->person->getId()
-              . '/timeline');
+        $crawler = $client->request('GET', '/fr/person/'.$this->person->getId()
+              .'/timeline');
 
-        //performs tests
+        // performs tests
         $this->assertTrue(
             $client->getResponse()->isSuccessful(),
             'The page timeline is loaded successfully'
@@ -168,11 +167,11 @@ final class TimelineProviderTest extends WebTestCase
             ->findAll();
 
         foreach ($groups as $group) {
-            if ($group->getName()['fr'] === 'Situation de logement') {
+            if ('Situation de logement' === $group->getName()['fr']) {
                 return $group;
             }
         }
 
-        return $groups[random_int(0, count($groups) - 1)];
+        return $groups[random_int(0, \count($groups) - 1)];
     }
 }
diff --git a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
index ad63a63a0..17b600149 100644
--- a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+++ b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
@@ -18,17 +18,7 @@ use Chill\MainBundle\Timeline\TimelineSingleQuery;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ReportBundle\Entity\Report;
 use Doctrine\ORM\EntityManager;
-use LogicException;
 use Symfony\Component\Security\Core\Security;
-use UnexpectedValueException;
-
-use function array_fill;
-use function array_key_exists;
-use function array_merge;
-use function count;
-use function implode;
-use function in_array;
-use function strtr;
 
 /**
  * Provide report for inclusion in timeline.
@@ -46,10 +36,10 @@ class TimelineReportProvider implements TimelineProviderInterface
 
         return TimelineSingleQuery::fromArray([
             'id' => $report->getTableName()
-                 . '.' . $report->getColumnName('id'),
+                 .'.'.$report->getColumnName('id'),
             'type' => 'report',
             'date' => $report->getTableName()
-                 . '.' . $report->getColumnName('date'),
+                 .'.'.$report->getColumnName('date'),
             'FROM' => $this->getFromClause($context),
             'WHERE' => $where,
             'parameters' => $parameters,
@@ -91,17 +81,17 @@ class TimelineReportProvider implements TimelineProviderInterface
 
     protected function getFieldsToRender(Report $entity, $context, array $args = [])
     {
-        //gather all custom fields which should appears in summary
+        // gather all custom fields which should appears in summary
         $gatheredFields = [];
 
-        if (array_key_exists('summary_fields', $entity->getCFGroup()->getOptions())) {
+        if (\array_key_exists('summary_fields', $entity->getCFGroup()->getOptions())) {
             // keep in memory title
             $title = null;
             $subtitle = null;
 
             foreach ($entity->getCFGroup()->getCustomFields() as $customField) {
                 if (
-                    in_array(
+                    \in_array(
                         $customField->getSlug(),
                         $entity->getCFGroup()->getOptions()['summary_fields'],
                         true
@@ -109,7 +99,7 @@ class TimelineReportProvider implements TimelineProviderInterface
                 ) {
                     // if we do not want to show empty values
                     if (false === $this->showEmptyValues) {
-                        if ($customField->getType() === 'title') {
+                        if ('title' === $customField->getType()) {
                             $options = $customField->getOptions();
 
                             switch ($options['type']) {
@@ -125,8 +115,8 @@ class TimelineReportProvider implements TimelineProviderInterface
                             }
                         } else {
                             if (
-                                $this->customFieldsHelper->isEmptyValue($entity->getCFData(), $customField)
-                                === false
+                                false
+                                === $this->customFieldsHelper->isEmptyValue($entity->getCFData(), $customField)
                             ) {
                                 if (null !== $title) {
                                     $gatheredFields[] = $title;
@@ -155,13 +145,12 @@ class TimelineReportProvider implements TimelineProviderInterface
      *
      * @param string $context
      *
-     * @throws LogicException if the context is not supported
+     * @throws \LogicException if the context is not supported
      */
     private function checkContext($context)
     {
         if ('person' !== $context && 'center' !== $context) {
-            throw new LogicException("The context '{$context}' is not "
-                  . "supported. Currently only 'person' and 'center' is supported");
+            throw new \LogicException("The context '{$context}' is not supported. Currently only 'person' and 'center' is supported");
         }
     }
 
@@ -174,10 +163,10 @@ class TimelineReportProvider implements TimelineProviderInterface
         $personId = $report
             ->getAssociationMapping('person')['joinColumns'][0]['referencedColumnName'];
 
-        $clause = '{report} ' .
+        $clause = '{report} '.
             'JOIN {person} ON {report}.{person_id} = {person}.{id_person} ';
 
-        return strtr(
+        return \strtr(
             $clause,
             [
                 '{report}' => $report->getTableName(),
@@ -193,7 +182,7 @@ class TimelineReportProvider implements TimelineProviderInterface
         return match ($context) {
             'person' => $this->getWhereClauseForPerson($context, $args),
             'center' => $this->getWhereClauseForCenter($context, $args),
-            default => throw new UnexpectedValueException("This context {$context} is not implemented"),
+            default => throw new \UnexpectedValueException("This context {$context} is not implemented"),
         };
     }
 
@@ -212,7 +201,7 @@ class TimelineReportProvider implements TimelineProviderInterface
         $parameters = [];
 
         // the clause, that will be joined with an "OR"
-        $centerScopesClause = '({person}.{center_id} = ? ' .
+        $centerScopesClause = '({person}.{center_id} = ? '.
             'AND {report}.{scopes_id} IN ({scopes_ids}))';
         // container for formatted clauses
         $formattedClauses = [];
@@ -220,7 +209,7 @@ class TimelineReportProvider implements TimelineProviderInterface
         $askedCenters = $args['centers'];
 
         foreach ($reachableCenters as $center) {
-            if (false === in_array($center, $askedCenters, true)) {
+            if (false === \in_array($center, $askedCenters, true)) {
                 continue;
             }
 
@@ -230,26 +219,26 @@ class TimelineReportProvider implements TimelineProviderInterface
             $scopeIds = [];
 
             foreach ($this->helper->getReachableScopes($this->security->getUser(), $role, $center) as $scope) {
-                if (in_array($scope->getId(), $scopeIds, true)) {
+                if (\in_array($scope->getId(), $scopeIds, true)) {
                     continue;
                 }
                 $scopeIds[] = $scope->getId();
             }
 
-            $formattedClauses[] = strtr($centerScopesClause, [
-                '{scopes_ids}' => implode(', ', array_fill(0, count($scopeIds), '?')),
+            $formattedClauses[] = \strtr($centerScopesClause, [
+                '{scopes_ids}' => \implode(', ', \array_fill(0, \count($scopeIds), '?')),
             ]);
             // append $scopeIds to parameters
             $parameters = [...$parameters, ...$scopeIds];
         }
 
-        if (0 === count($formattedClauses)) {
+        if (0 === \count($formattedClauses)) {
             return ['FALSE = TRUE', []];
         }
 
         return [
-            strtr(
-                implode(' OR ', $formattedClauses),
+            \strtr(
+                \implode(' OR ', $formattedClauses),
                 [
                     '{person}' => $person->getTableName(),
                     '{center_id}' => $personCenterId,
@@ -278,28 +267,28 @@ class TimelineReportProvider implements TimelineProviderInterface
         $scopes = $this->helper->getReachableScopes($this->security->getUser(), $role, $args['person']->getCenter());
 
         foreach ($scopes as $scope) {
-            if (in_array($scope->getId(), $parameters, true)) {
+            if (\in_array($scope->getId(), $parameters, true)) {
                 continue;
             }
 
             $parameters[] = $scope->getId();
         }
 
-        if (1 === count($parameters)) {
+        if (1 === \count($parameters)) {
             // nothing change, we simplify the clause
             $clause = '{report}.{person_id} = ? AND FALSE = TRUE';
         }
 
         return [
-            strtr(
+            \strtr(
                 $clause,
                 [
                     '{report}' => $report->getTableName(),
                     '{person_id}' => $reportPersonId,
                     '{scopes_id}' => $reportScopeId,
-                    '{scopes_ids}' => implode(
+                    '{scopes_ids}' => \implode(
                         ', ',
-                        array_fill(0, count($parameters) - 1, '?')
+                        \array_fill(0, \count($parameters) - 1, '?')
                     ),
                 ]
             ),
diff --git a/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php b/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
index e9b1e281b..15827738e 100644
--- a/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
+++ b/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
@@ -14,7 +14,6 @@ namespace Chill\Migrations\Report;
 use Chill\MainBundle\Entity\Scope;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
-use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -28,7 +27,7 @@ class Version20150622233319 extends AbstractMigration implements ContainerAwareI
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -38,11 +37,10 @@ class Version20150622233319 extends AbstractMigration implements ContainerAwareI
         $this->addSql('ALTER TABLE Report DROP scope_id');
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         if (null === $container) {
-            throw new RuntimeException('Container is not provided. This migration '
-                    . 'need container to set a default center');
+            throw new \RuntimeException('Container is not provided. This migration need container to set a default center');
         }
 
         $this->container = $container;
@@ -51,7 +49,7 @@ class Version20150622233319 extends AbstractMigration implements ContainerAwareI
     public function up(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -101,10 +99,10 @@ class Version20150622233319 extends AbstractMigration implements ContainerAwareI
             }
         }*/
 
-        $this->addSql('ALTER TABLE report DROP scope'); //before this migration, scope was never used
+        $this->addSql('ALTER TABLE report DROP scope'); // before this migration, scope was never used
         $this->addSql('ALTER TABLE report ADD CONSTRAINT FK_report_scope '
-                . 'FOREIGN KEY (scope_id) '
-                . 'REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'FOREIGN KEY (scope_id) '
+                .'REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
 
         if (isset($defaultScopeId)) {
             $this->addSql('UPDATE report SET scope_id = :id', [
diff --git a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
index 2881e695d..16c520c75 100644
--- a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
@@ -29,7 +29,6 @@ use Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface;
 use Chill\TaskBundle\Repository\SingleTaskRepository;
 use Chill\TaskBundle\Repository\SingleTaskStateRepository;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
-use LogicException;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -41,12 +40,8 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_map;
-use function array_merge;
-
 final class SingleTaskController extends AbstractController
 {
     public function __construct(
@@ -78,7 +73,7 @@ final class SingleTaskController extends AbstractController
             throw $this->createNotFoundException('Unable to find Task entity.');
         }
 
-        if ($task->getPerson() !== null) {
+        if (null !== $task->getPerson()) {
             $personId = $task->getPerson()->getId();
 
             if (null === $personId) {
@@ -115,7 +110,7 @@ final class SingleTaskController extends AbstractController
 
         $form = $this->createDeleteForm($id);
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -174,7 +169,7 @@ final class SingleTaskController extends AbstractController
         Request $request
     ) {
         $this->denyAccessUnlessGranted(TaskVoter::UPDATE, $task, 'You are not '
-            . 'allowed to edit this task');
+            .'allowed to edit this task');
 
         $event = (new UIEvent('single-task', $task))
             ->setForm($this->setCreateForm($task, TaskVoter::UPDATE));
@@ -275,9 +270,9 @@ final class SingleTaskController extends AbstractController
 
         $filteredUsers = $filterOrder->getUserPickerData('userPicker');
 
-        $flags = array_merge(
+        $flags = \array_merge(
             $filterOrder->getCheckboxData('status'),
-            array_map(static fn ($i) => 'state_' . $i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
+            \array_map(static fn ($i) => 'state_'.$i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
         );
 
         if ($showMissionTypeFilter) {
@@ -329,9 +324,9 @@ final class SingleTaskController extends AbstractController
         $this->denyAccessUnlessGranted(TaskVoter::SHOW, $course);
 
         $filterOrder = $this->buildFilterOrder();
-        $flags = array_merge(
+        $flags = \array_merge(
             $filterOrder->getCheckboxData('status'),
-            array_map(static fn ($i) => 'state_' . $i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
+            \array_map(static fn ($i) => 'state_'.$i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
         );
         $nb = $this->singleTaskAclAwareRepository->countByCourse(
             $course,
@@ -378,9 +373,9 @@ final class SingleTaskController extends AbstractController
         $this->denyAccessUnlessGranted(TaskVoter::SHOW, $person);
 
         $filterOrder = $this->buildFilterOrder();
-        $flags = array_merge(
+        $flags = \array_merge(
             $filterOrder->getCheckboxData('status'),
-            array_map(static fn ($i) => 'state_' . $i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
+            \array_map(static fn ($i) => 'state_'.$i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
         );
         $nb = $this->singleTaskAclAwareRepository->countByPerson(
             $person,
@@ -418,6 +413,7 @@ final class SingleTaskController extends AbstractController
 
     /**
      * @return Response
+     *
      * @Route(
      *     "/{_locale}/task/single-task/list/my",
      *     name="chill_task_singletask_my_tasks",
@@ -433,9 +429,9 @@ final class SingleTaskController extends AbstractController
         $this->denyAccessUnlessGranted('ROLE_USER');
 
         $filterOrder = $this->buildFilterOrder(false);
-        $flags = array_merge(
+        $flags = \array_merge(
             $filterOrder->getCheckboxData('status'),
-            array_map(static fn ($i) => 'state_' . $i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
+            \array_map(static fn ($i) => 'state_'.$i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
         );
         $nb = $this->singleTaskAclAwareRepository->countByCurrentUsersTasks(
             $filterOrder->getQueryString(),
@@ -541,7 +537,7 @@ final class SingleTaskController extends AbstractController
         }
 
         $this->denyAccessUnlessGranted($role, $task, 'You are not '
-             . 'allowed to create this task');
+             .'allowed to create this task');
 
         $form = $this->setCreateForm($task, $role);
 
@@ -589,7 +585,7 @@ final class SingleTaskController extends AbstractController
                 'task' => $task,
                 'accompanyingCourse' => $task->getCourse(),
             ]),
-            default => throw new LogicException('entity context not supported'),
+            default => throw new \LogicException('entity context not supported'),
         };
     }
 
@@ -673,7 +669,7 @@ final class SingleTaskController extends AbstractController
         if ($includeMissionType) {
             $filterBuilder->addCheckbox(
                 'missionTypePicker',
-                array_map(
+                \array_map(
                     fn ($row) => $row['type'],
                     $this->singleTaskRepository->findAllTaskDistinctTypes()
                 )
diff --git a/src/Bundle/ChillTaskBundle/Controller/TaskController.php b/src/Bundle/ChillTaskBundle/Controller/TaskController.php
index 37e8ff6e6..e5d060de7 100644
--- a/src/Bundle/ChillTaskBundle/Controller/TaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/TaskController.php
@@ -25,7 +25,6 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Transition;
 use Symfony\Contracts\Translation\TranslatorInterface;
-
 use function array_filter;
 use function array_values;
 
@@ -43,7 +42,7 @@ class TaskController extends AbstractController
      * )
      *
      * @param string $kind
-     * @param int $taskId
+     * @param int    $taskId
      * @param string $transition
      *
      * @return Response
@@ -70,7 +69,7 @@ class TaskController extends AbstractController
                         'list_params' => $request->query->get('list_params', []),
                     ]
                 );
-                $task->getCourse() === null ? $defaultTemplate = '@ChillTask/SingleTask/Person/transition.html.twig' : $defaultTemplate = '@ChillTask/SingleTask/AccompanyingCourse/transition.html.twig';
+                null === $task->getCourse() ? $defaultTemplate = '@ChillTask/SingleTask/Person/transition.html.twig' : $defaultTemplate = '@ChillTask/SingleTask/AccompanyingCourse/transition.html.twig';
 
                 break;
 
@@ -82,8 +81,7 @@ class TaskController extends AbstractController
         }
 
         if (null === $task) {
-            throw $this->createNotFoundException("task with id '{$taskId}' and type "
-                . "'{$kind}' does not exists");
+            throw $this->createNotFoundException("task with id '{$taskId}' and type '{$kind}' does not exists");
         }
 
         $workflow = $registry->get($task);
@@ -91,8 +89,8 @@ class TaskController extends AbstractController
         if (!$workflow->can($task, $transition)) {
             throw $this->createAccessDeniedException('You are not allowed to apply this transition');
         }
-        $transitionInstance = array_values( // array_values needed to reset keys (array_filter preserves keys)
-            array_filter(
+        $transitionInstance = \array_values( // array_values needed to reset keys (array_filter preserves keys)
+            \array_filter(
                 $workflow->getEnabledTransitions($task),
                 static fn (Transition $t) => $t->getName() === $transition
             )
diff --git a/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php b/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
index bd6bc92ff..cb38df91c 100644
--- a/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
+++ b/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
@@ -19,8 +19,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function in_array;
-
 /**
  * Add a role UPDATE & CREATE for all groups except administrative,
  * and a role SEE for administrative.
@@ -39,10 +37,10 @@ class LoadTaskACL extends AbstractFixture implements OrderedFixtureInterface
 
             foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
-                //create permission group
+                // create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
-                        if ($scope->getName()['en'] === 'administrative') {
+                        if ('administrative' === $scope->getName()['en']) {
                             break 2; // we do not want any power on administrative
                         }
 
@@ -50,7 +48,7 @@ class LoadTaskACL extends AbstractFixture implements OrderedFixtureInterface
 
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
+                        if (\in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             break 2; // we do not want any power on social or administrative
                         }
 
@@ -59,7 +57,7 @@ class LoadTaskACL extends AbstractFixture implements OrderedFixtureInterface
 
                 printf(
                     'Adding CHILL_TASK_TASK_UPDATE & CHILL_TASK_TASK_CREATE & Chill_TASK_TASK_DELETE permissions to %s '
-                        . "permission group, scope '%s' \n",
+                        ."permission group, scope '%s' \n",
                     $permissionsGroup->getName(),
                     $scope->getName()['en']
                 );
diff --git a/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php b/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php
index 70faa5ee3..0122861d6 100644
--- a/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php
+++ b/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php
@@ -31,7 +31,7 @@ class ChillTaskExtension extends Extension implements PrependExtensionInterface
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services/controller.yaml');
         $loader->load('services/security.yaml');
         $loader->load('services/repositories.yaml');
@@ -64,7 +64,7 @@ class ChillTaskExtension extends Extension implements PrependExtensionInterface
 
     protected function prependRoute(ContainerBuilder $container)
     {
-        //declare routes for task bundle
+        // declare routes for task bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
diff --git a/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php b/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php
index 3455737e0..4447778ec 100644
--- a/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php
+++ b/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php
@@ -14,7 +14,6 @@ namespace Chill\TaskBundle\DependencyInjection\Compiler;
 use Chill\TaskBundle\Event\Lifecycle\TaskLifecycleEvent;
 use Chill\TaskBundle\Templating\UI\CountNotificationTask;
 use Chill\TaskBundle\Workflow\TaskWorkflowManager;
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -24,8 +23,7 @@ class TaskWorkflowDefinitionCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition(TaskWorkflowManager::class)) {
-            throw new LogicException('The service ' . TaskWorkflowManager::class . ' is '
-                . 'not registered');
+            throw new \LogicException('The service '.TaskWorkflowManager::class.' is not registered');
         }
 
         $workflowManagerDefinition = $container->getDefinition(TaskWorkflowManager::class);
diff --git a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
index d934bd99d..51ab8166d 100644
--- a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
@@ -21,13 +21,11 @@ use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
 
-use function array_fill_keys;
-use function array_keys;
-
 /**
  * AbstractTask.
  *
  * @ORM\MappedSuperclass
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "single_task": SingleTask::class
  * })
@@ -38,6 +36,7 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\MainBundle\Entity\User"
      * )
+     *
      * @Serializer\Groups({"read"})
      */
     private ?\Chill\MainBundle\Entity\User $assignee = null;
@@ -51,25 +50,28 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
 
     /**
      * @ORM\Column(name="closed", type="boolean", options={ "default": false })
+     *
      * @Serializer\Groups({"read"})
      */
     private bool $closed = false;
 
     /**
      * @ORM\ManyToOne(targetEntity="\Chill\PersonBundle\Entity\AccompanyingPeriod")
+     *
      * @Serializer\Groups({"read"})
      */
     private ?\Chill\PersonBundle\Entity\AccompanyingPeriod $course = null;
 
     /**
      * @ORM\Column(name="current_states", type="json", options={"jsonb"=true, "default"="[]"})
+     *
      * @Serializer\Groups({"read"})
      */
     private array $currentStates = [];
 
     /**
-     *
      * @ORM\Column(name="description", type="text")
+     *
      * @Serializer\Groups({"read"})
      */
     private string $description = '';
@@ -78,21 +80,23 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\PersonBundle\Entity\Person"
      * )
+     *
      * @Serializer\Groups({"read"})
      */
     private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
-     *
      * @ORM\Column(name="title", type="text")
+     *
      * @Assert\NotBlank
+     *
      * @Serializer\Groups({"read"})
      */
     private string $title = '';
 
     /**
-     *
      * @ORM\Column(name="type", type="string", length=255)
+     *
      * @Serializer\Groups({"read"})
      */
     private ?string $type = null;
@@ -137,7 +141,7 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
      */
     public function getCurrentStates()
     {
-        return array_fill_keys($this->currentStates, 1);
+        return \array_fill_keys($this->currentStates, 1);
     }
 
     /**
@@ -185,7 +189,7 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
         return $this->closed;
     }
 
-    public function setAssignee(?User $assignee = null)
+    public function setAssignee(User $assignee = null)
     {
         $this->assignee = $assignee;
 
@@ -216,13 +220,11 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
      *
      * The current states are sorted in a single array, non associative.
      *
-     * @param $currentStates
-     *
      * @return AbstractTask
      */
     public function setCurrentStates($currentStates)
     {
-        $this->currentStates = array_keys($currentStates);
+        $this->currentStates = \array_keys($currentStates);
 
         return $this;
     }
diff --git a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
index e196bc611..d8182cd23 100644
--- a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\TaskBundle\Entity;
 
-use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -20,6 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
  * RecurringTask.
  *
  * @ORM\Table(name="chill_task.recurring_task")
+ *
  * @ORM\Entity(repositoryClass="Chill\TaskBundle\Repository\RecurringTaskRepository")
  */
 class RecurringTask extends AbstractTask
@@ -30,10 +30,10 @@ class RecurringTask extends AbstractTask
     private ?\DateTime $firstOccurenceEndDate = null;
 
     /**
-     * @var int
-     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\Id
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -44,20 +44,16 @@ class RecurringTask extends AbstractTask
     private ?\DateTime $lastOccurenceEndDate = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="occurence_frequency", type="string", length=255)
      */
     private ?string $occurenceFrequency = null;
 
     /**
-     *
      * @ORM\Column(name="occurence_start_date", type="dateinterval")
      */
     private $occurenceStartDate;
 
     /**
-     *
      * @ORM\Column(name="occurence_warning_interval", type="dateinterval", nullable=true)
      */
     private $occurenceWarningInterval;
@@ -80,7 +76,7 @@ class RecurringTask extends AbstractTask
     /**
      * Get firstOccurenceEndDate.
      *
-     * @return DateTime
+     * @return \DateTime
      */
     public function getFirstOccurenceEndDate()
     {
@@ -100,7 +96,7 @@ class RecurringTask extends AbstractTask
     /**
      * Get lastOccurenceEndDate.
      *
-     * @return DateTime
+     * @return \DateTime
      */
     public function getLastOccurenceEndDate()
     {
@@ -119,7 +115,6 @@ class RecurringTask extends AbstractTask
 
     /**
      * Get occurenceStartDate.
-     *
      */
     public function getOccurenceStartDate()
     {
@@ -128,7 +123,6 @@ class RecurringTask extends AbstractTask
 
     /**
      * Get occurenceWarningInterval.
-     *
      */
     public function getOccurenceWarningInterval()
     {
@@ -138,7 +132,7 @@ class RecurringTask extends AbstractTask
     /**
      * Set firstOccurenceEndDate.
      *
-     * @param DateTime $firstOccurenceEndDate
+     * @param \DateTime $firstOccurenceEndDate
      *
      * @return RecurringTask
      */
@@ -152,7 +146,7 @@ class RecurringTask extends AbstractTask
     /**
      * Set lastOccurenceEndDate.
      *
-     * @param DateTime $lastOccurenceEndDate
+     * @param \DateTime $lastOccurenceEndDate
      *
      * @return RecurringTask
      */
@@ -180,7 +174,6 @@ class RecurringTask extends AbstractTask
     /**
      * Set occurenceStartDate.
      *
-     *
      * @return RecurringTask
      */
     public function setOccurenceStartDate(mixed $occurenceStartDate)
@@ -193,7 +186,6 @@ class RecurringTask extends AbstractTask
     /**
      * Set occurenceWarningInterval.
      *
-     *
      * @return RecurringTask
      */
     public function setOccurenceWarningInterval(mixed $occurenceWarningInterval)
diff --git a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
index 92a7a24cc..eca0c17cc 100644
--- a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
@@ -13,8 +13,6 @@ namespace Chill\TaskBundle\Entity;
 
 use Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent;
 use DateInterval;
-use DateTime;
-use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -27,6 +25,7 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Table(
  *     name="chill_task.single_task",
  *     indexes={
+ *
  *         @ORM\Index(
  *             name="by_type",
  *             columns={ "type" }
@@ -41,23 +40,27 @@ use Symfony\Component\Validator\Constraints as Assert;
  *         )
  *     }
  * )
+ *
  * @ORM\Entity(repositoryClass="Chill\TaskBundle\Repository\SingleTaskRepository")
  */
 class SingleTask extends AbstractTask
 {
     /**
      * @ORM\Column(name="end_date", type="date", nullable=true)
+     *
      * @Assert\Date
+     *
      * @Serializer\Groups({"read"})
      */
     private ?\DateTime $endDate = null;
 
     /**
-     * @var int
-     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\Id
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Serializer\Groups({"read"})
      */
     private ?int $id = null;
@@ -71,16 +74,16 @@ class SingleTask extends AbstractTask
     private ?\Chill\TaskBundle\Entity\RecurringTask $recurringTask = null;
 
     /**
-     *
      * @ORM\Column(name="start_date", type="date", nullable=true)
+     *
      * @Serializer\Groups({"read"})
+     *
      * @Assert\Date
      *
      * @Assert\Expression(
      *     "value === null or this.getEndDate() === null or value < this.getEndDate()",
      *     message="The start date must be before the end date"
      * )
-     *
      * @Assert\Expression(
      *     "value === null or this.getWarningDate() === null or this.getWarningDate() > this.getStartDate()",
      *     message="The start date must be before warning date"
@@ -90,6 +93,7 @@ class SingleTask extends AbstractTask
 
     /**
      * @var Collection<SingleTaskPlaceEvent>
+     *
      * @ORM\OneToMany(
      *     targetEntity="\Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent",
      *     mappedBy="task",
@@ -99,10 +103,11 @@ class SingleTask extends AbstractTask
     private Collection $taskPlaceEvents;
 
     /**
-     * @var DateInterval
-     *  and this.getEndDate() === null
+     * @var \DateInterval
+     *                    and this.getEndDate() === null
      *
      * @ORM\Column(name="warning_interval", type="dateinterval", nullable=true)
+     *
      * @Serializer\Groups({"read"})
      *
      * @Assert\Expression(
@@ -110,7 +115,7 @@ class SingleTask extends AbstractTask
      *     message="An end date is required if a warning interval is set"
      * )
      */
-    private $warningInterval;
+    private null|\DateInterval $warningInterval = null;
 
     public function __construct()
     {
@@ -119,10 +124,8 @@ class SingleTask extends AbstractTask
 
     /**
      * Get endDate.
-     *
-     * @return DateTime
      */
-    public function getEndDate()
+    public function getEndDate(): null|\DateTime
     {
         return $this->endDate;
     }
@@ -145,7 +148,7 @@ class SingleTask extends AbstractTask
     /**
      * Get startDate.
      *
-     * @return DateTime
+     * @return \DateTime
      */
     public function getStartDate()
     {
@@ -163,29 +166,28 @@ class SingleTask extends AbstractTask
      *
      * Return null if warningDate or endDate is null
      *
-     * @return DateTimeImmutable
+     * @return \DateTimeImmutable
+     *
      * @Serializer\Groups({"read"})
      */
     public function getWarningDate()
     {
-        if ($this->getWarningInterval() === null) {
+        if (null === $this->getWarningInterval()) {
             return null;
         }
 
-        if ($this->getEndDate() === null) {
+        if (null === $this->getEndDate()) {
             return null;
         }
 
-        return DateTimeImmutable::createFromMutable($this->getEndDate())
+        return \DateTimeImmutable::createFromMutable($this->getEndDate())
             ->sub($this->getWarningInterval());
     }
 
     /**
      * Get warningInterval.
-     *
-     * @return DateInterval
      */
-    public function getWarningInterval()
+    public function getWarningInterval(): null|\DateInterval
     {
         return $this->warningInterval;
     }
@@ -193,7 +195,7 @@ class SingleTask extends AbstractTask
     /**
      * Set endDate.
      *
-     * @param DateTime $endDate
+     * @param \DateTime $endDate
      *
      * @return SingleTask
      */
@@ -212,7 +214,7 @@ class SingleTask extends AbstractTask
     /**
      * Set startDate.
      *
-     * @param DateTime $startDate
+     * @param \DateTime $startDate
      *
      * @return SingleTask
      */
@@ -233,11 +235,9 @@ class SingleTask extends AbstractTask
     /**
      * Set warningInterval.
      *
-     * @param string $warningInterval
-     *
      * @return SingleTask
      */
-    public function setWarningInterval($warningInterval)
+    public function setWarningInterval(null|\DateInterval $warningInterval)
     {
         $this->warningInterval = $warningInterval;
 
diff --git a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
index d90f3fb73..8a47eda19 100644
--- a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
+++ b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\TaskBundle\Entity\Task;
 
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -48,7 +47,7 @@ class AbstractTaskPlaceEvent
 
     public function __construct()
     {
-        $this->datetime = new DateTimeImmutable('now');
+        $this->datetime = new \DateTimeImmutable('now');
     }
 
     public function getAuthor(): User
diff --git a/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php b/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php
index 572e466b3..47e3eabfb 100644
--- a/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php
+++ b/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\Mapping as ORM;
  * @ORM\Table(
  *     name="chill_task.single_task_place_event",
  *     indexes={
+ *
  *         @ORM\Index(
  *             name="transition_task_date",
  *             columns={"task_id", "transition", "datetime"}
@@ -27,19 +28,21 @@ use Doctrine\ORM\Mapping as ORM;
  *             columns={"task_id", "transition"}
  *         )
  *     })
+ *
  *     @ORM\Entity
  */
 class SingleTaskPlaceEvent extends AbstractTaskPlaceEvent
 {
     /**
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\Id
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
     /**
-     * @var SingleTask
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\TaskBundle\Entity\SingleTask",
      *     inversedBy="taskPlaceEvents"
diff --git a/src/Bundle/ChillTaskBundle/Event/TaskEvent.php b/src/Bundle/ChillTaskBundle/Event/TaskEvent.php
index f906d590a..4e38f96ca 100644
--- a/src/Bundle/ChillTaskBundle/Event/TaskEvent.php
+++ b/src/Bundle/ChillTaskBundle/Event/TaskEvent.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\TaskBundle\Event;
 
 use Chill\TaskBundle\Entity\AbstractTask;
-use Symfony\Component\EventDispatcher\Event;
 
 class TaskEvent extends \Symfony\Contracts\EventDispatcher\Event
 {
diff --git a/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php b/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
index 598a16691..ba7d85eb0 100644
--- a/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
+++ b/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\TaskBundle\Event\UI;
 
 use Chill\TaskBundle\Entity\AbstractTask;
-use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Workflow\Transition;
@@ -53,7 +52,7 @@ class UIEvent extends \Symfony\Contracts\EventDispatcher\Event
         $this->task = $task;
     }
 
-    public function getForm(): ?\Symfony\Component\Form\FormInterface
+    public function getForm(): ?FormInterface
     {
         return $this->form;
     }
diff --git a/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php b/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
index e76bf9c82..e0221545b 100644
--- a/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
+++ b/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
@@ -28,11 +28,6 @@ use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
-
-use function array_combine;
-use function array_map;
-use function count;
 
 class SingleTaskListType extends AbstractType
 {
@@ -99,7 +94,7 @@ class SingleTaskListType extends AbstractType
         if ($options['add_type']) {
             $types = $this->getTaskTypesChoices($options);
 
-            if (count($types) > 0) {
+            if (\count($types) > 0) {
                 $builder->add('types', ChoiceType::class, [
                     'choices' => $types,
                     'required' => false,
@@ -123,7 +118,7 @@ class SingleTaskListType extends AbstractType
                 ]);
             $reachablesCenters = $this->getReachablesCenters();
 
-            if (count($reachablesCenters) > 1) {
+            if (\count($reachablesCenters) > 1) {
                 $builder
                     ->add('center_id', EntityType::class, [
                         'class' => \Chill\MainBundle\Entity\Center::class,
@@ -182,16 +177,16 @@ class SingleTaskListType extends AbstractType
         foreach ($centers as $center) {
             $circles = $this->authorizationHelper->getReachableCircles($user, $role, $center);
 
-            if (count($circles) > 0) {
+            if (\count($circles) > 0) {
                 $andX = $qb->expr()->andX();
                 $andX
-                    ->add($qb->expr()->eq('person.center', ':center_' . $i))
-                    ->add($qb->expr()->in('task.circle', ':circles_' . $i));
+                    ->add($qb->expr()->eq('person.center', ':center_'.$i))
+                    ->add($qb->expr()->in('task.circle', ':circles_'.$i));
                 $orCenters->add($andX);
 
                 $qb
-                    ->setParameter('center_' . $i, $center)
-                    ->setParameter('circles_' . $i, $circles);
+                    ->setParameter('center_'.$i, $center)
+                    ->setParameter('circles_'.$i, $circles);
                 ++$i;
             }
         }
@@ -216,11 +211,11 @@ class SingleTaskListType extends AbstractType
     protected function getUserChoices($options)
     {
         $users = $this->getUsersAssigneedToTask($options);
-        $choices = array_combine(
+        $choices = \array_combine(
             // get usernames
-            array_map(static fn (User $user) => $user->getUsername(), $users),
+            \array_map(static fn (User $user) => $user->getUsername(), $users),
             // get ids
-            array_map(static fn (User $user) => $user->getId(), $users)
+            \array_map(static fn (User $user) => $user->getId(), $users)
         );
         $choices['Unassigned'] = '_unassigned';
 
@@ -230,7 +225,6 @@ class SingleTaskListType extends AbstractType
     /**
      * Return a list of user having a task assigned.
      *
-     *
      * @return User[]
      */
     protected function getUsersAssigneedToTask(mixed $options)
@@ -260,12 +254,12 @@ class SingleTaskListType extends AbstractType
             // add condition about person and circle
             $circleCenterCond->add(
                 $qb->expr()->andX()
-                    ->add($qb->expr()->eq('person.center', ':center_' . $i))
-                    ->add($qb->expr()->in('task.circle', ':circles_' . $i))
+                    ->add($qb->expr()->eq('person.center', ':center_'.$i))
+                    ->add($qb->expr()->in('task.circle', ':circles_'.$i))
             );
 
-            $qb->setParameter('center_' . $i, $center)
-                ->setParameter('circles_' . $i, $circles);
+            $qb->setParameter('center_'.$i, $center)
+                ->setParameter('circles_'.$i, $circles);
             // increase counter
             ++$i;
         }
diff --git a/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php b/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
index 2313b1258..7e572e078 100644
--- a/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
+++ b/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
@@ -24,7 +24,6 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Role\Role;
 
 class SingleTaskType extends AbstractType
 {
diff --git a/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
index ef0ae2428..6b710744d 100644
--- a/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use Knp\Menu\MenuItem;
-use LogicException;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -63,13 +62,13 @@ class MenuBuilder implements LocalMenuBuilderInterface
             'person' => $this->buildPersonMenu($menu, $parameters),
             'accompanyingCourse' => $this->buildAccompanyingCourseMenu($menu, $parameters),
             'section' => $menu->setExtras('icons'),
-            default => throw new LogicException("this menuid {$menuId} is not implemented"),
+            default => throw new \LogicException("this menuid {$menuId} is not implemented"),
         };
     }
 
     public function buildPersonMenu($menu, $parameters)
     {
-        //var $person \Chill\PersonBundle\Entity\Person */
+        // var $person \Chill\PersonBundle\Entity\Person */
         $person = $parameters['person'] ?? null;
 
         if ($this->authorizationChecker->isGranted(TaskVoter::SHOW, $person)) {
diff --git a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
index 3a3972367..a8c299680 100644
--- a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
@@ -103,7 +103,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
     {
         if (0 < $number) {
             $menu->addChild(
-                $this->translator->trans($message, $number),
+                $this->translator->trans($message, ['nb' => $number]),
                 [
                     'route' => 'chill_task_singletask_my_tasks',
                     'routeParameters' => [
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
index 4c64bab0e..605597fea 100644
--- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
@@ -17,22 +17,16 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\TaskBundle\Entity\SingleTask;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
-use DateInterval;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Security\Core\Security;
 
-use function count;
-use function substr;
-
 final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepositoryInterface
 {
     public function __construct(private CenterResolverManagerInterface $centerResolverDispatcher, private EntityManagerInterface $em, private Security $security, private AuthorizationHelperInterface $authorizationHelper) {}
 
     public function buildBaseQuery(
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?array $types = [],
         ?array $users = []
@@ -43,18 +37,18 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
 
         if (null !== $pattern && '' !== $pattern) {
             $qb->andWhere($qb->expr()->like('LOWER(UNACCENT(t.title))', 'LOWER(UNACCENT(:pattern))'))
-                ->setParameter('pattern', '%' . $pattern . '%');
+                ->setParameter('pattern', '%'.$pattern.'%');
         }
 
-        if (null !== $users && count($users) > 0) {
+        if (null !== $users && \count($users) > 0) {
             $orXUser = $qb->expr()->orX();
 
             foreach ($users as $key => $user) {
                 $orXUser->add(
-                    $qb->expr()->eq('t.assignee', ':user_' . $key)
+                    $qb->expr()->eq('t.assignee', ':user_'.$key)
                 );
 
-                $qb->setParameter('user_' . $key, $user);
+                $qb->setParameter('user_'.$key, $user);
             }
 
             if ($orXUser->count() > 0) {
@@ -62,16 +56,16 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
             }
         }
 
-        if (null !== $types && count($types) > 0) {
+        if (null !== $types && \count($types) > 0) {
             $qb->andWhere($qb->expr()->in('t.type', ':types'));
 
             $qb->setParameter('types', $types);
         }
 
-        if (null !== $flags && count($flags) > 0) {
+        if (null !== $flags && \count($flags) > 0) {
             $orXDate = $qb->expr()->orX();
             $orXState = $qb->expr()->orX();
-            $now = new DateTime();
+            $now = new \DateTime();
 
             foreach ($flags as $key => $flag) {
                 switch ($flag) {
@@ -84,7 +78,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
                                 )
                             );
                         $qb
-                            ->setParameter('intervalBlank', new DateInterval('P0D'))
+                            ->setParameter('intervalBlank', new \DateInterval('P0D'))
                             ->setParameter('now', $now);
 
                         break;
@@ -126,7 +120,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
                         break;
 
                     case str_starts_with((string) $flag, 'state_'):
-                        $state = substr((string) $flag, 6);
+                        $state = \substr((string) $flag, 6);
                         $orXState
                             ->add(
                                 "JSONB_EXISTS_IN_ARRAY(t.currentStates, :state_{$key}) = 'TRUE'"
@@ -136,7 +130,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
                         break;
 
                     default:
-                        throw new LogicException("this flag is not supported: {$flag}");
+                        throw new \LogicException("this flag is not supported: {$flag}");
                 }
             }
 
@@ -154,7 +148,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
 
     public function buildQueryByCourse(
         AccompanyingPeriod $course,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): QueryBuilder {
         $qb = $this->buildBaseQuery($pattern, $flags);
@@ -166,7 +160,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
 
     public function buildQueryByPerson(
         Person $person,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): QueryBuilder {
         $qb = $this->buildBaseQuery($pattern, $flags);
@@ -177,7 +171,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
     }
 
     public function buildQueryMyTasks(
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): QueryBuilder {
         $qb = $this->buildBaseQuery($pattern, $flags);
@@ -188,7 +182,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
     }
 
     public function countByAllViewable(
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?array $types = [],
         ?array $users = []
@@ -203,7 +197,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
 
     public function countByCourse(
         AccompanyingPeriod $course,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): int {
         $qb = $this->buildQueryByCourse($course, $pattern, $flags);
@@ -215,7 +209,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
     }
 
     public function countByCurrentUsersTasks(
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): int {
         return $this->buildQueryMyTasks($pattern, $flags)
@@ -225,7 +219,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
 
     public function countByPerson(
         Person $person,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): int {
         $qb = $this->buildQueryByPerson($person, $pattern, $flags);
@@ -237,7 +231,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
     }
 
     public function findByAllViewable(
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?array $types = [],
         ?array $users = [],
@@ -253,7 +247,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
 
     public function findByCourse(
         AccompanyingPeriod $course,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?int $start = 0,
         ?int $limit = 50,
@@ -266,7 +260,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
     }
 
     public function findByCurrentUsersTasks(
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?int $start = 0,
         ?int $limit = 50,
@@ -279,7 +273,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
 
     public function findByPerson(
         Person $person,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?int $start = 0,
         ?int $limit = 50,
@@ -304,7 +298,7 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
             ->setMaxResults($limit);
 
         foreach ($orderBy as $field => $direction) {
-            $qb->addOrderBy('t.' . $field, $direction);
+            $qb->addOrderBy('t.'.$field, $direction);
         }
 
         return $qb->getQuery()->getResult();
@@ -360,14 +354,14 @@ final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareR
 
             $and = $qb->expr()->andX(
                 $qb->expr()->orX(
-                    $qb->expr()->eq('center_current_person.center', ':center_' . $k),
-                    $qb->expr()->eq('center_current_participation.center', ':center_' . $k)
+                    $qb->expr()->eq('center_current_person.center', ':center_'.$k),
+                    $qb->expr()->eq('center_current_participation.center', ':center_'.$k)
                 ),
-                $qb->expr()->in('t.circle', ':scopes_' . $k)
+                $qb->expr()->in('t.circle', ':scopes_'.$k)
             );
             $qb
-                ->setParameter('center_' . $k, $center)
-                ->setParameter('scopes_' . $k, $allowedScopes);
+                ->setParameter('center_'.$k, $center)
+                ->setParameter('scopes_'.$k, $allowedScopes);
             $orX->add($and);
 
             ++$k;
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php
index bb63c0caa..2f305ae3e 100644
--- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php
@@ -17,7 +17,7 @@ use Chill\PersonBundle\Entity\Person;
 interface SingleTaskAclAwareRepositoryInterface
 {
     public function countByAllViewable(
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?array $types = [],
         ?array $users = []
@@ -25,20 +25,20 @@ interface SingleTaskAclAwareRepositoryInterface
 
     public function countByCourse(
         AccompanyingPeriod $course,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): int;
 
-    public function countByCurrentUsersTasks(?string $pattern = null, ?array $flags = []): int;
+    public function countByCurrentUsersTasks(string $pattern = null, ?array $flags = []): int;
 
     public function countByPerson(
         Person $person,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): int;
 
     public function findByAllViewable(
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?array $types = [],
         ?array $users = [],
@@ -49,18 +49,18 @@ interface SingleTaskAclAwareRepositoryInterface
 
     public function findByCourse(
         AccompanyingPeriod $course,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?int $start = 0,
         ?int $limit = 50,
         ?array $orderBy = []
     ): array;
 
-    public function findByCurrentUsersTasks(?string $pattern = null, ?array $flags = [], ?int $start = 0, ?int $limit = 50, ?array $orderBy = []): array;
+    public function findByCurrentUsersTasks(string $pattern = null, ?array $flags = [], ?int $start = 0, ?int $limit = 50, ?array $orderBy = []): array;
 
     public function findByPerson(
         Person $person,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?int $start = 0,
         ?int $limit = 50,
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
index 57b6f3702..6260b90c1 100644
--- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
@@ -15,15 +15,9 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
-use DateTime;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
-use Symfony\Component\Security\Core\Role\Role;
-use UnexpectedValueException;
-
-use function array_key_exists;
 use function count;
 
 /**
@@ -59,11 +53,10 @@ class SingleTaskRepository extends EntityRepository
      * @see SingleTaskRepository::filterByParameters
      *
      * @param array $params
-     * @param User $currentUser
      *
      * @return int
      */
-    public function countByParameters($params, ?User $currentUser = null)
+    public function countByParameters($params, User $currentUser = null)
     {
         $qb = $this->createQueryBuilder('st')
             ->select('COUNT(st)');
@@ -146,17 +139,14 @@ class SingleTaskRepository extends EntityRepository
                     ->add($this->buildNowIsAfterWarningDate($qb, true))
                     ->add($this->buildNowIsAfterStartDate($qb, true));
         }
-        $qb->setParameter('now', new DateTime('today'), Types::DATE_MUTABLE);
+        $qb->setParameter('now', new \DateTime('today'), Types::DATE_MUTABLE);
         $qb->andWhere($andWhere);
     }
 
     protected function buildACLQuery(QueryBuilder $qb, User $currentUser)
     {
         if (null === $this->authorizationHelper) {
-            throw new LogicException('Injecting the authorization helper is '
-                . 'required to run this query. Please use dependency injection '
-                . 'to initialize this repository or use the method '
-                . '`setAuthorizationHelper`');
+            throw new \LogicException('Injecting the authorization helper is required to run this query. Please use dependency injection to initialize this repository or use the method `setAuthorizationHelper`');
         }
 
         $role = TaskVoter::SHOW;
@@ -174,10 +164,10 @@ class SingleTaskRepository extends EntityRepository
 
             $centerWhere = $qb->expr()->andX();
 
-            $centerWhere->add($qb->expr()->eq('p.center', ':center_' . $i));
-            $qb->setParameter('center_' . $i, $center);
-            $centerWhere->add($qb->expr()->in('st.circle', ':circles_' . $i));
-            $qb->setParameter('circles_' . $i, $circles);
+            $centerWhere->add($qb->expr()->eq('p.center', ':center_'.$i));
+            $qb->setParameter('center_'.$i, $center);
+            $centerWhere->add($qb->expr()->in('st.circle', ':circles_'.$i));
+            $qb->setParameter('circles_'.$i, $circles);
             $where->add($centerWhere);
             ++$i;
         }
@@ -185,56 +175,55 @@ class SingleTaskRepository extends EntityRepository
         $qb->where($where);
     }
 
-    protected function buildQuery(QueryBuilder $qb, $params, ?User $currentUser = null)
+    protected function buildQuery(QueryBuilder $qb, $params, User $currentUser = null)
     {
         if (null !== $currentUser) {
             $this->buildACLQuery($qb, $currentUser);
         }
 
-        if (array_key_exists('person', $params) && !empty($params['person'])) {
+        if (\array_key_exists('person', $params) && !empty($params['person'])) {
             $qb->andWhere($qb->expr()->eq('st.person', ':person'));
             $qb->setParameter('person', $params['person']);
-        } elseif (array_key_exists('center', $params)) {
+        } elseif (\array_key_exists('center', $params)) {
             if ($params['center'] instanceof Center) {
                 $qb->join('st.person', 'person');
                 $qb->andWhere($qb->expr()->eq('person.center', ':center'));
                 $qb->setParameter('center', $params['center']);
             } else {
-                throw new UnexpectedValueException("params 'center' should be an instance of " . Center::class);
+                throw new \UnexpectedValueException("params 'center' should be an instance of ".Center::class);
             }
         }
 
-        if (array_key_exists('unassigned', $params) && true === $params['unassigned']) {
-            if (array_key_exists('user', $params) && !empty($params['user'])) {
-                throw new UnexpectedValueException('You should not require for '
-                    . 'unassigned tasks and tasks assigned to some user.');
+        if (\array_key_exists('unassigned', $params) && true === $params['unassigned']) {
+            if (\array_key_exists('user', $params) && !empty($params['user'])) {
+                throw new \UnexpectedValueException('You should not require for unassigned tasks and tasks assigned to some user.');
             }
 
             $qb->andWhere($qb->expr()->isNull('st.assignee'));
         }
 
-        if (array_key_exists('user', $params) && !empty($params['user'])) {
+        if (\array_key_exists('user', $params) && !empty($params['user'])) {
             $qb->andWhere($qb->expr()->eq('st.assignee', ':user'));
             $qb->setParameter('user', $params['user']);
         }
 
-        if (array_key_exists('scope', $params) && !empty($params['scope'])) {
+        if (\array_key_exists('scope', $params) && !empty($params['scope'])) {
             $qb->andWhere($qb->expr()->eq('st.circle', ':scope'));
             $qb->setParameter('scope', $params['scope']);
         }
 
-        if (array_key_exists('types', $params) && null !== $params['types']) {
-            if (count($params['types']) > 0) {
+        if (\array_key_exists('types', $params) && null !== $params['types']) {
+            if (\count($params['types']) > 0) {
                 $qb->andWhere($qb->expr()->in('st.type', ':types'));
                 $qb->setParameter('types', $params['types']);
             }
         }
 
-        if (array_key_exists('date_status', $params) && !empty($params['date_status'])) {
+        if (\array_key_exists('date_status', $params) && !empty($params['date_status'])) {
             $this->addTypeFilter($qb, $params);
         }
 
-        if (array_key_exists('is_closed', $params)) {
+        if (\array_key_exists('is_closed', $params)) {
             $qb->andWhere($this->buildIsClosed($qb, !$params['is_closed']));
         }
     }
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskStateRepository.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskStateRepository.php
index 0231a9a91..614870264 100644
--- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskStateRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskStateRepository.php
@@ -25,9 +25,10 @@ class SingleTaskStateRepository
     ) {}
 
     /**
-     * Return a list of all states associated to at least one single task in the database
+     * Return a list of all states associated to at least one single task in the database.
      *
      * @return list<string>
+     *
      * @throws Exception
      */
     public function findAllExistingStates(): array
diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
index de8b52c4c..3c1103ddf 100644
--- a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
+++ b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
@@ -14,7 +14,6 @@ namespace Chill\TaskBundle\Security\Authorization;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\TaskBundle\Entity\AbstractTask;
-use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 class AuthorizationEvent extends \Symfony\Contracts\EventDispatcher\Event
diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
index 4bee97c45..cc3992329 100644
--- a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
+++ b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
@@ -26,8 +26,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 
-use function in_array;
-
 final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
     public const CREATE_COURSE = 'CHILL_TASK_TASK_CREATE_FOR_COURSE';
@@ -99,7 +97,7 @@ final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchy
 
         if ($event->hasVote()) {
             $this->logger->debug('The TaskVoter is overriding by '
-                . AuthorizationEvent::VOTE, [
+                .AuthorizationEvent::VOTE, [
                     'vote' => $event->getVote(),
                     'task_id' => $subject->getId(),
                 ]);
@@ -128,7 +126,7 @@ final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchy
 
         if ($subject instanceof AccompanyingPeriod) {
             if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
-                if (in_array($attribute, [self::UPDATE, self::CREATE_COURSE, self::DELETE], true)) {
+                if (\in_array($attribute, [self::UPDATE, self::CREATE_COURSE, self::DELETE], true)) {
                     return false;
                 }
             }
diff --git a/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php b/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php
index affaab8c7..878ae43cd 100644
--- a/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php
+++ b/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php
@@ -39,7 +39,7 @@ class TaskTwigExtension extends AbstractExtension
         AbstractTask $task,
         string $key,
         $metadataSubject = null,
-        ?string $name = null
+        string $name = null
     ) {
         return $this->taskWorkflowManager->getWorkflowMetadata($task, $key, $metadataSubject, $name);
     }
diff --git a/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php b/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
index 783f41529..c442dda8f 100644
--- a/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
+++ b/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
@@ -18,8 +18,6 @@ use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Workflow\Event\Event;
 
-use function array_merge;
-
 class CountNotificationTask implements NotificationCounterInterface
 {
     final public const CACHE_KEY = 'chill_task.count_notifications.user.%d.%s';
diff --git a/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php b/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
index 80f213a92..1453df4d0 100644
--- a/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
+++ b/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
@@ -15,11 +15,10 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Tests\TestHelper;
 use Faker;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use function array_filter;
-use function array_rand;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SingleTaskControllerTest extends WebTestCase
@@ -58,7 +57,7 @@ final class SingleTaskControllerTest extends WebTestCase
 
         $client->submit($form, [
             'title' => $title,
-            'circle' => $circles[array_rand($circles)],
+            'circle' => $circles[\array_rand($circles)],
         ]);
 
         $this->assertTrue($client->getResponse()->isRedirect(sprintf(
@@ -88,7 +87,7 @@ final class SingleTaskControllerTest extends WebTestCase
             ->getRepository(Center::class)
             ->findAll();
 
-        $center = array_filter(
+        $center = \array_filter(
             $centers,
             static fn (Center $c) => $c->getName() === $centerName
         )[0];
@@ -96,12 +95,12 @@ final class SingleTaskControllerTest extends WebTestCase
         $ids = $em
             ->createQuery(
                 'SELECT p.id FROM ChillPersonBundle:Person p '
-                . 'WHERE p.center = :center'
+                .'WHERE p.center = :center'
             )
             ->setParameter('center', $center)
             ->getResult();
 
-        $id = $ids[array_rand($ids)];
+        $id = $ids[\array_rand($ids)];
 
         return self::$kernel
             ->getContainer()
diff --git a/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php b/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php
index a309f9c49..e8758290a 100644
--- a/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php
+++ b/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class TaskControllerTest extends WebTestCase {}
diff --git a/src/Bundle/ChillTaskBundle/Tests/Repository/SingleTaskACLAwareRepositoryTest.php b/src/Bundle/ChillTaskBundle/Tests/Repository/SingleTaskACLAwareRepositoryTest.php
index 4d5520ca5..206b71a1b 100644
--- a/src/Bundle/ChillTaskBundle/Tests/Repository/SingleTaskACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillTaskBundle/Tests/Repository/SingleTaskACLAwareRepositoryTest.php
@@ -28,10 +28,10 @@ use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Security\Core\Security;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SingleTaskACLAwareRepositoryTest extends KernelTestCase
@@ -152,7 +152,7 @@ final class SingleTaskACLAwareRepositoryTest extends KernelTestCase
 
         $tasks = $repository->findByAllViewable(null, []);
 
-        $this->assertGreaterThanOrEqual(0, count($tasks));
+        $this->assertGreaterThanOrEqual(0, \count($tasks));
     }
 
     public function testFindByCourse(): void
@@ -162,7 +162,7 @@ final class SingleTaskACLAwareRepositoryTest extends KernelTestCase
         $scopes = $this->scopeRepository->findAll();
         /** @var Person $person */
         $person = $this->em->createQuery(
-            'SELECT p FROM ' . Person::class . ' p JOIN p.centerCurrent cc
+            'SELECT p FROM '.Person::class.' p JOIN p.centerCurrent cc
             WHERE SIZE(p.accompanyingPeriodParticipations) > 0
             AND cc.center = :center'
         )
@@ -191,7 +191,7 @@ final class SingleTaskACLAwareRepositoryTest extends KernelTestCase
 
         $tasks = $repository->findByCourse($period);
 
-        $this->assertGreaterThanOrEqual(0, count($tasks));
+        $this->assertGreaterThanOrEqual(0, \count($tasks));
     }
 
     public function testFindByPerson(): void
@@ -221,6 +221,6 @@ final class SingleTaskACLAwareRepositoryTest extends KernelTestCase
 
         $tasks = $repository->findByPerson($person, null, []);
 
-        $this->assertGreaterThanOrEqual(0, count($tasks));
+        $this->assertGreaterThanOrEqual(0, \count($tasks));
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
index 70633e071..fbd02f289 100644
--- a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
+++ b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
@@ -16,13 +16,9 @@ use Chill\MainBundle\Timeline\TimelineSingleQuery;
 use Chill\TaskBundle\Entity\SingleTask;
 use Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent;
 use Doctrine\ORM\EntityManagerInterface;
-use LogicException;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Workflow;
 
-use function array_combine;
-use function array_map;
-
 /**
  * Provide timeline elements related to tasks, in tasks context.
  */
@@ -49,8 +45,7 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn
     public function fetchQuery($context, $args)
     {
         if ('task' !== $context) {
-            throw new LogicException(sprintf('%s is not able '
-                    . 'to render context %s', self::class, $context));
+            throw new \LogicException(sprintf('%s is not able to render context %s', self::class, $context));
         }
 
         $metadata = $this->em
@@ -85,8 +80,8 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn
             ->getRepository(SingleTaskPlaceEvent::class)
             ->findBy(['id' => $ids]);
 
-        return array_combine(
-            array_map(static fn ($e) => $e->getId(), $events),
+        return \array_combine(
+            \array_map(static fn ($e) => $e->getId(), $events),
             $events
         );
     }
diff --git a/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php b/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
index 4511af7c5..98b38a989 100644
--- a/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+++ b/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
@@ -19,19 +19,9 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\TaskBundle\Entity\SingleTask;
 use Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Workflow;
-use UnexpectedValueException;
-
-use function array_combine;
-use function array_fill;
-use function array_map;
-use function count;
-use function implode;
-use function in_array;
-use function strtr;
 
 /**
  * Provide element for timeline for 'person' and 'center' context.
@@ -47,10 +37,10 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
         $metadata = $this->em
             ->getClassMetadata(SingleTaskPlaceEvent::class);
 
-        [ $where, $parameters ] = match ($context) {
+        [$where, $parameters] = match ($context) {
             'person' => $this->getWhereClauseForPerson($args['person']),
             'center' => $this->getWhereClauseForCenter($args['centers']),
-            default => throw new UnexpectedValueException("context {$context} is not supported"),
+            default => throw new \UnexpectedValueException("context {$context} is not supported"),
         };
 
         return TimelineSingleQuery::fromArray([
@@ -69,8 +59,8 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
             ->getRepository(SingleTaskPlaceEvent::class)
             ->findBy(['id' => $ids]);
 
-        return array_combine(
-            array_map(static fn ($e) => $e->getId(), $events),
+        return \array_combine(
+            \array_map(static fn ($e) => $e->getId(), $events),
             $events
         );
     }
@@ -127,11 +117,11 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
         $taskFkPerson = $singleTask->getAssociationMapping('person')['joinColumns'][0]['name'];
         $personPk = $singleTask->getAssociationMapping('person')['joinColumns'][0]['referencedColumnName'];
 
-        $from = '{single_task_event} ' .
-            'JOIN {single_task} ON {single_task}.{task_pk} = {single_task_event}.{event_fk_task} ' .
+        $from = '{single_task_event} '.
+            'JOIN {single_task} ON {single_task}.{task_pk} = {single_task_event}.{event_fk_task} '.
             'JOIN {person} ON {single_task}.{task_person_fk} = {person}.{person_pk}';
 
-        return strtr(
+        return \strtr(
             $from,
             [
                 '{single_task}' => sprintf('%s.%s', $singleTask->getSchemaName(), $singleTask->getTableName()),
@@ -169,7 +159,7 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
                 ActivityVoter::SEE_DETAILS
             ) as $center
         ) {
-            if (false === in_array($center, $centers, true)) {
+            if (false === \in_array($center, $centers, true)) {
                 continue;
             }
 
@@ -188,24 +178,24 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
                 $parameters[] = $circleIds[] = $circle->getId();
             }
 
-            $clauses[] = strtr(
+            $clauses[] = \strtr(
                 $clause,
                 [
                     '{person}' => $person->getTableName(),
                     '{center_id}' => $personFkCenter,
-                    '{task}' => $singleTask->getSchemaName() . '.' . $singleTask->getTableName(),
+                    '{task}' => $singleTask->getSchemaName().'.'.$singleTask->getTableName(),
                     '{circle}' => $taskFkCircle,
-                    '{circle_ids}' => implode(', ', array_fill(0, count($circleIds), '?')),
+                    '{circle_ids}' => \implode(', ', \array_fill(0, \count($circleIds), '?')),
                 ]
             );
         }
 
-        if (0 === count($clauses)) {
+        if (0 === \count($clauses)) {
             return ['FALSE = TRUE', []];
         }
 
         return [
-            implode(' OR ', $clauses),
+            \implode(' OR ', $clauses),
             $parameters,
         ];
     }
@@ -236,7 +226,7 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
             $personArg->getCenter()
         );
 
-        if (0 === count($circles)) {
+        if (0 === \count($circles)) {
             // go fast to block access to every tasks
             return ['FALSE = TRUE', []];
         }
@@ -246,14 +236,14 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
         }
 
         return [
-            strtr(
+            \strtr(
                 $clause,
                 [
                     '{person}' => $person->getTableName(),
                     '{person_id}' => $person->getColumnName('id'),
-                    '{task}' => $singleTask->getSchemaName() . '.' . $singleTask->getTableName(),
+                    '{task}' => $singleTask->getSchemaName().'.'.$singleTask->getTableName(),
                     '{circle}' => $taskFkCircle,
-                    '{circle_ids}' => implode(', ', array_fill(0, count($circleIds), '?')),
+                    '{circle_ids}' => \implode(', ', \array_fill(0, \count($circleIds), '?')),
                 ]
             ),
             $parameters,
diff --git a/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php b/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
index 02d3facda..0f38252d8 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
@@ -13,14 +13,8 @@ namespace Chill\TaskBundle\Workflow\Definition;
 
 use Chill\TaskBundle\Entity\AbstractTask;
 use Chill\TaskBundle\Entity\SingleTask;
-use LogicException;
 use Symfony\Component\Workflow\Transition;
 
-use function array_key_exists;
-use function array_slice;
-use function explode;
-use function implode;
-
 class DefaultTaskDefinition implements \Chill\TaskBundle\Workflow\TaskWorkflowDefinition
 {
     final public const DEFINITION_METADATA = [
@@ -61,15 +55,15 @@ class DefaultTaskDefinition implements \Chill\TaskBundle\Workflow\TaskWorkflowDe
         string $key,
         $metadataSubject = null
     ) {
-        $keys = explode('.', $key);
+        $keys = \explode('.', $key);
 
         switch ($keys[0]) {
             case 'transition':
                 if (!$metadataSubject instanceof Transition) {
-                    throw new LogicException('You must give a transition as metadatasubject');
+                    throw new \LogicException('You must give a transition as metadatasubject');
                 }
 
-                return $this->getTransitionMetadata(implode('.', array_slice($keys, 1)), $metadataSubject);
+                return $this->getTransitionMetadata(\implode('.', \array_slice($keys, 1)), $metadataSubject);
 
             case 'definition':
                 return self::DEFINITION_METADATA[$keys[1]] ?? $key;
@@ -81,23 +75,23 @@ class DefaultTaskDefinition implements \Chill\TaskBundle\Workflow\TaskWorkflowDe
 
     public function isClosed(AbstractTask $task)
     {
-        return array_key_exists('closed', $task->getCurrentStates())
-            || array_key_exists('canceled', $task->getCurrentStates());
+        return \array_key_exists('closed', $task->getCurrentStates())
+            || \array_key_exists('canceled', $task->getCurrentStates());
     }
 
     public function supports(AbstractTask $task)
     {
         return $task instanceof SingleTask
-            && $task->getType() === 'task_default';
+            && 'task_default' === $task->getType();
     }
 
     protected function getTransitionMetadata($key, Transition $transition)
     {
-        if (!array_key_exists($transition->getName(), self::TRANSITION_METADATA)) {
+        if (!\array_key_exists($transition->getName(), self::TRANSITION_METADATA)) {
             return $key;
         }
 
-        if (!array_key_exists($key, self::TRANSITION_METADATA[$transition->getName()])) {
+        if (!\array_key_exists($key, self::TRANSITION_METADATA[$transition->getName()])) {
             return $key;
         }
 
diff --git a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
index 404a19f2b..949786dd5 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
@@ -12,14 +12,10 @@ declare(strict_types=1);
 namespace Chill\TaskBundle\Workflow;
 
 use Chill\TaskBundle\Entity\AbstractTask;
-use LogicException;
 use Symfony\Component\Workflow\Event\Event;
 use Symfony\Component\Workflow\SupportStrategy\WorkflowSupportStrategyInterface;
 use Symfony\Component\Workflow\WorkflowInterface;
 
-use function count;
-use function sprintf;
-
 class TaskWorkflowManager implements WorkflowSupportStrategyInterface
 {
     /**
@@ -33,9 +29,9 @@ class TaskWorkflowManager implements WorkflowSupportStrategyInterface
     }
 
     /**
-     * @throws LogicException
-     *
      * @return TaskWorkflowDefinition
+     *
+     * @throws \LogicException
      */
     public function getTaskWorkflowDefinition(AbstractTask $task)
     {
@@ -47,21 +43,20 @@ class TaskWorkflowManager implements WorkflowSupportStrategyInterface
             }
         }
 
-        $count = count($definitions);
+        $count = \count($definitions);
 
         if (1 < $count) {
-            throw new LogicException('More than one TaskWorkflowDefinition supports '
-                . 'this task. This should not happens.');
+            throw new \LogicException('More than one TaskWorkflowDefinition supports this task. This should not happens.');
         }
 
         if (0 === $count) {
-            throw new LogicException(sprintf('No taskWorkflowDefinition supports this task type: %s (task id: %s).', $task->getType(), $task->getId()));
+            throw new \LogicException(\sprintf('No taskWorkflowDefinition supports this task type: %s (task id: %s).', $task->getType(), $task->getId()));
         }
 
         return $definitions[0];
     }
 
-    public function getWorkflowMetadata(AbstractTask $task, string $key, $metadataSubject = null, ?string $name = null)
+    public function getWorkflowMetadata(AbstractTask $task, string $key, $metadataSubject = null, string $name = null)
     {
         return $this->getTaskWorkflowDefinition($task)
             ->getWorkflowMetadata($task, $key, $metadataSubject);
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php b/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php
index e3da643cc..1aea04a96 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php
@@ -21,14 +21,14 @@ class Version20180413135614 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP SCHEMA chill_task CASCADE');
     }
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SCHEMA chill_task');
         $this->addSql('CREATE SEQUENCE chill_task.single_task_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php b/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php
index c506290cf..80a17dc53 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php
@@ -21,7 +21,7 @@ class Version20180413201023 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_task.single_task DROP CONSTRAINT FK_194CB3D840868C31');
         $this->addSql('DROP SEQUENCE chill_task.recurring_task_id_seq CASCADE');
@@ -32,7 +32,7 @@ class Version20180413201023 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE chill_task.recurring_task_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_task.recurring_task (id INT NOT NULL, assignee_id INT DEFAULT NULL, person_id INT DEFAULT NULL, circle_id INT DEFAULT NULL, type VARCHAR(255) NOT NULL, current_states JSONB NOT NULL, title TEXT NOT NULL, description TEXT NOT NULL, first_occurence_end_date DATE NOT NULL, last_occurence_end_date DATE NOT NULL, occurence_frequency VARCHAR(255) NOT NULL, occurence_start_date INTERVAL NOT NULL, occurence_warning_interval INTERVAL DEFAULT NULL, PRIMARY KEY(id))');
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php b/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php
index 3933c716b..82d494f01 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php
@@ -21,7 +21,7 @@ class Version20180426093011 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_task.recurring_task DROP closed');
         $this->addSql('ALTER TABLE chill_task.single_task DROP closed');
@@ -29,7 +29,7 @@ class Version20180426093011 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_task.single_task ADD closed BOOLEAN DEFAULT \'false\' NOT NULL');
         $this->addSql('ALTER TABLE chill_task.recurring_task ADD closed BOOLEAN DEFAULT \'false\' NOT NULL');
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php b/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php
index 77e1aebc8..17cc2f54d 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php
@@ -21,7 +21,7 @@ class Version20180502194119 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP SEQUENCE chill_task.single_task_place_event_id_seq CASCADE');
         $this->addSql('DROP TABLE chill_task.single_task_place_event');
@@ -29,7 +29,7 @@ class Version20180502194119 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE chill_task.single_task_place_event_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_task.single_task_place_event (id INT NOT NULL, author_id INT DEFAULT NULL, task_id INT DEFAULT NULL, datetime TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, transition VARCHAR(255) NOT NULL, data JSONB NOT NULL, PRIMARY KEY(id))');
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php b/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php
index bd3157368..5bf8f6c51 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php
@@ -21,7 +21,7 @@ final class Version20181113161925 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP INDEX transition_task_date');
         $this->addSql('DROP INDEX transition_task');
@@ -29,7 +29,7 @@ final class Version20181113161925 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE INDEX transition_task_date ON chill_task.single_task_place_event (task_id, transition, datetime)');
         $this->addSql('CREATE INDEX transition_task ON chill_task.single_task_place_event (task_id, transition)');
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php b/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php
index ba24d9f16..926b83778 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php
@@ -21,7 +21,7 @@ final class Version20181113164108 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP INDEX by_type');
         $this->addSql('DROP INDEX by_current_state');
@@ -29,7 +29,7 @@ final class Version20181113164108 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE INDEX by_type ON chill_task.single_task (type)');
         $this->addSql('CREATE INDEX by_current_state ON chill_task.single_task USING GIN (current_states)');
diff --git a/src/Bundle/ChillTaskBundle/translations/messages.intl-icu.fr.yml b/src/Bundle/ChillTaskBundle/translations/messages+intl-icu.fr.yml
similarity index 100%
rename from src/Bundle/ChillTaskBundle/translations/messages.intl-icu.fr.yml
rename to src/Bundle/ChillTaskBundle/translations/messages+intl-icu.fr.yml
diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
index 821f6c7ef..214d9ba36 100644
--- a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
@@ -19,7 +19,6 @@ use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyACLAwareRepositoryInterface;
 use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
-use LogicException;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -28,8 +27,6 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_merge;
-
 final class ThirdPartyController extends CRUDController
 {
     private readonly bool $askCenter;
@@ -57,15 +54,15 @@ final class ThirdPartyController extends CRUDController
         return $this->getFilterOrderHelperFactory()
             ->create(self::class)
             ->addSearchBox(['name', 'company_name', 'acronym'])
-            //->addToggle('only-active', [])
+            // ->addToggle('only-active', [])
             //    ->addOrderBy()
             ->build();
     }
 
-    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    protected function countEntities(string $action, Request $request, FilterOrderHelper $filterOrder = null): int
     {
         if (null === $filterOrder) {
-            throw new LogicException('filterOrder should not be null');
+            throw new \LogicException('filterOrder should not be null');
         }
 
         return $this->thirdPartyACLAwareRepository->countThirdParties(
@@ -74,17 +71,17 @@ final class ThirdPartyController extends CRUDController
         );
     }
 
-    protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
+    protected function createFormFor(string $action, $entity, string $formClass = null, array $formOptions = []): FormInterface
     {
         if ('new' === $action) {
-            return parent::createFormFor($action, $entity, $formClass, array_merge(
+            return parent::createFormFor($action, $entity, $formClass, \array_merge(
                 $formOptions,
                 ['kind' => $this->requestStack->getCurrentRequest()->query->getAlpha('kind')]
             ));
         }
 
         if ('edit' === $action) {
-            return parent::createFormFor($action, $entity, $formClass, array_merge(
+            return parent::createFormFor($action, $entity, $formClass, \array_merge(
                 $formOptions,
                 ['kind' => $entity->getKind()]
             ));
@@ -93,7 +90,7 @@ final class ThirdPartyController extends CRUDController
         return parent::createFormFor($action, $entity, $formClass, $formOptions);
     }
 
-    protected function getQueryResult(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, ?FilterOrderHelper $filterOrder = null)
+    protected function getQueryResult(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, FilterOrderHelper $filterOrder = null)
     {
         return $this->thirdPartyACLAwareRepository
             ->listThirdParties(
@@ -120,7 +117,7 @@ final class ThirdPartyController extends CRUDController
             $kind = $request->query->getAlpha('kind', '');
 
             if (!(ThirdParty::KIND_COMPANY === $kind || ThirdParty::KIND_CONTACT === $kind)) {
-                throw new BadRequestHttpException('This kind is not supported: ' . $kind);
+                throw new BadRequestHttpException('This kind is not supported: '.$kind);
             }
 
             $entity->setKind($kind);
@@ -130,7 +127,6 @@ final class ThirdPartyController extends CRUDController
     }
 
     /**
-     * @param $action
      * @param ThirdParty $entity
      */
     protected function onPostFetchEntity($action, Request $request, $entity): ?Response
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
index 119446f13..7261deba4 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
@@ -16,18 +16,13 @@ use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTimeImmutable;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Iterator;
 use libphonenumber\PhoneNumberUtil;
 use Nelmio\Alice\Loader\NativeLoader;
 use Nelmio\Alice\ObjectSet;
 
-use function array_map;
-use function count;
-
 class LoadThirdParty extends Fixture implements DependentFixtureInterface
 {
     private readonly PhoneNumberUtil $phoneNumberUtil;
@@ -54,7 +49,7 @@ class LoadThirdParty extends Fixture implements DependentFixtureInterface
                 // this is an address
                 continue;
             }
-            $thirdParty->setCreatedAt(new DateTimeImmutable('today'));
+            $thirdParty->setCreatedAt(new \DateTimeImmutable('today'));
 
             foreach ($this->getCenters() as $center) {
                 $thirdParty->addCenter($center);
@@ -66,13 +61,13 @@ class LoadThirdParty extends Fixture implements DependentFixtureInterface
         $manager->flush();
     }
 
-    private function getCenters(): Iterator
+    private function getCenters(): \Iterator
     {
-        $references = array_map(
+        $references = \array_map(
             static fn ($a) => $a['ref'],
             LoadCenters::$centers
         );
-        $number = random_int(1, count($references));
+        $number = random_int(1, \count($references));
 
         if (1 === $number) {
             yield $this->getReference($references[array_rand($references)]);
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php
index 22b1ee58d..061c85a4a 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php
@@ -41,7 +41,7 @@ class LoadThirdPartyCategory extends Fixture implements FixtureGroupInterface
         ];
 
         foreach ($categories as $val) {
-            echo 'Creating thirdparty category : ' . $val['name']['fr'] . "\n";
+            echo 'Creating thirdparty category : '.$val['name']['fr']."\n";
             $category = (new ThirdPartyCategory())
                 ->setName($val['name'])
                 ->setActive(true);
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php
index e29f17c51..265a773cb 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php
@@ -39,7 +39,7 @@ class LoadThirdPartyProfession extends Fixture implements FixtureGroupInterface
         ];
 
         foreach ($professions as $val) {
-            echo 'Creating thirdparty professions : ' . $val['name']['fr'] . "\n";
+            echo 'Creating thirdparty professions : '.$val['name']['fr']."\n";
             $profession = (new ThirdPartyProfession())
                 ->setName($val['name'])
                 ->setActive(true);
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
index 3c870449c..91625c827 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
@@ -37,7 +37,7 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/controller.yaml');
         $loader->load('services/form.yaml');
@@ -70,7 +70,7 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
 
     protected function preprendRoutes(ContainerBuilder $container)
     {
-        //declare routes for 3party bundle
+        // declare routes for 3party bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
@@ -130,8 +130,8 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
                     'class' => \Chill\ThirdPartyBundle\Entity\ThirdParty::class,
                     'name' => 'thirdparty',
                     'base_path' => '/api/1.0/thirdparty/thirdparty',
-                    //'base_role' => \Chill\ThirdPartyBundle\Security\Authorization\ThirdPartyVoter::SHOW,
-                    //'controller' => \Chill\ThirdPartyBundle\Controller\ThirdPartyApiController::class,
+                    // 'base_role' => \Chill\ThirdPartyBundle\Security\Authorization\ThirdPartyVoter::SHOW,
+                    // 'controller' => \Chill\ThirdPartyBundle\Controller\ThirdPartyApiController::class,
                     'actions' => [
                         '_entity' => [
                             'methods' => [
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
index 11095df7f..8586451b2 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
@@ -12,13 +12,10 @@ declare(strict_types=1);
 namespace Chill\ThirdPartyBundle\DependencyInjection\CompilerPass;
 
 use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager;
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-use function in_array;
-
 /**
  * Load services tagged chill_3party.provider and add them to the service
  * definition of manager.
@@ -37,11 +34,8 @@ class ThirdPartyTypeCompilerPass implements CompilerPassInterface
             // check forr keys already in use :
             $key = $taggedService->getClass()::getKey();
 
-            if (in_array($key, $usedKeys, true)) {
-                throw new LogicException(sprintf(
-                    'Tag with key "%s" is already in used',
-                    $key
-                ));
+            if (\in_array($key, $usedKeys, true)) {
+                throw new \LogicException(sprintf('Tag with key "%s" is already in used', $key));
             }
             $usedKeys[] = $key;
             // alter the service definition of manager
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 16ef60530..f777e2323 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -19,8 +19,6 @@ use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ReadableCollection;
@@ -30,15 +28,6 @@ use Symfony\Component\Serializer\Annotation\Context;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
-use UnexpectedValueException;
-
-use function array_filter;
-use function array_map;
-use function array_merge;
-use function array_values;
-use function in_array;
-use function is_string;
-use function spl_object_hash;
 
 /**
  * ThirdParty is a party recorded in the database.
@@ -76,6 +65,7 @@ use function spl_object_hash;
  * database by a Php array, mapped by a jsonb into the database. This has one advantage: it is easily searchable.
  *
  * As the list of type is hardcoded into database, it is more easily searchable. (for chill 2.0, the
+ *
  * @see{Chill\ThirdPartyBundle\Form\Type\PickThirdPartyDynamicType} does not support it yet, but
  * the legacy @see{Chill\ThirdPartyBundle\Form\Type\PickThirdPartyType} does.
  *
@@ -83,7 +73,9 @@ use function spl_object_hash;
  * noticing a difference.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_3party.third_party")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "thirdparty": ThirdParty::class
  * })
@@ -99,9 +91,10 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     /**
      * [fr] Sigle.
      *
-     * @var string
      * @ORM\Column(name="acronym", type="string", length=64, nullable=true)
+     *
      * @Assert\Length(min="2")
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      */
     private ?string $acronym = '';
@@ -116,8 +109,11 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     /**
      * @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address",
      * cascade={"persist", "remove"})
+     *
      * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
+     *
      * @Context(normalizationContext={"groups": "docgen:read"}, groups={"docgen:read:3party:parent"})
      */
     private ?Address $address = null;
@@ -133,18 +129,24 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
 
     /**
      * @var Collection<ThirdPartyCategory>
+     *
      * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdPartyCategory")
+     *
      * @ORM\JoinTable(name="chill_3party.thirdparty_category",
      *     joinColumns={@ORM\JoinColumn(name="thirdparty_id", referencedColumnName="id")},
      * inverseJoinColumns={@ORM\JoinColumn(name="category_id", referencedColumnName="id")})
+     *
      * @Groups({"docgen:read", "docgen:read:3party:parent"})
+     *
      * @Context(normalizationContext={"groups": "docgen:read"}, groups={"docgen:read:3party:parent"})
      */
     private Collection $categories;
 
     /**
      * @var Collection<Center>
+     *
      * @ORM\ManyToMany(targetEntity="\Chill\MainBundle\Entity\Center")
+     *
      * @ORM\JoinTable(name="chill_3party.party_center")
      */
     private Collection $centers;
@@ -156,27 +158,31 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
      * cascade={"persist"}, orphanRemoval=true)
      *
      * @var Collection<ThirdParty>
+     *
      * @Assert\Valid(traverse=true)
      */
     private Collection $children;
 
     /**
-     * @var Civility
      * @ORM\ManyToOne(targetEntity=Civility::class)
      * ORM\JoinColumn(name="civility", referencedColumnName="id", nullable=true)
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
+     *
      * @Context(normalizationContext={"groups": "docgen:read"}, groups={"docgen:read:3party:parent"})
      */
     private ?Civility $civility = null;
 
     /**
      * @ORM\Column(name="comment", type="text", nullable=true)
+     *
      * @Groups({"read", "write"})
      */
     private ?string $comment = null;
 
     /**
      * @ORM\Column(name="contact_data_anonymous", type="boolean", options={"default": false})
+     *
      * @Groups({"read", "docgen:read", "docgen:read:3party:parent"})
      */
     private bool $contactDataAnonymous = false;
@@ -184,48 +190,58 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     /**
      * @ORM\Column(name="created_at", type="datetime_immutable", nullable=false)
      */
-    private DateTimeImmutable $createdAt;
+    private \DateTimeImmutable $createdAt;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @ORM\JoinColumn(name="created_by", referencedColumnName="id")
      */
     private ?User $createdBy = null;
 
     /**
      * @ORM\Column(name="email", type="string", length=255, nullable=true)
+     *
      * @Assert\Email()
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      */
     private ?string $email = null;
 
     /**
      * @ORM\Column(name="firstname", type="text", options={"default": ""})
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      */
     private string $firstname = '';
 
     /**
-     * @var int
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\Id
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Groups({"read", "docgen:read", "docgen:read:3party:parent"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(name="kind", type="string", length="20", options={"default": ""})
+     *
      * @Groups({"write", "docgen:read", "docgen:read:3party:parent"})
      */
     private ?string $kind = '';
 
     /**
-     * @var string
      * @ORM\Column(name="name", type="string", length=255)
+     *
      * @Assert\Length(min="2")
+     *
      * @Assert\NotNull
+     *
      * @Assert\NotBlank
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      */
     private ?string $name = '';
@@ -233,9 +249,10 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     /**
      * [fr] Raison sociale.
      *
-     * @var string
      * @ORM\Column(name="name_company", type="string", length=255, nullable=true)
+     *
      * @Assert\Length(min="3")
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      */
     private ?string $nameCompany = '';
@@ -244,23 +261,31 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
      * Institutional ThirdParty: Many Contact Persons have One Institutional ThirdParty.
      *
      * @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty", inversedBy="children")
+     *
      * @ORM\JoinColumn(name="parent_id", referencedColumnName="id")
+     *
      * @Groups({"read", "write", "docgen:read"})
+     *
      * @Context(normalizationContext={"groups": "docgen:read:3party:parent"}, groups={"docgen:read"})
      */
     private ?ThirdParty $parent = null;
 
     /**
      * [fr] Qualité.
+     *
      * @ORM\Column(name="profession", type="text", nullable=false)
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
+     *
      * @Context(normalizationContext={"groups": "docgen:read"}, groups={"docgen:read:3party:parent"})
      */
     private string $profession = '';
 
     /**
      * @ORM\Column(name="telephone", type="phone_number", nullable=true)
+     *
      * @PhonenumberConstraint(type="any")
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      */
     private ?PhoneNumber $telephone = null;
@@ -273,10 +298,11 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     /**
      * @ORM\Column(name="updated_at", type="datetime_immutable", nullable=true)
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @ORM\JoinColumn(name="updated_by", referencedColumnName="id")
      */
     private ?User $updatedBy = null;
@@ -291,9 +317,6 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
         $this->children = new ArrayCollection();
     }
 
-    /**
-     * @return string
-     */
     public function __toString(): string
     {
         return $this->getName();
@@ -355,7 +378,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
             return $this;
         }
 
-        if (!in_array($type, $this->thirdPartyTypes ?? [], true)) {
+        if (!\in_array($type, $this->thirdPartyTypes ?? [], true)) {
             $this->thirdPartyTypes[] = $type;
         }
 
@@ -374,21 +397,15 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
             return $this;
         }
 
-        if (is_string($typeAndCategory)) {
+        if (\is_string($typeAndCategory)) {
             $this->addThirdPartyTypes($typeAndCategory);
 
             return $this;
         }
 
-        throw new UnexpectedValueException(sprintf(
-            'typeAndCategory should be a string or a %s',
-            ThirdPartyCategory::class
-        ));
+        throw new \UnexpectedValueException(sprintf('typeAndCategory should be a string or a %s', ThirdPartyCategory::class));
     }
 
-    /**
-     * @return string
-     */
     public function getAcronym(): ?string
     {
         return $this->acronym;
@@ -444,7 +461,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
         return $this->comment;
     }
 
-    public function getCreatedAt(): DateTimeImmutable
+    public function getCreatedAt(): \DateTimeImmutable
     {
         return $this->createdAt;
     }
@@ -510,16 +527,16 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
 
     public function getTypesAndCategories(): array
     {
-        return array_merge(
+        return \array_merge(
             $this->getCategories()->toArray(),
             $this->getThirdPartyTypes() ?? []
         );
     }
 
     /**
-     * @return DateTime|null
+     * @return \DateTime|null
      */
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -547,7 +564,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
      */
     public function isLeaf(): bool
     {
-        return $this->children->count() !== 0;
+        return 0 !== $this->children->count();
     }
 
     public function isParent(): bool
@@ -610,8 +627,8 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
             return $this;
         }
 
-        if (in_array($type, $this->thirdPartyTypes ?? [], true)) {
-            $this->thirdPartyTypes = array_filter($this->thirdPartyTypes, fn ($e) => !in_array($e, $this->thirdPartyTypes, true));
+        if (\in_array($type, $this->thirdPartyTypes ?? [], true)) {
+            $this->thirdPartyTypes = \array_filter($this->thirdPartyTypes, fn ($e) => !\in_array($e, $this->thirdPartyTypes, true));
         }
 
         foreach ($this->children as $child) {
@@ -629,22 +646,16 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
             return $this;
         }
 
-        if (is_string($typeAndCategory)) {
+        if (\is_string($typeAndCategory)) {
             $this->removeThirdPartyTypes($typeAndCategory);
 
             return $this;
         }
 
-        throw new UnexpectedValueException(sprintf(
-            'typeAndCategory should be a string or a %s',
-            ThirdPartyCategory::class
-        ));
+        throw new \UnexpectedValueException(sprintf('typeAndCategory should be a string or a %s', ThirdPartyCategory::class));
     }
 
-    /**
-     * @param string $acronym
-     */
-    public function setAcronym(?string $acronym = null): ThirdParty
+    public function setAcronym(string $acronym = null): ThirdParty
     {
         $this->acronym = (string) $acronym;
 
@@ -668,7 +679,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     /**
      * @return $this
      */
-    public function setAddress(?Address $address = null)
+    public function setAddress(Address $address = null)
     {
         $this->address = $address;
 
@@ -703,10 +714,9 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     /**
      * Set comment.
      *
-     *
      * @return ThirdParty
      */
-    public function setComment(?string $comment = null)
+    public function setComment(string $comment = null)
     {
         $this->comment = $comment;
 
@@ -721,11 +731,11 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     }
 
     /**
-     * @param DateTimeImmutable $createdAt
+     * @param \DateTimeImmutable $createdAt
      *
      * @return $this
      */
-    public function setCreatedAt(DateTimeInterface $createdAt): ThirdParty
+    public function setCreatedAt(\DateTimeInterface $createdAt): ThirdParty
     {
         $this->createdAt = $createdAt;
 
@@ -742,10 +752,9 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     /**
      * Set email.
      *
-     *
      * @return ThirdParty
      */
-    public function setEmail(?string $email = null)
+    public function setEmail(string $email = null)
     {
         $this->email = trim((string) $email);
 
@@ -773,9 +782,6 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
         return $this;
     }
 
-    /**
-     * @param string $nameCompany
-     */
     public function setNameCompany(?string $nameCompany): ThirdParty
     {
         $this->nameCompany = (string) $nameCompany;
@@ -800,7 +806,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     /**
      * Set telephone.
      */
-    public function setTelephone(?PhoneNumber $telephone = null): self
+    public function setTelephone(PhoneNumber $telephone = null): self
     {
         $this->telephone = $telephone;
 
@@ -815,7 +821,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     public function setThirdPartyTypes(?array $type = [])
     {
         // remove all keys from the input data
-        $this->thirdPartyTypes = array_values($type);
+        $this->thirdPartyTypes = \array_values($type);
 
         foreach ($this->children as $child) {
             $child->setThirdPartyTypes($type);
@@ -826,7 +832,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
 
     public function setTypesAndCategories(array $typesAndCategories): self
     {
-        $types = array_filter($typesAndCategories, static fn ($item) => !$item instanceof ThirdPartyCategory);
+        $types = \array_filter($typesAndCategories, static fn ($item) => !$item instanceof ThirdPartyCategory);
         $this->setThirdPartyTypes($types);
 
         // handle categories
@@ -834,15 +840,15 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
             $this->addTypesAndCategories($t);
         }
 
-        $categories = array_filter($typesAndCategories, static fn ($item) => $item instanceof ThirdPartyCategory);
-        $categoriesHashes = array_map(static fn (ThirdPartyCategory $c) => spl_object_hash($c), $categories);
+        $categories = \array_filter($typesAndCategories, static fn ($item) => $item instanceof ThirdPartyCategory);
+        $categoriesHashes = \array_map(static fn (ThirdPartyCategory $c) => \spl_object_hash($c), $categories);
 
         foreach ($categories as $c) {
             $this->addCategory($c);
         }
 
         foreach ($this->getCategories() as $t) {
-            if (!in_array(spl_object_hash($t), $categoriesHashes, true)) {
+            if (!\in_array(\spl_object_hash($t), $categoriesHashes, true)) {
                 $this->removeCategory($t);
             }
         }
@@ -851,11 +857,11 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     }
 
     /**
-     * @param DateTimeImmutable $updatedAt
+     * @param \DateTimeImmutable $updatedAt
      *
      * @return $this
      */
-    public function setUpdatedAt(DateTimeInterface $updatedAt): ThirdParty
+    public function setUpdatedAt(\DateTimeInterface $updatedAt): ThirdParty
     {
         $this->updatedAt = $updatedAt;
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
index d9c23611e..7bd8f9f7b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
@@ -17,6 +17,7 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Table(name="chill_3party.party_category")
+ *
  * @ORM\Entity(repositoryClass=ThirdPartyCategoryRepository::class)
  */
 class ThirdPartyCategory
@@ -28,14 +29,18 @@ class ThirdPartyCategory
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private array $name = [];
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
index 19fefd765..8994543c2 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
@@ -17,7 +17,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Table(name="chill_3party.party_profession")
+ *
  * @ORM\Entity(repositoryClass=ThirdPartyProfessionRepository::class)
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  * "third_party_profession": ThirdPartyProfession::class})
  */
@@ -25,20 +27,25 @@ class ThirdPartyProfession
 {
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Serializer\Groups({"read"})
      */
     private bool $active = true;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"docgen:read", "read", "write"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"docgen:read", "read"})
      */
     private array $name = [];
diff --git a/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php b/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
index 7c620f786..d49c343a8 100644
--- a/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
+++ b/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
@@ -13,14 +13,12 @@ namespace Chill\ThirdPartyBundle\EventListener;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 
-use const MB_CASE_TITLE;
-
 class ThirdPartyEventListener
 {
     public function prePersistThirdParty(ThirdParty $thirdparty): void
     {
-        if ($thirdparty->getKind() !== 'company') {
-            $firstnameCaps = mb_convert_case(mb_strtolower($thirdparty->getFirstname()), MB_CASE_TITLE, 'UTF-8');
+        if ('company' !== $thirdparty->getKind()) {
+            $firstnameCaps = mb_convert_case(mb_strtolower($thirdparty->getFirstname()), \MB_CASE_TITLE, 'UTF-8');
             $firstnameCaps = ucwords(strtolower($firstnameCaps), " \t\r\n\f\v'-");
             $thirdparty->setFirstName($firstnameCaps);
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Export/Helper/LabelThirdPartyHelper.php b/src/Bundle/ChillThirdPartyBundle/Export/Helper/LabelThirdPartyHelper.php
index 8b0678927..9b4cbfa75 100644
--- a/src/Bundle/ChillThirdPartyBundle/Export/Helper/LabelThirdPartyHelper.php
+++ b/src/Bundle/ChillThirdPartyBundle/Export/Helper/LabelThirdPartyHelper.php
@@ -13,8 +13,6 @@ namespace Chill\ThirdPartyBundle\Export\Helper;
 
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
-use function count;
-use const SORT_NUMERIC;
 
 class LabelThirdPartyHelper
 {
@@ -48,7 +46,7 @@ class LabelThirdPartyHelper
 
             $decoded = json_decode((string) $value, null, 512, JSON_THROW_ON_ERROR);
 
-            if (0 === count($decoded)) {
+            if (0 === \count($decoded)) {
                 return '';
             }
 
@@ -67,7 +65,7 @@ class LabelThirdPartyHelper
                         },
                         array_unique(
                             array_filter($decoded, static fn (?int $id) => null !== $id),
-                            SORT_NUMERIC
+                            \SORT_NUMERIC
                         )
                     )
                 );
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php b/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
index 7d5bded0f..1beb72a1d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
@@ -13,14 +13,10 @@ namespace Chill\ThirdPartyBundle\Form\ChoiceLoader;
 
 use Chill\MainBundle\Entity\Center;
 use Doctrine\ORM\EntityRepository;
-use RuntimeException;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 
-use function call_user_func;
-use function in_array;
-
 /**
  * Lazy load third parties.
  *
@@ -61,8 +57,8 @@ class ThirdPartyChoiceLoader implements ChoiceLoaderInterface
         foreach ($values as $value) {
             $party = $this->partyRepository->find($value);
 
-            if (false === in_array($this->center, $party->getCenters()->toArray(), true)) {
-                throw new RuntimeException("the party's center is not authorized");
+            if (false === \in_array($this->center, $party->getCenters()->toArray(), true)) {
+                throw new \RuntimeException("the party's center is not authorized");
             }
 
             $choices[] = $party;
@@ -82,7 +78,7 @@ class ThirdPartyChoiceLoader implements ChoiceLoaderInterface
                 continue;
             }
 
-            $id = call_user_func($value, $choice);
+            $id = \call_user_func($value, $choice);
             $values[] = $id;
             $this->lazyLoadedParties[$id] = $choice;
         }
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index 95100e3fb..046d553e9 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -34,8 +34,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
-use function array_key_exists;
-
 class ThirdPartyType extends AbstractType
 {
     private readonly bool $askCenter;
@@ -71,7 +69,7 @@ class ThirdPartyType extends AbstractType
         if ($this->askCenter) {
             $builder
                 ->add('centers', PickCenterType::class, [
-                    'role' => (array_key_exists('data', $options) && $this->om->contains($options['data'])) ?
+                    'role' => (\array_key_exists('data', $options) && $this->om->contains($options['data'])) ?
                         ThirdPartyVoter::UPDATE : ThirdPartyVoter::CREATE,
                     'choice_options' => [
                         'multiple' => true,
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
index 0dd4f16e6..85fe9fe7a 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
@@ -24,13 +24,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_diff;
-use function array_merge;
-use function count;
-use function is_array;
-
 /**
- * @deprecated use the @link{PickThirdPartyDynamicType::class}
+ * @deprecated use the @see{PickThirdPartyDynamicType::class}
+ *
  * @note do remove ThirdPartyChoiceLoader if this class is removed
  */
 class PickThirdPartyType extends AbstractType
@@ -69,7 +65,7 @@ class PickThirdPartyType extends AbstractType
 
     public function buildView(\Symfony\Component\Form\FormView $view, \Symfony\Component\Form\FormInterface $form, array $options)
     {
-        $view->vars['attr']['class'] = array_merge(['select2 '], $view->vars['attr']['class'] ?? []);
+        $view->vars['attr']['class'] = \array_merge(['select2 '], $view->vars['attr']['class'] ?? []);
         $view->vars['attr']['data-3party-picker'] = true;
         $view->vars['attr']['data-select-interactive-loading'] = true;
         $view->vars['attr']['data-search-url'] = $this->urlGenerator
@@ -94,11 +90,12 @@ class PickThirdPartyType extends AbstractType
             ->setDefined('types')
             ->setRequired('types')
             ->setAllowedValues('types', function ($types) {
-                if (false === is_array($types)) {
+                if (false === \is_array($types)) {
                     return false;
                 }
+
                 // return false if one element is not contained in allowed types
-                return count(array_diff($types, $this->typesManager->getTypes())) === 0;
+                return 0 === \count(\array_diff($types, $this->typesManager->getTypes()));
             });
 
         $resolver
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
index d9438ccb3..77720331d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
@@ -20,12 +20,6 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_merge;
-use function implode;
-use function is_array;
-use function is_string;
-use function uasort;
-
 class PickThirdPartyTypeCategoryType extends \Symfony\Component\Form\AbstractType
 {
     private const PREFIX_TYPE = 'chill_3party.key_label.';
@@ -34,16 +28,16 @@ class PickThirdPartyTypeCategoryType extends \Symfony\Component\Form\AbstractTyp
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $choices = array_merge(
+        $choices = \array_merge(
             $this->thirdPartyCategoryRepository->findBy(['active' => true]),
             $this->thirdPartyTypeManager->getTypes()
         );
 
-        uasort($choices, function ($itemA, $itemB) {
+        \uasort($choices, function ($itemA, $itemB) {
             $strA = $itemA instanceof ThirdPartyCategory ? $this->translatableStringHelper
-                ->localize($itemA->getName()) : $this->translator->trans(self::PREFIX_TYPE . $itemA);
+                ->localize($itemA->getName()) : $this->translator->trans(self::PREFIX_TYPE.$itemA);
             $strB = $itemB instanceof ThirdPartyCategory ? $this->translatableStringHelper
-                ->localize($itemB->getName()) : $this->translator->trans(self::PREFIX_TYPE . $itemB);
+                ->localize($itemB->getName()) : $this->translator->trans(self::PREFIX_TYPE.$itemB);
 
             return $strA <=> $strB;
         });
@@ -57,7 +51,7 @@ class PickThirdPartyTypeCategoryType extends \Symfony\Component\Form\AbstractTyp
                     return $this->translatableStringHelper->localize($item->getName());
                 }
 
-                return self::PREFIX_TYPE . $item;
+                return self::PREFIX_TYPE.$item;
             },
             'choice_value' => fn ($item) => $this->reverseTransform($item),
         ]);
@@ -75,13 +69,13 @@ class PickThirdPartyTypeCategoryType extends \Symfony\Component\Form\AbstractTyp
         }
 
         if ($value instanceof ThirdPartyCategory) {
-            return 'category:' . $value->getId();
+            return 'category:'.$value->getId();
         }
 
-        if (is_string($value)) {
-            return 'type:' . $value;
+        if (\is_string($value)) {
+            return 'type:'.$value;
         }
 
-        throw new UnexpectedTypeException($value, implode(' or ', ['array', 'string', ThirdPartyCategory::class]));
+        throw new UnexpectedTypeException($value, \implode(' or ', ['array', 'string', ThirdPartyCategory::class]));
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
index 34bebb066..f05ad0296 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
@@ -19,7 +19,7 @@ final readonly class ThirdPartyACLAwareRepository implements ThirdPartyACLAwareR
 {
     public function __construct(private Security $security, private AuthorizationHelper $authorizationHelper, private ThirdPartyRepository $thirdPartyRepository) {}
 
-    public function buildQuery(?string $filterString = null): QueryBuilder
+    public function buildQuery(string $filterString = null): QueryBuilder
     {
         $qb = $this->thirdPartyRepository->createQueryBuilder('tp');
 
@@ -31,7 +31,7 @@ final readonly class ThirdPartyACLAwareRepository implements ThirdPartyACLAwareR
 
         if (null !== $filterString) {
             $qb->andWhere($qb->expr()->like('tp.canonicalized', 'LOWER(UNACCENT(:filterString))'))
-                ->setParameter('filterString', '%' . $filterString . '%');
+                ->setParameter('filterString', '%'.$filterString.'%');
         }
 
         return $qb;
@@ -51,13 +51,13 @@ final readonly class ThirdPartyACLAwareRepository implements ThirdPartyACLAwareR
         string $role,
         ?string $filterString,
         ?array $orderBy = [],
-        ?int $limit = null,
-        ?int $offset = null
+        int $limit = null,
+        int $offset = null
     ): array {
         $qb = $this->buildQuery($filterString);
 
         foreach ($orderBy as $sort => $direction) {
-            $qb->addOrderBy('tp.' . $sort, $direction);
+            $qb->addOrderBy('tp.'.$sort, $direction);
         }
 
         $qb->setFirstResult($offset)
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
index a3865b7da..c2e6c74c1 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
@@ -17,9 +17,6 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
-use DomainException;
-
-use function array_key_exists;
 
 class ThirdPartyRepository implements ObjectRepository
 {
@@ -32,7 +29,6 @@ class ThirdPartyRepository implements ObjectRepository
 
     /**
      * count amongst parties associated to $centers, with $terms parameters.
-     *
      */
     public function countByMemberOfCenters(array $centers, array $terms = []): int
     {
@@ -42,7 +38,7 @@ class ThirdPartyRepository implements ObjectRepository
         return $qb->getQuery()->getSingleScalarResult();
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -66,7 +62,7 @@ class ThirdPartyRepository implements ObjectRepository
      *
      * @return array|ThirdParty[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -85,9 +81,9 @@ class ThirdPartyRepository implements ObjectRepository
      * - is_active: is active = true / false
      * - types: an array of types
      *
-     * @param int $firstResult
-     * @param int $maxResults
-     * @param array $terms
+     * @param int      $firstResult
+     * @param int      $maxResults
+     * @param array    $terms
      * @param string[] $returnFormat a format for returning
      */
     public function findByMemberOfCenters(array $centers, $firstResult = 0, $maxResults = 20, $terms = [], $returnFormat = ['entity']): array
@@ -117,7 +113,7 @@ class ThirdPartyRepository implements ObjectRepository
                 break;
 
             default:
-                throw new DomainException('This return format is invalid');
+                throw new \DomainException('This return format is invalid');
         }
         $qb->setFirstResult($firstResult)
             ->setMaxResults($maxResults);
@@ -152,8 +148,8 @@ class ThirdPartyRepository implements ObjectRepository
         $or = $qb->expr()->orX();
 
         foreach ($centers as $center) {
-            $or->add($qb->expr()->isMemberOf(':center_' . $center->getId(), 'tp.centers'));
-            $qb->setParameter('center_' . $center->getId(), $center);
+            $or->add($qb->expr()->isMemberOf(':center_'.$center->getId(), 'tp.centers'));
+            $qb->setParameter('center_'.$center->getId(), $center);
         }
 
         $qb->where($or);
@@ -163,7 +159,7 @@ class ThirdPartyRepository implements ObjectRepository
 
     private function setIsActiveCondition(QueryBuilder $qb, array $terms)
     {
-        if (array_key_exists('is_active', $terms)) {
+        if (\array_key_exists('is_active', $terms)) {
             $qb->andWhere(
                 $terms['is_active'] ? $qb->expr()->eq('tp.active', "'TRUE'") :
                 $qb->expr()->eq('tp.active', "'FALSE'")
@@ -177,25 +173,25 @@ class ThirdPartyRepository implements ObjectRepository
      */
     private function setNameCondition(QueryBuilder $qb, array $terms)
     {
-        if (array_key_exists('name', $terms) || array_key_exists('_default', $terms)) {
+        if (\array_key_exists('name', $terms) || \array_key_exists('_default', $terms)) {
             $term = $terms['name'] ?? $terms['_default'];
 
             if (null === $term || '' === $term) {
                 return;
             }
             $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(tp.name))', 'UNACCENT(LOWER(:name))'));
-            $qb->setParameter('name', '%' . $term . '%');
+            $qb->setParameter('name', '%'.$term.'%');
         }
     }
 
     private function setTypesCondition(QueryBuilder $qb, array $terms)
     {
-        if (array_key_exists('types', $terms)) {
+        if (\array_key_exists('types', $terms)) {
             $orx = $qb->expr()->orX();
 
             foreach ($terms['types'] as $type) {
-                $orx->add('JSONB_EXISTS_IN_ARRAY(tp.type, :type_' . $type . ') = \'TRUE\'');
-                $qb->setParameter('type_' . $type, $type);
+                $orx->add('JSONB_EXISTS_IN_ARRAY(tp.type, :type_'.$type.') = \'TRUE\'');
+                $qb->setParameter('type_'.$type, $type);
             }
             $qb->andWhere($orx);
         }
diff --git a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
index b093dba42..8970fec1c 100644
--- a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
+++ b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
@@ -15,11 +15,6 @@ use Chill\MainBundle\Search\SearchApiInterface;
 use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 
-use function array_merge;
-use function explode;
-use function implode;
-use function in_array;
-
 /*
  * Internal note: test query for parametrizing / testing:
  *
@@ -68,7 +63,7 @@ class ThirdPartyApiSearch implements SearchApiInterface
                 LEFT JOIN chill_main_address cma ON cma.id = COALESCE(parent.address_id, tparty.address_id)
                 LEFT JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id');
 
-        $strs = explode(' ', $pattern);
+        $strs = \explode(' ', $pattern);
         $wheres = [];
         $whereArgs = [];
         $pertinence = [];
@@ -86,11 +81,11 @@ class ThirdPartyApiSearch implements SearchApiInterface
                 $pertinence[] = 'GREATEST(
                         STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), tparty.canonicalized),
                         STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), parent.canonicalized)
-                    ) + ' .
+                    ) + '.
                     "GREATEST(
                         (tparty.canonicalized LIKE '%s' || LOWER(UNACCENT(?)) || '%')::int,
                         (parent.canonicalized LIKE '%s' || LOWER(UNACCENT(?)) || '%')::int
-                    ) + " .
+                    ) + ".
                    // take postcode label into account, but lower than the canonicalized field
                    "COALESCE((LOWER(UNACCENT(cmpc.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0)";
                 $pertinenceArgs[] = [$str, $str, $str, $str, $str];
@@ -98,12 +93,12 @@ class ThirdPartyApiSearch implements SearchApiInterface
         }
 
         $query
-            ->setSelectPertinence(implode(' + ', $pertinence) . ' + 1', array_merge(
+            ->setSelectPertinence(\implode(' + ', $pertinence).' + 1', \array_merge(
                 [],
                 ...$pertinenceArgs
             ))
-            ->andWhereClause(implode(' AND ', $wheres)
-                . ' AND tparty.active IS TRUE and (parent.active IS TRUE OR parent IS NULL)', array_merge(
+            ->andWhereClause(\implode(' AND ', $wheres)
+                .' AND tparty.active IS TRUE and (parent.active IS TRUE OR parent IS NULL)', \array_merge(
                     [],
                     ...$whereArgs
                 ));
@@ -118,6 +113,6 @@ class ThirdPartyApiSearch implements SearchApiInterface
 
     public function supportsTypes(string $pattern, array $types, array $parameters): bool
     {
-        return in_array('thirdparty', $types, true);
+        return \in_array('thirdparty', $types, true);
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
index c60f97413..8b8f724d0 100644
--- a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
+++ b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
@@ -14,12 +14,10 @@ namespace Chill\ThirdPartyBundle\Search;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Search\SearchInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 /**
  * Allow to search amongst parties.
@@ -98,7 +96,7 @@ class ThirdPartySearch implements SearchInterface
             ];
         }
         // format "html"
-        throw new \UnexpectedValueException("format html not supported");
+        throw new \UnexpectedValueException('format html not supported');
     }
 
     public function supports($domain, $format): bool
diff --git a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
index a5fa41b41..09f7feb3b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
+++ b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
@@ -17,11 +17,6 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Role\Role;
-
-use function array_intersect;
-use function count;
-use function in_array;
 
 /**
  * Voter for Third Party.
@@ -66,7 +61,7 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy
     protected function supports($attribute, $subject)
     {
         if ($subject instanceof ThirdParty) {
-            return in_array($attribute, $this->getRoles(), true);
+            return \in_array($attribute, $this->getRoles(), true);
         }
 
         if (null === $subject) {
@@ -77,7 +72,7 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy
     }
 
     /**
-     * @param string $attribute
+     * @param string          $attribute
      * @param ThirdParty|null $subject
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
@@ -94,11 +89,11 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy
             ->getReachableCenters($user, $attribute);
 
         if (null === $subject) {
-            return count($centers) > 0;
+            return \count($centers) > 0;
         }
 
         if ($subject instanceof ThirdParty) {
-            return count(array_intersect($centers, $subject->getCenters()->toArray())) > 0;
+            return \count(\array_intersect($centers, $subject->getCenters()->toArray())) > 0;
         }
 
         return false;
diff --git a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
index af991da27..a36ceda4e 100644
--- a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
+++ b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
@@ -11,12 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\ThirdPartyBundle\Templating\Entity;
 
-use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Chill\MainBundle\Templating\Entity\BoxUtilsChillEntityRenderTrait;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Symfony\Component\Templating\EngineInterface;
 
 /**
  * @implements ChillEntityRenderInterface<ThirdParty>
@@ -44,33 +42,33 @@ class ThirdPartyRender implements ChillEntityRenderInterface
         ];
 
         return
-            $this->getDefaultOpeningBox('thirdparty') .
+            $this->getDefaultOpeningBox('thirdparty').
             $this->engine->render('@ChillThirdParty/Entity/thirdparty.html.twig', [
                 'thirdparty' => $entity,
                 'render' => $options['render'] ?? 'raw',
                 'options' => $params,
-            ]) .
+            ]).
             $this->getDefaultClosingBox();
     }
 
     public function renderString($entity, array $options): string
     {
-        if ($entity->getCivility() !== null) {
+        if (null !== $entity->getCivility()) {
             $civility = $this->translatableStringHelper
-                ->localize($entity->getCivility()->getAbbreviation()) . ' ';
+                ->localize($entity->getCivility()->getAbbreviation()).' ';
         } else {
             $civility = '';
         }
 
         if ('' !== (string) $entity->getAcronym()) {
-            $acronym = ' (' . $entity->getAcronym() . ')';
+            $acronym = ' ('.$entity->getAcronym().')';
         } else {
             $acronym = '';
         }
 
         $firstname = ('' === $entity->getFirstname()) ? '' : $entity->getFirstname();
 
-        return $civility . $firstname . ' ' . $entity->getName() . $acronym;
+        return $civility.$firstname.' '.$entity->getName().$acronym;
     }
 
     public function supports($entity, array $options): bool
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php
index ca4cc2783..6c70faf35 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ThirdPartyControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php
index bfd976de8..1801c1986 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php
@@ -17,6 +17,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ThirdPartyTest extends TestCase
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php
index f4b9754cc..56d80e0dc 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php
@@ -14,13 +14,13 @@ namespace Chill\ThirdPartyBundle\Tests\Serializer\Normalizer;
 use Chill\MainBundle\Entity\Civility;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
-use libphonenumber\PhoneNumber;
 use libphonenumber\PhoneNumberUtil;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ThirdPartyDocGenNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php
index 01248e374..978c26636 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ThirdPartyJsonDenormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
index 7008e42f3..46367124b 100644
--- a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
+++ b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\ThirdPartyBundle\ThirdPartyType;
 
-use function array_keys;
-
 /**
  * Manages types of third parties.
  */
@@ -55,6 +53,6 @@ class ThirdPartyTypeManager
      */
     public function getTypes(): array
     {
-        return array_keys($this->providers);
+        return \array_keys($this->providers);
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php
index e187099e2..18b740285 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php
@@ -24,7 +24,7 @@ final class Version20190307111314 extends AbstractMigration
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP SEQUENCE chill_third_party_id_seq CASCADE');
         $this->addSql('DROP TABLE chill_third_party');
@@ -33,7 +33,7 @@ final class Version20190307111314 extends AbstractMigration
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE chill_third_party_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_third_party (id INT NOT NULL, name VARCHAR(255) NOT NULL, telephone VARCHAR(64) DEFAULT NULL, email VARCHAR(255) DEFAULT NULL, comment TEXT DEFAULT NULL, type JSON DEFAULT NULL, PRIMARY KEY(id))');
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php
index ddcdfc7ae..b81eadf12 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php
@@ -23,7 +23,7 @@ final class Version20190307131650 extends AbstractMigration
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->throwIrreversibleMigrationException('The down version of this migration is '
-            . 'not written');
+            .'not written');
     }
 
     public function up(Schema $schema): void
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php
index 331af6ccc..f34cbff81 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php
@@ -21,7 +21,7 @@ final class Version20190418090842 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP TABLE chill_3party.party_center');
         $this->addSql('ALTER TABLE chill_3party.third_party DROP active');
@@ -29,7 +29,7 @@ final class Version20190418090842 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE TABLE chill_3party.party_center (thirdparty_id INT NOT NULL, center_id INT NOT NULL, PRIMARY KEY(thirdparty_id, center_id))');
         $this->addSql('CREATE INDEX IDX_C65D4397C7D3A8E6 ON chill_3party.party_center (thirdparty_id)');
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php
index 925900e36..9a942bed8 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php
@@ -27,8 +27,8 @@ final class Version20190429171109 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_3party.third_party RENAME COLUMN type '
-            . 'TO types');
+            .'TO types');
         $this->addSql('ALTER TABLE chill_3party.third_party ALTER COLUMN types '
-            . 'SET DATA TYPE jsonb');
+            .'SET DATA TYPE jsonb');
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php
index 97210c9d1..7a12f6214 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php
@@ -21,7 +21,7 @@ final class Version20190502144206 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467BF5B7AF75');
         $this->addSql('ALTER TABLE chill_3party.third_party DROP address_id');
@@ -29,7 +29,7 @@ final class Version20190502144206 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_3party.third_party ADD address_id INT DEFAULT NULL');
         $this->addSql('COMMENT ON COLUMN chill_3party.third_party.types IS NULL');
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php
index d41af0c07..9c4267235 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php
@@ -14,7 +14,6 @@ namespace Chill\Migrations\ThirdParty;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 use libphonenumber\PhoneNumberUtil;
-use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
@@ -40,7 +39,7 @@ final class Version20220302143821 extends AbstractMigration implements Container
             ->getParameter('chill_main')['phone_helper']['default_carrier_code'];
 
         if (null === $carrier_code) {
-            throw new RuntimeException('no carrier code');
+            throw new \RuntimeException('no carrier code');
         }
 
         $this->addSql('ALTER TABLE chill_3party.third_party ALTER telephone TYPE VARCHAR(35)');
@@ -49,7 +48,7 @@ final class Version20220302143821 extends AbstractMigration implements Container
         $this->addSql('COMMENT ON COLUMN chill_3party.third_party.telephone IS \'(DC2Type:phone_number)\'');
 
         $this->addSql(
-            'UPDATE chill_3party.third_party SET ' .
+            'UPDATE chill_3party.third_party SET '.
             $this->buildMigrationPhonenumberClause($carrier_code, 'telephone')
         );
     }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
index 18b7915f8..756ca41cd 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
@@ -11,12 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\Migrations\ThirdParty;
 
-use Chill\ThirdPartyBundle\Entity\ThirdPartyProfession;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 final class Version20230215175150 extends AbstractMigration
 {
@@ -30,10 +26,9 @@ final class Version20230215175150 extends AbstractMigration
         return 'Change profession to a string field and transfer values';
     }
 
-
     public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_3party.third_party ADD profession TEXT DEFAULT \'\' NOT NULL');
-        $this->addSql('UPDATE chill_3party.third_party SET profession = party_profession.name->>\'fr\' FROM chill_3party.party_profession WHERE party_profession.id = third_party.profession_id') ;
+        $this->addSql('UPDATE chill_3party.third_party SET profession = party_profession.name->>\'fr\' FROM chill_3party.party_profession WHERE party_profession.id = third_party.profession_id');
     }
 }
diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Convert.php b/src/Bundle/ChillWopiBundle/src/Controller/Convert.php
index c4702c2b2..3b2744b28 100644
--- a/src/Bundle/ChillWopiBundle/src/Controller/Convert.php
+++ b/src/Bundle/ChillWopiBundle/src/Controller/Convert.php
@@ -85,13 +85,13 @@ class Convert
 
     private function onConversionFailed(string $url, ResponseInterface $response): JsonResponse
     {
-        $this->logger->error(self::LOG_PREFIX . ' could not convert document', [
+        $this->logger->error(self::LOG_PREFIX.' could not convert document', [
             'response_status' => $response->getStatusCode(),
             'message' => $response->getContent(false),
             'server' => $this->collaboraDomain,
             'url' => $url,
         ]);
 
-        return new JsonResponse(['message' => 'conversion failed : ' . $response->getContent(false)], Response::HTTP_SERVICE_UNAVAILABLE);
+        return new JsonResponse(['message' => 'conversion failed : '.$response->getContent(false)], Response::HTTP_SERVICE_UNAVAILABLE);
     }
 }
diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Editor.php b/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
index 4f22bf24f..053b7abd0 100644
--- a/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
+++ b/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
@@ -17,7 +17,6 @@ use ChampsLibres\WopiLib\Contract\Service\DocumentManagerInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\User;
 use Chill\WopiBundle\Service\Controller\ResponderInterface;
-use Exception;
 use Lexik\Bundle\JWTAuthenticationBundle\Services\JWTTokenManagerInterface;
 use loophp\psr17\Psr17Interface;
 use Symfony\Component\HttpFoundation\Request;
@@ -29,16 +28,16 @@ use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final readonly class Editor
 {
-    public function __construct(private ConfigurationInterface $wopiConfiguration, private DiscoveryInterface $wopiDiscovery, private DocumentManagerInterface $documentManager, private \Twig\Environment $engine, private JWTTokenManagerInterface $JWTTokenManager, private NormalizerInterface $normalizer, private ResponderInterface $responder, private Security $security, private Psr17Interface $psr17, private RouterInterface $router) {}
+    public function __construct(private ConfigurationInterface $wopiConfiguration, private DiscoveryInterface $wopiDiscovery, private DocumentManagerInterface $documentManager, private Environment $engine, private JWTTokenManagerInterface $JWTTokenManager, private NormalizerInterface $normalizer, private ResponderInterface $responder, private Security $security, private Psr17Interface $psr17, private RouterInterface $router) {}
 
     public function __invoke(string $fileId, Request $request): Response
     {
@@ -69,14 +68,14 @@ final readonly class Editor
                 $this->engine
                     ->render('@ChillWopi/Editor/stored_object_pending.html.twig', [
                         'storedObject' => $this->normalizer->normalize($storedObject, 'json', [
-                            AbstractNormalizer::GROUPS => ['read']
-                        ])
+                            AbstractNormalizer::GROUPS => ['read'],
+                        ]),
                     ])
             );
         }
 
         if ([] === $discoverExtension = $this->wopiDiscovery->discoverMimeType($storedObject->getType())) {
-            throw new Exception(sprintf('Unable to find mime type %s', $storedObject->getType()));
+            throw new \Exception(sprintf('Unable to find mime type %s', $storedObject->getType()));
         }
 
         $configuration['favIconUrl'] = '';
diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php
index 1518458bd..1c0ef6490 100644
--- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php
+++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php
@@ -28,7 +28,7 @@ final class ChillWopiExtension extends Extension
                 $config
             );
 
-        $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.php');
     }
 }
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
index fc19e9c0d..a962c9e67 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
+++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
@@ -33,10 +33,10 @@ return static function (ContainerConfigurator $container) {
         ->autoconfigure();
 
     $services
-        ->load('Chill\\WopiBundle\\Service\\', __DIR__ . '/../../Service');
+        ->load('Chill\\WopiBundle\\Service\\', __DIR__.'/../../Service');
 
     $services
-        ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller')
+        ->load('Chill\\WopiBundle\\Controller\\', __DIR__.'/../../Controller')
         ->tag('controller.service_arguments');
 
     $services
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php b/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php
index 89eec1685..a57eab761 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php
@@ -26,7 +26,7 @@ final readonly class Responder implements ResponderInterface
 
     public function file(
         $file,
-        ?string $filename = null,
+        string $filename = null,
         string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT
     ): BinaryFileResponse {
         $response = new BinaryFileResponse($file);
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php b/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php
index 97e09a609..734a5b5b3 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\WopiBundle\Service\Controller;
 
-use SplFileInfo;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -24,11 +23,11 @@ interface ResponderInterface
     /**
      * Returns a BinaryFileResponse object with original or customized file name and disposition header.
      *
-     * @param SplFileInfo|string $file
+     * @param \SplFileInfo|string $file
      */
     public function file(
         $file,
-        ?string $filename = null,
+        string $filename = null,
         string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT
     ): BinaryFileResponse;
 
@@ -36,7 +35,7 @@ interface ResponderInterface
      * Returns a JsonResponse that uses the serializer component if enabled, or json_encode.
      *
      * @param array<string, list<string>|string> $headers
-     * @param array<string, mixed> $context
+     * @param array<string, mixed>               $context
      */
     public function json(
         mixed $data,
@@ -55,7 +54,7 @@ interface ResponderInterface
     /**
      * Returns a RedirectResponse to the given route with the given parameters.
      *
-     * @param array<array-key, scalar> $parameters
+     * @param array<array-key, scalar>    $parameters
      * @param array<string, list<string>> $headers
      */
     public function redirectToRoute(
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php
index 9d44052e0..d4338b208 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php
@@ -15,7 +15,6 @@ use ChampsLibres\WopiLib\Contract\Entity\Document;
 use ChampsLibres\WopiLib\Contract\Service\DocumentLockManagerInterface;
 use Chill\MainBundle\Redis\ChillRedis;
 use Psr\Http\Message\RequestInterface;
-use RuntimeException;
 
 class ChillDocumentLockManager implements DocumentLockManagerInterface
 {
@@ -48,7 +47,7 @@ class ChillDocumentLockManager implements DocumentLockManagerInterface
             return $value;
         }
 
-        throw new RuntimeException('wopi key does not exists');
+        throw new \RuntimeException('wopi key does not exists');
     }
 
     public function hasLock(Document $document, RequestInterface $request): bool
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
index 0963cf903..f263afcc8 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
@@ -17,20 +17,15 @@ use ChampsLibres\WopiLib\Contract\Service\DocumentManagerInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\StoredObjectRepository;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
-use DateTimeInterface;
 use Doctrine\ORM\EntityManagerInterface;
-use Error;
 use loophp\psr17\Psr17Interface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Ramsey\Uuid\Uuid;
-use RuntimeException;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Mime\MimeTypes;
-
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
-use function strlen;
 
 final class ChillDocumentManager implements DocumentManagerInterface
 {
@@ -73,7 +68,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
     public function deleteLock(Document $document): void
     {
         if (false === $this->documentLockManager->deleteLock($document, $this->request)) {
-            throw new RuntimeException('could not remove the lock');
+            throw new \RuntimeException('could not remove the lock');
         }
     }
 
@@ -101,14 +96,14 @@ final class ChillDocumentManager implements DocumentManagerInterface
     /**
      * @param StoredObject $document
      *
-     * @return string The document filename with its extension.
+     * @return string the document filename with its extension
      */
     public function getBasename(Document $document): string
     {
         $exts = (new MimeTypes())->getExtensions($document->getType());
 
         if ([] === $exts) {
-            throw new Error('Unknown mimetype for stored document.');
+            throw new \Error('Unknown mimetype for stored document.');
         }
 
         return sprintf('%s.%s', $document->getFilename(), reset($exts));
@@ -117,7 +112,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
     /**
      * @param StoredObject $document
      */
-    public function getCreationDate(Document $document): DateTimeInterface
+    public function getCreationDate(Document $document): \DateTimeInterface
     {
         return $document->getCreatedAt() ?? new \DateTimeImmutable('now');
     }
@@ -133,7 +128,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
     /**
      * @param StoredObject $document
      */
-    public function getLastModifiedDate(Document $document): DateTimeInterface
+    public function getLastModifiedDate(Document $document): \DateTimeInterface
     {
         return $this->storedObjectManager->getLastModified($document);
     }
@@ -150,7 +145,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
 
     public function getSize(Document $document): int
     {
-        return strlen($this->getContent($document));
+        return \strlen($this->getContent($document));
     }
 
     public function getVersion(Document $document): string
@@ -178,12 +173,12 @@ final class ChillDocumentManager implements DocumentManagerInterface
 
     public function remove(Document $document): void
     {
-        throw new RuntimeException('this is not implemented and should not happens');
+        throw new \RuntimeException('this is not implemented and should not happens');
     }
 
     public function rename(Document $document, string $requestedName): void
     {
-        throw new RuntimeException('this is not implemented and should not happens');
+        throw new \RuntimeException('this is not implemented and should not happens');
     }
 
     public function write(Document $document, array $properties = []): void
diff --git a/src/Bundle/ChillWopiBundle/tests/Controller/ConvertTest.php b/src/Bundle/ChillWopiBundle/tests/Controller/ConvertTest.php
index 49d7e21d7..2bc3f4769 100644
--- a/src/Bundle/ChillWopiBundle/tests/Controller/ConvertTest.php
+++ b/src/Bundle/ChillWopiBundle/tests/Controller/ConvertTest.php
@@ -27,6 +27,7 @@ use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ConvertTest extends TestCase
diff --git a/src/Bundle/ChillWopiBundle/tests/Service/Wopi/ChillDocumentLockManagerTest.php b/src/Bundle/ChillWopiBundle/tests/Service/Wopi/ChillDocumentLockManagerTest.php
index 022f5e26f..c5e687cac 100644
--- a/src/Bundle/ChillWopiBundle/tests/Service/Wopi/ChillDocumentLockManagerTest.php
+++ b/src/Bundle/ChillWopiBundle/tests/Service/Wopi/ChillDocumentLockManagerTest.php
@@ -20,6 +20,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ChillDocumentLockManagerTest extends KernelTestCase
diff --git a/utils/rector/src/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector.php b/utils/rector/src/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector.php
index 12ba9179d..b2efd260a 100644
--- a/utils/rector/src/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector.php
+++ b/utils/rector/src/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector.php
@@ -168,7 +168,6 @@ PHP */
     }
 
     /**
-     * @param Node\Stmt\ClassMethod $buildFormMethod
      * @return array{"build_form_method": Node\Stmt\ClassMethod, "empty_to_replace": array<string, mixed>}
      */
     private function filterBuildFormMethod(Node\Stmt\ClassMethod $buildFormMethod, Node\Stmt\Class_ $node): array
@@ -194,7 +193,7 @@ PHP */
 
         $buildFormMethod->stmts = $newStmts;
 
-        return ['build_form_method' => $buildFormMethod, "empty_to_replace" => $emptyDataToReplace];
+        return ['build_form_method' => $buildFormMethod, 'empty_to_replace' => $emptyDataToReplace];
     }
 
     private function handleMethodCallBuilderAdd(Node\Expr\MethodCall $methodCall, string $builderName, Node\Stmt\Class_ $node): array|false
@@ -227,14 +226,14 @@ PHP */
             }
         }
 
-        if ($methodCall->name instanceof  Node\Identifier && $methodCall->name->name !== 'add') {
+        if ($methodCall->name instanceof Node\Identifier && 'add' !== $methodCall->name->name) {
             return ['stmt' => $methodCall, 'emptyDataToReplace' => $emptyDataToReplace];
         }
 
         if (
             // the method call must be "add"
             $methodCall->name instanceof Node\Identifier
-            && $methodCall->name->name === 'add'
+            && 'add' === $methodCall->name->name
             // it must have a first argument, a string
             // TODO what happens if a value, or a const ?
             && ($methodCall->args[0] ?? null) instanceof Node\Arg
@@ -247,7 +246,7 @@ PHP */
             $emptyDataIndex = null;
             foreach ($methodCall->args[2]->value->items as $arrayItemIndex => $item) {
                 /* @phpstan-ignore-next-line */
-                if ($item->key->value === 'data' or $item->key->value === 'empty_data') {
+                if ('data' === $item->key->value or 'empty_data' === $item->key->value) {
                     $k = $methodCall->args[0]->value->value;
                     $emptyDataToReplace[$k] = $item->value;
                     $emptyDataIndex = $arrayItemIndex;
@@ -259,7 +258,7 @@ PHP */
                     array_filter(
                         $methodCall->args[2]->value->items,
                         /* @phpstan-ignore-next-line */
-                        fn (Node\Expr\ArrayItem $item) => $item->key->value !== 'data'
+                        fn (Node\Expr\ArrayItem $item) => 'data' !== $item->key->value
                     )
                 );
             }
diff --git a/utils/rector/tests/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRectorTest.php b/utils/rector/tests/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRectorTest.php
index 89606e970..8a33b326a 100644
--- a/utils/rector/tests/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRectorTest.php
+++ b/utils/rector/tests/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRectorTest.php
@@ -12,10 +12,10 @@ declare(strict_types=1);
 namespace Chill\Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector;
 
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
-use Symplify\SmartFileSystem\SmartFileInfo;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class ChillBundleAddFormDefaultDataOnExportFilterAggregatorRectorTest extends AbstractRectorTestCase
diff --git a/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/config/config.php b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/config/config.php
index b59504c84..89ec65f14 100644
--- a/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/config/config.php
+++ b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/config/config.php
@@ -9,6 +9,6 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-return static function (\Rector\Config\RectorConfig $rectorConfig): void {
+return static function (Rector\Config\RectorConfig $rectorConfig): void {
     $rectorConfig->rule(\Chill\Utils\Rector\Rector\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector::class);
 };