diff --git a/rector.php b/rector.php
index 23494ad88..ec9a0c684 100644
--- a/rector.php
+++ b/rector.php
@@ -21,7 +21,7 @@ return static function (RectorConfig $rectorConfig): void {
 
     //define sets of rules
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_73
+        LevelSetList::UP_TO_PHP_74
     ]);
 
     // skip some path...
diff --git a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
index c6b3189cc..57a1ec578 100644
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
@@ -59,9 +59,7 @@ class Configuration implements ConfigurationInterface
             ->info('The number of seconds of this duration. Must be an integer.')
             ->cannotBeEmpty()
             ->validate()
-            ->ifTrue(static function ($data) {
-                return !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 9adfa057f..32ceb2e74 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -195,7 +195,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      * @Groups({"docgen:read"})
      */
-    private ?User $user;
+    private ?User $user = null;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
index 95b3c95d2..b0154e509 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
@@ -34,7 +34,7 @@ class ActivityPresence
      * @ORM\GeneratedValue(strategy="AUTO")
      * @Serializer\Groups({"docgen:read"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
index a6e0fc694..ed8260a4d 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -122,7 +122,7 @@ class ActivityType
      * @ORM\GeneratedValue(strategy="AUTO")
      * @Groups({"docgen:read"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
index 2b6919340..34771d077 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
@@ -86,9 +86,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository->createQueryBuilder('activity');
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
index 359593059..df21362cd 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
@@ -87,9 +87,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository->createQueryBuilder('activity');
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
index 2dc844aa2..6b7b1562d 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
@@ -86,9 +86,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository
             ->createQueryBuilder('activity')
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
index 6d25b4e22..026e16f90 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
@@ -109,9 +109,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
index 1cf20dc5f..e916cab54 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
@@ -87,9 +87,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository
             ->createQueryBuilder('activity')
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
index 2c160f3cf..18a47289c 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
@@ -87,9 +87,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository
             ->createQueryBuilder('activity')
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
index 8b69216b6..60110c9a8 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
@@ -137,13 +137,11 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
                     $activity = $activityRepository->find($value);
 
-                    return implode(', ', array_map(function (ActivityReason $r) {
-                        return '"' .
-                                $this->translatableStringHelper->localize($r->getCategory()->getName())
-                                . ' > ' .
-                                $this->translatableStringHelper->localize($r->getName())
-                                . '"';
-                    }, $activity->getReasons()->toArray()));
+                    return implode(', ', array_map(fn (ActivityReason $r) => '"' .
+                            $this->translatableStringHelper->localize($r->getCategory()->getName())
+                            . ' > ' .
+                            $this->translatableStringHelper->localize($r->getName())
+                            . '"', $activity->getReasons()->toArray()));
                 };
 
             case 'circle_name':
@@ -197,9 +195,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         // throw an error if any fields are present
         if (!array_key_exists('fields', $data)) {
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
index a793f21de..c6616a4c6 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
@@ -61,12 +61,9 @@ class ActivityTypeFilter implements FilterInterface
         $builder->add('accepted_activitytypes', EntityType::class, [
             'class' => ActivityType::class,
             'choices' => $this->activityTypeRepository->findAllActive(),
-            'choice_label' => function (ActivityType $aty) {
-                return
-                    ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
-                    .
-                    $this->translatableStringHelper->localize($aty->getName());
-            },
+            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
+            .
+            $this->translatableStringHelper->localize($aty->getName()),
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
index 1906db75e..4319c100a 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
@@ -64,11 +64,9 @@ class UserScopeFilter implements FilterInterface
     {
         $builder->add('accepted_userscope', EntityType::class, [
             'class' => Scope::class,
-            'choice_label' => function (Scope $s) {
-                return $this->translatableStringHelper->localize(
-                    $s->getName()
-                );
-            },
+            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize(
+                $s->getName()
+            ),
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
index d1758039a..b9d39c3ce 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -61,12 +61,9 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         $builder->add('types', EntityType::class, [
             'choices' => $this->activityTypeRepository->findAllActive(),
             'class' => ActivityType::class,
-            'choice_label' => function (ActivityType $aty) {
-                return
-                    ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
-                    .
-                    $this->translatableStringHelper->localize($aty->getName());
-            },
+            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
+            .
+            $this->translatableStringHelper->localize($aty->getName()),
             'group_by' => function (ActivityType $type) {
                 if (!$type->hasCategory()) {
                     return null;
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 50d1a66c7..a74178afd 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -211,13 +211,9 @@ class ActivityType extends AbstractType
                 'required' => $activityType->isRequired('attendee'),
                 'expanded' => true,
                 'class' => ActivityPresence::class,
-                'choice_label' => function (ActivityPresence $activityPresence) {
-                    return $this->translatableStringHelper->localize($activityPresence->getName());
-                },
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('a')
-                        ->where('a.active = true');
-                },
+                'choice_label' => fn (ActivityPresence $activityPresence) => $this->translatableStringHelper->localize($activityPresence->getName()),
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('a')
+                    ->where('a.active = true'),
             ]);
         }
 
@@ -357,9 +353,7 @@ class ActivityType extends AbstractType
 
                         return (string) $location->getId();
                     },
-                    function (?string $id): ?Location {
-                        return $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id]);
-                    }
+                    fn (?string $id): ?Location => $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id])
                 ));
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
index b27fa883e..073b8099f 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -45,9 +45,7 @@ class ActivityTypeType extends AbstractType
             ])
             ->add('category', EntityType::class, [
                 'class' => ActivityTypeCategory::class,
-                'choice_label' => function (ActivityTypeCategory $activityTypeCategory) {
-                    return $this->translatableStringHelper->localize($activityTypeCategory->getName());
-                },
+                'choice_label' => fn (ActivityTypeCategory $activityTypeCategory) => $this->translatableStringHelper->localize($activityTypeCategory->getName()),
             ])
             ->add('ordering', NumberType::class, [
                 'required' => true,
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php b/src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php
index a951ef940..35da7e02f 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php
@@ -45,9 +45,7 @@ class PickActivityReasonType extends AbstractType
         $resolver->setDefaults(
             [
                 'class' => ActivityReason::class,
-                'choice_label' => function (ActivityReason $choice) {
-                    return $this->reasonRender->renderString($choice, []);
-                },
+                'choice_label' => fn (ActivityReason $choice) => $this->reasonRender->renderString($choice, []),
                 'group_by' => function (ActivityReason $choice): ?string {
                     if (null !== $category = $choice->getCategory()) {
                         return $this->translatableStringHelper->localize($category->getName());
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php
index 96dabe008..4aa259097 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php
@@ -38,10 +38,8 @@ class TranslatableActivityReasonCategoryType extends AbstractType
         $resolver->setDefaults(
             [
                 'class' => ActivityReasonCategory::class,
-                'choice_label' => function (ActivityReasonCategory $category) {
-                    return $this->translatableStringHelper->localize($category->getName())
-                        . (!$category->getActive() ? ' (' . $this->translator->trans('inactive') . ')' : '');
-                },
+                'choice_label' => fn (ActivityReasonCategory $category) => $this->translatableStringHelper->localize($category->getName())
+                    . (!$category->getActive() ? ' (' . $this->translator->trans('inactive') . ')' : ''),
             ]
         );
     }
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
index 4a1d4bfa7..d4807b82d 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
@@ -39,9 +39,7 @@ class TranslatableActivityType extends AbstractType
                 'class' => ActivityType::class,
                 'active_only' => true,
                 'choices' => $this->activityTypeRepository->findAllActive(),
-                'choice_label' => function (ActivityType $type) {
-                    return $this->translatableStringHelper->localize($type->getName());
-                },
+                'choice_label' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
             ]
         );
     }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
index 185e008eb..1f2039a2c 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -254,9 +254,7 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
             $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), ActivityVoter::SEE, $center);
             // we get the ids for those scopes
             $reachablesScopesId = array_map(
-                static function (Scope $scope) {
-                    return $scope->getId();
-                },
+                static fn (Scope $scope) => $scope->getId(),
                 $reachableScopes
             );
 
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index ad570a8a4..624859eda 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -134,9 +134,7 @@ class ActivityContext implements
                 $builder->add($key, EntityType::class, [
                     'class' => Person::class,
                     'choices' => $persons,
-                    'choice_label' => function (Person $p) {
-                        return $this->personRender->renderString($p, []);
-                    },
+                    'choice_label' => fn (Person $p) => $this->personRender->renderString($p, []),
                     'multiple' => false,
                     'required' => false,
                     'expanded' => true,
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
index b2272dd7b..3da451f2e 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
@@ -145,9 +145,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
         return array_filter(
             $activities,
             function ($activity) use ($user) {
-                $activityUsernames = array_map(static function ($user) {
-                    return $user['username'];
-                }, $activity['users'] ?? []);
+                $activityUsernames = array_map(static fn ($user) => $user['username'], $activity['users'] ?? []);
                 return in_array($user->getUsername(), $activityUsernames, true);
             }
         );
@@ -158,9 +156,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
         return array_filter(
             $works,
             function ($work) use ($user) {
-                $workUsernames = array_map(static function ($user) {
-                    return $user['username'];
-                }, $work['referrers'] ?? []);
+                $workUsernames = array_map(static fn ($user) => $user['username'], $work['referrers'] ?? []);
 
                 return in_array($user->getUsername(), $workUsernames, true);
             }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
index 8e2c219f0..04301afae 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
@@ -369,12 +369,8 @@ final class ActivityControllerTest extends WebTestCase
                 $center
             );
         $reachableScopesId = array_intersect(
-            array_map(static function ($s) {
-                return $s->getId();
-            }, $reachableScopesDelete),
-            array_map(static function ($s) {
-                return $s->getId();
-            }, $reachableScopesUpdate)
+            array_map(static fn ($s) => $s->getId(), $reachableScopesDelete),
+            array_map(static fn ($s) => $s->getId(), $reachableScopesUpdate)
         );
 
         if (count($reachableScopesId) === 0) {
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
index df0a602a4..3ed6b4409 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
@@ -188,9 +188,7 @@ final class ActivityTypeTest extends KernelTestCase
 
         // map all the values in an array
         $values = array_map(
-            static function ($choice) {
-                return $choice->value;
-            },
+            static fn ($choice) => $choice->value,
             $view['activity']['durationTime']->vars['choices']
         );
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
index 881e5a607..a8d85daa6 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
@@ -83,9 +83,7 @@ final class TranslatableActivityReasonTest extends TypeTestCase
         $request->getLocale()->willReturn($fallbackLocale);
 
         $requestStack->willExtend(\Symfony\Component\HttpFoundation\RequestStack::class);
-        $requestStack->getCurrentRequest()->will(static function () use ($request) {
-            return $request;
-        });
+        $requestStack->getCurrentRequest()->will(static fn () => $request);
 
         $translator->willExtend(\Symfony\Component\Translation\Translator::class);
         $translator->getFallbackLocales()->willReturn($locale);
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
index 8341e0240..2e2398c3e 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
@@ -132,9 +132,7 @@ class Configuration implements ConfigurationInterface
             ->info('The number of seconds of this duration. Must be an integer.')
             ->cannotBeEmpty()
             ->validate()
-            ->ifTrue(static function ($data) {
-                return !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 598988cfb..3dc205f09 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
@@ -57,7 +57,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="string", length=100, nullable=true)
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php
index 87aad1659..9204fad4b 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php
@@ -59,9 +59,7 @@ class CountAsideActivity implements ExportInterface, GroupedExportInterface
         $labels = array_combine($values, $values);
         $labels['_header'] = $this->getTitle();
 
-        return static function ($value) use ($labels) {
-            return $labels[$value];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
diff --git a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
index f12ba3d72..619a6cdd7 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
@@ -41,7 +41,7 @@ abstract class AbstractElement
     /**
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private ?string $comment;
+    private ?string $comment = null;
 
     /**
      * @ORM\Column(name="endDate", type="datetime_immutable", nullable=true)
@@ -50,7 +50,7 @@ abstract class AbstractElement
      *     message="The budget element's end date must be after the start date"
      * )
      */
-    private ?DateTimeImmutable $endDate;
+    private ?DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\ManyToOne(
diff --git a/src/Bundle/ChillBudgetBundle/Form/ChargeType.php b/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
index 3356057cf..72863163f 100644
--- a/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
@@ -52,9 +52,7 @@ class ChargeType extends AbstractType
                 'label' => 'Charge type',
                 'required' => true,
                 'placeholder' => $this->translator->trans('admin.form.Choose the type of charge'),
-                'choice_label' => function (ChargeKind $resource) {
-                    return $this->translatableStringHelper->localize($resource->getName());
-                },
+                'choice_label' => fn (ChargeKind $resource) => $this->translatableStringHelper->localize($resource->getName()),
                 'attr' => ['class' => 'select2'],
             ])
             ->add('amount', MoneyType::class)
diff --git a/src/Bundle/ChillBudgetBundle/Form/ResourceType.php b/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
index fd859217a..09dfd16f3 100644
--- a/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
@@ -51,9 +51,7 @@ class ResourceType extends AbstractType
                 'label' => 'Resource type',
                 'required' => true,
                 'placeholder' => $this->translator->trans('admin.form.Choose the type of resource'),
-                'choice_label' => function (ResourceKind $resource) {
-                    return $this->translatableStringHelper->localize($resource->getName());
-                },
+                'choice_label' => fn (ResourceKind $resource) => $this->translatableStringHelper->localize($resource->getName()),
                 'attr' => ['class' => 'select2'],
             ])
             ->add('amount', MoneyType::class)
diff --git a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
index ad2a014ed..1c66d4c1c 100644
--- a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
+++ b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
@@ -66,9 +66,7 @@ final class SummaryBudget implements SummaryBudgetInterface
             ];
         }
 
-        $personIds = $household->getCurrentPersons()->map(static function (Person $p) {
-            return $p->getId();
-        });
+        $personIds = $household->getCurrentPersons()->map(static fn (Person $p) => $p->getId());
         $ids = implode(', ', array_fill(0, count($personIds), '?'));
 
         $parameters = [...$personIds, $household->getId()];
@@ -127,18 +125,14 @@ final class SummaryBudget implements SummaryBudgetInterface
     {
         $keys = array_map(static fn (ChargeKind $kind) => $kind->getKind(), $this->chargeKindRepository->findAll());
 
-        return array_combine($keys, array_map(function ($kind) {
-            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($this->chargeKindRepository->findOneByKind($kind)->getName()), 'comment' => ''];
-        }, $keys));
+        return array_combine($keys, array_map(fn ($kind) => ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($this->chargeKindRepository->findOneByKind($kind)->getName()), 'comment' => ''], $keys));
     }
 
     private function getEmptyResourceArray(): array
     {
         $keys = array_map(static fn (ResourceKind $kind) => $kind->getKind(), $this->resourceKindRepository->findAll());
 
-        return array_combine($keys, array_map(function ($kind) {
-            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($this->resourceKindRepository->findOneByKind($kind)->getName()), 'comment' => ''];
-        }, $keys));
+        return array_combine($keys, array_map(fn ($kind) => ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($this->resourceKindRepository->findOneByKind($kind)->getName()), 'comment' => ''], $keys));
     }
 
     private function rowToArray(array $rows, string $kind): array
diff --git a/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php b/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
index 7fcda6b11..77017abc5 100644
--- a/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
+++ b/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
@@ -50,9 +50,7 @@ final class SummaryBudgetTest extends TestCase
             ],
         ]);
         $queryCharges->setParameters(Argument::type('array'))
-            ->will(static function ($args, $query) {
-                return $query;
-            });
+            ->will(static fn ($args, $query) => $query);
 
         $queryResources = $this->prophesize(AbstractQuery::class);
         $queryResources->getResult()->willReturn([
@@ -63,9 +61,7 @@ final class SummaryBudgetTest extends TestCase
             ],
         ]);
         $queryResources->setParameters(Argument::type('array'))
-            ->will(static function ($args, $query) {
-                return $query;
-            });
+            ->will(static fn ($args, $query) => $query);
 
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->createNativeQuery(Argument::type('string'), Argument::type(Query\ResultSetMapping::class))
@@ -100,9 +96,7 @@ final class SummaryBudgetTest extends TestCase
         $resourceRepository->findOneByKind('misc')->willReturn($misc);
 
         $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
-        $translatableStringHelper->localize(Argument::type('array'))->will(static function ($arg) {
-            return $arg[0]['fr'];
-        });
+        $translatableStringHelper->localize(Argument::type('array'))->will(static fn ($arg) => $arg[0]['fr']);
 
         $person = new Person();
         $personReflection = new ReflectionClass($person);
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index d7f38adf0..79219a6e0 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -514,9 +514,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
      */
     public function getUsers(): ReadableCollection
     {
-        return $this->getInvites()->map(static function (Invite $i) {
-            return $i->getUser();
-        });
+        return $this->getInvites()->map(static fn (Invite $i) => $i->getUser());
     }
 
     public function hasCalendarRange(): bool
@@ -601,9 +599,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         }
 
         $invite = $this->invites
-            ->filter(static function (Invite $invite) use ($user) {
-                return $invite->getUser() === $user;
-            })
+            ->filter(static fn (Invite $invite) => $invite->getUser() === $user)
             ->first();
         $this->removeInvite($invite);
 
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
index 14cfad98b..5dbc4286f 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
@@ -63,7 +63,7 @@ class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
      * @Groups({"read", "write", "calendar:read"})
      * @Assert\NotNull
      */
-    private ?Location $location;
+    private ?Location $location = null;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=false)
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php b/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
index f3bf79547..9d3f00f99 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
@@ -61,9 +61,7 @@ class CountCalendars implements ExportInterface, GroupedExportInterface
         $labels = array_combine($values, $values);
         $labels['_header'] = $this->getTitle();
 
-        return static function ($value) use ($labels) {
-            return $labels[$value];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
@@ -91,9 +89,7 @@ class CountCalendars implements ExportInterface, GroupedExportInterface
      */
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->calendarRepository->createQueryBuilder('cal');
 
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
index ddecba415..14dd42d6b 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
@@ -61,9 +61,7 @@ class StatCalendarAvgDuration implements ExportInterface, GroupedExportInterface
         $labels = array_combine($values, $values);
         $labels['_header'] = $this->getTitle();
 
-        return static function ($value) use ($labels) {
-            return $labels[$value];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
index d99e73a2e..1d31bfa26 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
@@ -61,9 +61,7 @@ class StatCalendarSumDuration implements ExportInterface, GroupedExportInterface
         $labels = array_combine($values, $values);
         $labels['_header'] = $this->getTitle();
 
-        return static function ($value) use ($labels) {
-            return $labels[$value];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
index 18a4b0f4b..b58cee594 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
@@ -58,9 +58,7 @@ class AgentFilter implements FilterInterface
     {
         $builder->add('accepted_agents', EntityType::class, [
             'class' => User::class,
-            'choice_label' => function (User $u) {
-                return $this->userRender->renderString($u, []);
-            },
+            'choice_label' => fn (User $u) => $this->userRender->renderString($u, []),
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
index 0f0f42adc..69fb24447 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
@@ -69,11 +69,9 @@ class JobFilter implements FilterInterface
     {
         $builder->add('job', EntityType::class, [
             'class' => UserJob::class,
-            'choice_label' => function (UserJob $j) {
-                return $this->translatableStringHelper->localize(
-                    $j->getLabel()
-                );
-            },
+            'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize(
+                $j->getLabel()
+            ),
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
index 4d84543a3..08d9ae023 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
@@ -69,11 +69,9 @@ class ScopeFilter implements FilterInterface
     {
         $builder->add('scope', EntityType::class, [
             'class' => Scope::class,
-            'choice_label' => function (Scope $s) {
-                return $this->translatableStringHelper->localize(
-                    $s->getName()
-                );
-            },
+            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize(
+                $s->getName()
+            ),
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php
index 9bcc0c434..eabdf9063 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php
@@ -89,14 +89,10 @@ class CalendarToRemoteHandler implements MessageHandlerInterface
 
         $newInvites = array_filter(
             array_map(
-                function ($id) {
-                    return $this->inviteRepository->find($id);
-                },
+                fn ($id) => $this->inviteRepository->find($id),
                 $calendarMessage->getNewInvitesIds(),
             ),
-            static function (?Invite $invite) {
-                return null !== $invite;
-            }
+            static fn (?Invite $invite) => null !== $invite
         );
 
         $this->calendarConnector->syncCalendar(
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php
index ec5977ad3..c8a8f8aeb 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php
@@ -58,14 +58,12 @@ class CalendarMessage
         $this->previousMainUserId = null !== $calendar->previousMainUser ?
             $calendar->previousMainUser->getId() : null;
         $this->newInvitesIds = array_map(static fn (Invite $i) => $i->getId(), $calendar->newInvites);
-        $this->oldInvites = array_map(static function (Invite $i) {
-            return [
-                'inviteId' => $i->getId(),
-                'userId' => $i->getUser()->getId(),
-                'userEmail' => $i->getUser()->getEmail(),
-                'userLabel' => $i->getUser()->getLabel(),
-            ];
-        }, $calendar->oldInvites);
+        $this->oldInvites = array_map(static fn (Invite $i) => [
+            'inviteId' => $i->getId(),
+            'userId' => $i->getUser()->getId(),
+            'userEmail' => $i->getUser()->getEmail(),
+            'userLabel' => $i->getUser()->getLabel(),
+        ], $calendar->oldInvites);
     }
 
     public function getAction(): string
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
index ac1de552a..176dbe0b0 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
@@ -121,9 +121,7 @@ class RemoteEventConverter
                 'subject' => '[Chill] ' .
                     implode(
                         ', ',
-                        $calendar->getPersons()->map(function (Person $p) {
-                            return $this->personRender->renderString($p, []);
-                        })->toArray()
+                        $calendar->getPersons()->map(fn (Person $p) => $this->personRender->renderString($p, []))->toArray()
                     ),
                 'start' => [
                     'dateTime' => $calendar->getStartDate()->setTimezone($this->remoteDateTimeZone)
@@ -161,9 +159,7 @@ class RemoteEventConverter
     {
         return [
             'attendees' => $calendar->getInvites()->map(
-                function (Invite $i) {
-                    return $this->buildInviteToAttendee($i);
-                }
+                fn (Invite $i) => $this->buildInviteToAttendee($i)
             )->toArray(),
         ];
     }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
index d14ebaa02..0e3beff5f 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
@@ -190,23 +190,17 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
                 ]
             )->toArray();
 
-            $ids = array_map(static function ($item) {
-                return $item['id'];
-            }, $bareEvents['value']);
+            $ids = array_map(static fn ($item) => $item['id'], $bareEvents['value']);
             $existingIdsInRange = $this->calendarRangeRepository->findRemoteIdsPresent($ids);
             $existingIdsInCalendar = $this->calendarRepository->findRemoteIdsPresent($ids);
 
             return array_values(
                 array_map(
-                    function ($item) {
-                        return $this->remoteEventConverter->convertToRemote($item);
-                    },
+                    fn ($item) => $this->remoteEventConverter->convertToRemote($item),
                     // filter all event to keep only the one not in range
                     array_filter(
                         $bareEvents['value'],
-                        static function ($item) use ($existingIdsInRange, $existingIdsInCalendar) {
-                            return ((!$existingIdsInRange[$item['id']]) ?? true) && ((!$existingIdsInCalendar[$item['id']]) ?? true);
-                        }
+                        static fn ($item) => ((!$existingIdsInRange[$item['id']]) ?? true) && ((!$existingIdsInCalendar[$item['id']]) ?? true)
                     )
                 )
             );
@@ -604,9 +598,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         }
 
         $this->cacheScheduleTimeForUser[$userId] = array_map(
-            function ($item) {
-                return $this->remoteEventConverter->convertAvailabilityToRemoteEvent($item);
-            },
+            fn ($item) => $this->remoteEventConverter->convertAvailabilityToRemoteEvent($item),
             $response['value'][0]['scheduleItems']
         );
 
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php b/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php
index 80b2f8c45..9195d5eac 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php
@@ -114,12 +114,8 @@ final class CalendarTypeTest extends TypeTestCase
         $this->assertEquals(8, $calendar->getCalendarRange()->getId());
         $this->assertEquals(9, $calendar->getLocation()->getId());
         $this->assertEquals(true, $calendar->getSendSMS());
-        $this->assertContains(2, $calendar->getUsers()->map(static function (User $u) {
-            return $u->getId();
-        }));
-        $this->assertContains(3, $calendar->getUsers()->map(static function (User $u) {
-            return $u->getId();
-        }));
+        $this->assertContains(2, $calendar->getUsers()->map(static fn (User $u) => $u->getId()));
+        $this->assertContains(3, $calendar->getUsers()->map(static fn (User $u) => $u->getId()));
     }
 
     protected function getExtensions()
@@ -148,25 +144,17 @@ final class CalendarTypeTest extends TypeTestCase
     ) {
         $transformer = $this->prophesize($classTransformer);
         $transformer->transform(Argument::type('array'))
-            ->will(static function ($args) {
-                return implode(
-                    ',',
-                    array_map(static function ($p) {
-                        return $p->getId();
-                    }, $args[0])
-                );
-            });
+            ->will(static fn ($args) => implode(
+                ',',
+                array_map(static fn ($p) => $p->getId(), $args[0])
+            ));
         $transformer->transform(Argument::exact(null))
             ->willReturn([]);
         $transformer->transform(Argument::type(Collection::class))
-            ->will(static function ($args) {
-                return implode(
-                    ',',
-                    array_map(static function ($p) {
-                        return $p->getId();
-                    }, $args[0]->toArray())
-                );
-            });
+            ->will(static fn ($args) => implode(
+                ',',
+                array_map(static fn ($p) => $p->getId(), $args[0]->toArray())
+            ));
         $transformer->reverseTransform(Argument::type('string'))
             ->will(static function ($args) use ($objClass) {
                 if (null === $args[0]) {
@@ -195,9 +183,7 @@ final class CalendarTypeTest extends TypeTestCase
     ) {
         $transformer = $this->prophesize($classTransformer);
         $transformer->transform(Argument::type('object'))
-            ->will(static function ($args) {
-                return (string) $args[0]->getId();
-            });
+            ->will(static fn ($args) => (string) $args[0]->getId());
         $transformer->transform(Argument::exact(null))
             ->willReturn('');
         $transformer->reverseTransform(Argument::type('string'))
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php
index 485146939..827e22381 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php
@@ -63,9 +63,7 @@ final class AddressConverterTest extends TestCase
     {
         $engine = $this->prophesize(EngineInterface::class);
         $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
-        $translatableStringHelper->localize(Argument::type('array'))->will(static function ($args): string {
-            return ($args[0] ?? ['fr' => 'not provided'])['fr'] ?? 'not provided';
-        });
+        $translatableStringHelper->localize(Argument::type('array'))->will(static fn ($args): string => ($args[0] ?? ['fr' => 'not provided'])['fr'] ?? 'not provided');
 
         $addressRender = new AddressRender($engine->reveal(), $translatableStringHelper->reveal());
 
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php
index f3e35ef93..34867d8bd 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php
@@ -72,17 +72,13 @@ final class CalendarForShortMessageProviderTest extends TestCase
             Argument::type(DateTimeImmutable::class),
             Argument::type('int'),
             Argument::exact(0)
-        )->will(static function ($args) {
-            return array_fill(0, $args[2], new Calendar());
-        })->shouldBeCalledTimes(1);
+        )->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('int'),
             Argument::not(0)
-        )->will(static function ($args) {
-            return array_fill(0, $args[2] - 1, new Calendar());
-        })->shouldBeCalledTimes(1);
+        )->will(static fn ($args) => array_fill(0, $args[2] - 1, new Calendar()))->shouldBeCalledTimes(1);
 
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->clear()->shouldBeCalled();
@@ -108,17 +104,13 @@ final class CalendarForShortMessageProviderTest extends TestCase
             Argument::type(DateTimeImmutable::class),
             Argument::type('int'),
             Argument::exact(0)
-        )->will(static function ($args) {
-            return array_fill(0, 1, new Calendar());
-        })->shouldBeCalledTimes(1);
+        )->will(static fn ($args) => array_fill(0, 1, new Calendar()))->shouldBeCalledTimes(1);
         $calendarRepository->findByNotificationAvailable(
             Argument::type(DateTimeImmutable::class),
             Argument::type(DateTimeImmutable::class),
             Argument::type('int'),
             Argument::not(0)
-        )->will(static function ($args) {
-            return [];
-        })->shouldBeCalledTimes(1);
+        )->will(static fn ($args) => [])->shouldBeCalledTimes(1);
 
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->clear()->shouldBeCalled();
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
index 41c8b4694..75dc7792f 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
@@ -58,9 +58,7 @@ class CustomFieldLongChoice extends AbstractCustomField
         $translatableStringHelper = $this->translatableStringHelper;
         $builder->add($customField->getSlug(), Select2ChoiceType::class, [
             'choices' => $entries,
-            'choice_label' => static function (Option $option) use ($translatableStringHelper) {
-                return $translatableStringHelper->localize($option->getText());
-            },
+            'choice_label' => static fn (Option $option) => $translatableStringHelper->localize($option->getText()),
             'choice_value' => static fn (Option $key): ?int => null === $key ? null : $key->getId(),
             'multiple' => false,
             'expanded' => false,
diff --git a/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php b/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php
index 328eda36a..4ef6e046d 100644
--- a/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php
+++ b/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php
@@ -57,8 +57,6 @@ class OptionRepository extends EntityRepository
             ->getQuery()
             ->getScalarResult();
 
-        return array_map(static function ($r) {
-            return $r['key'];
-        }, $keys);
+        return array_map(static fn ($r) => $r['key'], $keys);
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
index ea572759b..0630bccf5 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
@@ -70,9 +70,7 @@ class CustomFieldType extends AbstractType
         if ('entity' === $options['group_widget']) {
             $builder->add('customFieldsGroup', EntityType::class, [
                 'class' => 'ChillCustomFieldsBundle:CustomFieldsGroup',
-                'choice_label' => function ($g) {
-                    return $this->translatableStringHelper->localize($g->getName());
-                },
+                'choice_label' => fn ($g) => $this->translatableStringHelper->localize($g->getName()),
             ]);
         } elseif ('hidden' === $options['group_widget']) {
             $builder->add('customFieldsGroup', HiddenType::class);
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
index bccf797e5..2b34b498a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
@@ -38,9 +38,7 @@ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
 
         // @TODO: in the array_map callback, CustomField::getLabel() does not exist. What do we do here?
         $customFieldsLablels = array_map(
-            static function ($e) {
-                return $e->getLabel();
-            },
+            static fn ($e) => $e->getLabel(),
             $customFields
         );
 
diff --git a/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php b/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php
index b5bd10d16..5b4a8be30 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php
@@ -61,12 +61,8 @@ class DocGeneratorTemplateType extends AbstractType
             $sub = $builder
                 ->create('options', null, ['compound' => true])
                 ->addModelTransformer(new CallbackTransformer(
-                    static function (array $data) use ($context) {
-                        return $context->adminFormTransform($data);
-                    },
-                    static function (array $data) use ($context) {
-                        return $context->adminFormReverseTransform($data);
-                    }
+                    static fn (array $data) => $context->adminFormTransform($data),
+                    static fn (array $data) => $context->adminFormReverseTransform($data)
                 ));
             $context->buildAdminForm($sub);
             $builder->add($sub);
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
index 37540a2f8..15db2eed4 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
@@ -17,6 +17,6 @@ class ObjectReadyException extends RuntimeException
 {
     public function __construct()
     {
-        parent::__construct('object is already ready', 6698856);
+        parent::__construct('object is already ready', 6_698_856);
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
index 9cca0bcda..0453975b2 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
@@ -19,7 +19,7 @@ class RelatedEntityNotFoundException extends RuntimeException
     {
         parent::__construct(
             sprintf('Related entity not found: %s, %s', $relatedEntityClass, $relatedEntityId),
-            99876652,
+            99_876_652,
             $previous
         );
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index e83d3b3fc..0583e26b2 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -58,7 +58,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
      * @ORM\Column(type="integer")
      * @Serializer\Groups({"read", "write"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @var int[]
@@ -94,7 +94,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
     /**
      * @ORM\ManyToOne(targetEntity=DocGeneratorTemplate::class)
      */
-    private ?DocGeneratorTemplate $template;
+    private ?DocGeneratorTemplate $template = null;
 
     /**
      * @ORM\Column(type="text", options={"default": "ready"})
diff --git a/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
index f77083390..5ed5b5981 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
@@ -72,14 +72,10 @@ class AccompanyingCourseDocumentType extends AbstractType
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
                 'class' => DocumentCategory::class,
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('c')
-                        ->where('c.documentClass = :docClass')
-                        ->setParameter('docClass', AccompanyingCourseDocument::class);
-                },
-                'choice_label' => function ($entity = null) {
-                    return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
-                },
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('c')
+                    ->where('c.documentClass = :docClass')
+                    ->setParameter('docClass', AccompanyingCourseDocument::class),
+                'choice_label' => fn ($entity = null) => $entity ? $this->translatableStringHelper->localize($entity->getName()) : '',
             ]);
     }
 
diff --git a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
index c87cc4e73..11f73e862 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
@@ -67,14 +67,10 @@ class PersonDocumentType extends AbstractType
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
                 'class' => DocumentCategory::class,
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('c')
-                        ->where('c.documentClass = :docClass')
-                        ->setParameter('docClass', PersonDocument::class);
-                },
-                'choice_label' => function ($entity = null) {
-                    return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
-                },
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('c')
+                    ->where('c.documentClass = :docClass')
+                    ->setParameter('docClass', PersonDocument::class),
+                'choice_label' => fn ($entity = null) => $entity ? $this->translatableStringHelper->localize($entity->getName()) : '',
             ]);
 
         if ($isScopeConcerned && $this->parameterBag->get('chill_main')['acl']['form_show_scopes']) {
diff --git a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
index c538bd107..c3285507e 100644
--- a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
@@ -51,9 +51,7 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
         $persons = [];
 
         if (null !== $course) {
-            $persons = $course->getCurrentParticipations()->map(static function (AccompanyingPeriodParticipation $participation) {
-                return $participation->getPerson();
-            })->toArray();
+            $persons = $course->getCurrentParticipations()->map(static fn (AccompanyingPeriodParticipation $participation) => $participation->getPerson())->toArray();
         }
 
         return [
diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
index dafbc8b8a..1929beac1 100644
--- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
@@ -113,9 +113,7 @@ class ParticipationController extends AbstractController
                     [
                         'event_id' => current($participations)->getEvent()->getId(),
                         'persons_ids' => implode(',', array_map(
-                            static function (Participation $p) {
-                                return $p->getPerson()->getId();
-                            },
+                            static fn (Participation $p) => $p->getPerson()->getId(),
                             $participations
                         )),
                     ]
@@ -649,19 +647,14 @@ class ParticipationController extends AbstractController
 
             // create a collection of person's id participating to the event
             /** @var \Doctrine\Common\Collections\ArrayCollection $peopleParticipating */
-            $peopleParticipating = $peopleParticipating ??
-                    $participation->getEvent()->getParticipations()->map(
-                        static function (Participation $p) {
-                            return $p->getPerson()->getId();
-                        }
-                    );
+            $peopleParticipating ??= $participation->getEvent()->getParticipations()->map(
+                static fn (Participation $p) => $p->getPerson()->getId()
+            );
             // check that the user is not already in the event
             if ($peopleParticipating->contains($participation->getPerson()->getId())) {
                 $ignoredParticipations[] = $participation
                     ->getEvent()->getParticipations()->filter(
-                        static function (Participation $p) use ($participation) {
-                            return $p->getPerson()->getId() === $participation->getPerson()->getId();
-                        }
+                        static fn (Participation $p) => $p->getPerson()->getId() === $participation->getPerson()->getId()
                     )->first();
             } else {
                 $newParticipations[] = $participation;
diff --git a/src/Bundle/ChillEventBundle/Entity/Event.php b/src/Bundle/ChillEventBundle/Entity/Event.php
index 6ac9c1508..d55a7b8a8 100644
--- a/src/Bundle/ChillEventBundle/Entity/Event.php
+++ b/src/Bundle/ChillEventBundle/Entity/Event.php
@@ -176,9 +176,7 @@ class Event implements HasCenterInterface, HasScopeInterface
     {
         $iterator = $this->participations->getIterator();
 
-        $iterator->uasort(static function ($first, $second) {
-            return strnatcasecmp($first->getPerson()->getFirstName(), $second->getPerson()->getFirstName());
-        });
+        $iterator->uasort(static fn ($first, $second) => strnatcasecmp($first->getPerson()->getFirstName(), $second->getPerson()->getFirstName()));
 
         return $iterator;
     }
diff --git a/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php b/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
index 30a00ebb9..962799dbc 100644
--- a/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+++ b/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
@@ -62,9 +62,7 @@ class EventChoiceLoader implements ChoiceLoaderInterface
     {
         return new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
             $this->lazyLoadedEvents,
-            static function (Event $p) use ($value) {
-                return call_user_func($value, $p);
-            }
+            static fn (Event $p) => call_user_func($value, $p)
         );
     }
 
diff --git a/src/Bundle/ChillEventBundle/Form/RoleType.php b/src/Bundle/ChillEventBundle/Form/RoleType.php
index 9c56d17e6..519e814cf 100644
--- a/src/Bundle/ChillEventBundle/Form/RoleType.php
+++ b/src/Bundle/ChillEventBundle/Form/RoleType.php
@@ -38,9 +38,7 @@ class RoleType extends AbstractType
             ->add('active')
             ->add('type', EntityType::class, [
                 'class' => EventType::class,
-                'choice_label' => function (EventType $e) {
-                    return $this->translatableStringHelper->localize($e->getName());
-                },
+                'choice_label' => fn (EventType $e) => $this->translatableStringHelper->localize($e->getName()),
             ]);
     }
 
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php b/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
index 4e8179f10..05436b3e8 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
@@ -109,16 +109,12 @@ class PickEventType extends AbstractType
         // add the default options
         $resolver->setDefaults([
             'class' => Event::class,
-            'choice_label' => static function (Event $e) {
-                return $e->getDate()->format('d/m/Y, H:i') . ' → ' .
-                        // $e->getType()->getName()['fr'] . ':  ' .    // display the type of event
-                        $e->getName();
-            },
+            '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',
             'attr' => ['class' => 'select2 '],
-            'choice_attr' => static function (Event $e) {
-                return ['data-center' => $e->getCenter()->getId()];
-            },
+            'choice_attr' => static fn (Event $e) => ['data-center' => $e->getCenter()->getId()],
             'choiceloader' => function (Options $options) {
                 $centers = $this->filterCenters($options);
 
@@ -143,9 +139,7 @@ class PickEventType extends AbstractType
         // option role
         if (null === $options['role']) {
             $centers = array_map(
-                static function (GroupCenter $g) {
-                    return $g->getCenter();
-                },
+                static fn (GroupCenter $g) => $g->getCenter(),
                 $this->user->getGroupCenters()->toArray()
             );
         } else {
@@ -173,9 +167,7 @@ class PickEventType extends AbstractType
 
                 if (
                     !in_array($c->getId(), array_map(
-                        static function (Center $c) {
-                            return $c->getId();
-                        },
+                        static fn (Center $c) => $c->getId(),
                         $centers
                     ), true)
                 ) {
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php b/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php
index eacdc78f1..d027c05cf 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php
@@ -39,16 +39,10 @@ class PickEventTypeType extends AbstractType
         $resolver->setDefaults(
             [
                 'class' => EventType::class,
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('et')
-                        ->where('et.active = true');
-                },
-                'choice_label' => static function (EventType $t) use ($helper) {
-                    return $helper->localize($t->getName());
-                },
-                'choice_attrs' => static function (EventType $t) {
-                    return ['data-link-category' => $t->getId()];
-                },
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('et')
+                    ->where('et.active = true'),
+                'choice_label' => static fn (EventType $t) => $helper->localize($t->getName()),
+                'choice_attrs' => static fn (EventType $t) => ['data-link-category' => $t->getId()],
             ]
         );
     }
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php b/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
index 95864056a..8fd8ff7d7 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
@@ -80,9 +80,7 @@ class PickRoleType extends AbstractType
                         $options = $config->getOptions();
 
                         $form->getParent()->add($name, $type, array_replace($options, [
-                            'group_by' => function (Role $r) {
-                                return $this->translatableStringHelper->localize($r->getType()->getName());
-                            },
+                            'group_by' => fn (Role $r) => $this->translatableStringHelper->localize($r->getType()->getName()),
                         ]));
                     }
                 }
@@ -111,17 +109,13 @@ class PickRoleType extends AbstractType
             'class' => Role::class,
             'query_builder' => $qb,
             'group_by' => null,
-            'choice_attr' => static function (Role $r) {
-                return [
-                    'data-event-type' => $r->getType()->getId(),
-                    'data-link-category' => $r->getType()->getId(),
-                ];
-            },
-            'choice_label' => static function (Role $r) use ($translatableStringHelper, $translator) {
-                return $translatableStringHelper->localize($r->getName()) .
-                          ($r->getActive() === true ? '' :
-                                ' (' . $translator->trans('unactive') . ')');
-            },
+            'choice_attr' => static fn (Role $r) => [
+                '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') . ')'),
         ]);
     }
 
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php b/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
index 4d96ed95d..dcc3ba205 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
@@ -82,9 +82,7 @@ class PickStatusType extends AbstractType
                     $type = $config->getType()->getName();
                     $options = $config->getOptions();
                     $form->getParent()->add($name, $type, array_replace($options, [
-                        'group_by' => function (Status $s) {
-                            return $this->translatableStringHelper->localize($s->getType()->getName());
-                        },
+                        'group_by' => fn (Status $s) => $this->translatableStringHelper->localize($s->getType()->getName()),
                     ]));
                 }
             );
@@ -112,17 +110,13 @@ class PickStatusType extends AbstractType
             'class' => Status::class,
             'query_builder' => $qb,
             'group_by' => null,
-            'choice_attr' => static function (Status $s) {
-                return [
-                    'data-event-type' => $s->getType()->getId(),
-                    'data-link-category' => $s->getType()->getId(),
-                ];
-            },
-            'choice_label' => static function (Status $s) use ($translatableStringHelper, $translator) {
-                return $translatableStringHelper->localize($s->getName()) .
-                          ($s->getActive() === true ? '' :
-                                ' (' . $translator->trans('unactive') . ')');
-            },
+            'choice_attr' => static fn (Status $s) => [
+                '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') . ')'),
         ]);
     }
 
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
index fa1ecabbe..d61c1f385 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
@@ -239,9 +239,7 @@ final class ParticipationControllerTest extends WebTestCase
         $this->personsIdsCache = array_merge(
             $this->personsIdsCache,
             $event->getParticipations()->map(
-                static function ($p) {
-                    return $p->getPerson()->getId();
-                }
+                static fn ($p) => $p->getPerson()->getId()
             )
                 ->toArray()
         );
@@ -305,9 +303,7 @@ final class ParticipationControllerTest extends WebTestCase
         $event = $this->getRandomEventWithMultipleParticipations();
 
         $persons_id = implode(',', $event->getParticipations()->map(
-            static function ($p) {
-                return $p->getPerson()->getId();
-            }
+            static fn ($p) => $p->getPerson()->getId()
         )->toArray());
 
         $crawler = $this->client->request(
@@ -333,9 +329,7 @@ final class ParticipationControllerTest extends WebTestCase
         $nbParticipations = $event->getParticipations()->count();
         // get the persons_id participating on this event
         $persons_id = $event->getParticipations()->map(
-            static function ($p) {
-                return $p->getPerson()->getId();
-            }
+            static fn ($p) => $p->getPerson()->getId()
         )->toArray();
         // exclude the existing persons_ids from the new person
         $this->personsIdsCache = array_merge($this->personsIdsCache, $persons_id);
@@ -464,9 +458,7 @@ final class ParticipationControllerTest extends WebTestCase
 
         $circles = $this->em->getRepository(\Chill\MainBundle\Entity\Scope::class)
             ->findAll();
-        array_filter($circles, static function ($circle) use ($circleName) {
-            return 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)
diff --git a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
index c1ae84b95..9fac6c88e 100644
--- a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
+++ b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
@@ -208,9 +208,7 @@ class TimelineEventProvider implements TimelineProviderInterface
 
         foreach ($reachableCenters as $center) {
             $reachableCircleId = array_map(
-                static function (Scope $scope) {
-                    return $scope->getId();
-                },
+                static fn (Scope $scope) => $scope->getId(),
                 $this->helper->getReachableCircles($this->user, $role, $person->getCenter())
             );
             $centerAndScopeLines[] = sprintf(
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index 9e6555025..730ac32c1 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -230,7 +230,7 @@ class CRUDController extends AbstractController
      */
     protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
     {
-        $formClass = $formClass ?? $this->getFormClassFor($action);
+        $formClass ??= $this->getFormClassFor($action);
 
         $form = $this->createForm($formClass, $entity, $formOptions);
 
diff --git a/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php b/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
index 76da401a3..4fbf5961d 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
@@ -141,9 +141,7 @@ class CRUDRoutesLoader extends Loader
 
             $methods = array_keys(array_filter(
                 $action['methods'],
-                static function ($value, $key) {
-                    return $value;
-                },
+                static fn ($value, $key) => $value,
                 ARRAY_FILTER_USE_BOTH
             ));
 
diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
index a6e876b6d..327a06df6 100644
--- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
@@ -282,9 +282,7 @@ class NotificationController extends AbstractController
 
         if ($request->query->has('edit')) {
             $commentId = $request->query->getInt('edit');
-            $editedComment = $notification->getComments()->filter(static function (NotificationComment $c) use ($commentId) {
-                return $c->getId() === $commentId;
-            })->first();
+            $editedComment = $notification->getComments()->filter(static fn (NotificationComment $c) => $c->getId() === $commentId)->first();
 
             if (false === $editedComment) {
                 throw $this->createNotFoundException("Comment with id {$commentId} does not exists nor belong to this notification");
diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
index 372d0d7d1..5d32a8dbb 100644
--- a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
@@ -158,9 +158,7 @@ class PermissionsGroupController extends AbstractController
             'edit_form' => $editForm->createView(),
             'role_scopes_sorted' => $roleScopesSorted,
             'expanded_roles' => $this->getExpandedRoles($permissionsGroup->getRoleScopes()->toArray()),
-            'delete_role_scopes_form' => array_map(static function ($form) {
-                return $form->createView();
-            }, $deleteRoleScopesForm),
+            'delete_role_scopes_form' => array_map(static fn ($form) => $form->createView(), $deleteRoleScopesForm),
             'add_role_scopes_form' => $addRoleScopesForm->createView(),
         ]);
     }
@@ -305,9 +303,7 @@ class PermissionsGroupController extends AbstractController
             'role_scopes_sorted' => $roleScopesSorted,
             'edit_form' => $editForm->createView(),
             'expanded_roles' => $this->getExpandedRoles($permissionsGroup->getRoleScopes()->toArray()),
-            'delete_role_scopes_form' => array_map(static function ($form) {
-                return $form->createView();
-            }, $deleteRoleScopesForm),
+            'delete_role_scopes_form' => array_map(static fn ($form) => $form->createView(), $deleteRoleScopesForm),
             'add_role_scopes_form' => $addRoleScopesForm->createView(),
         ]);
     }
@@ -449,9 +445,7 @@ class PermissionsGroupController extends AbstractController
             'role_scopes_sorted' => $roleScopesSorted,
             'edit_form' => $editForm->createView(),
             'expanded_roles' => $this->getExpandedRoles($permissionsGroup->getRoleScopes()->toArray()),
-            'delete_role_scopes_form' => array_map(static function ($form) {
-                return $form->createView();
-            }, $deleteRoleScopesForm),
+            'delete_role_scopes_form' => array_map(static fn ($form) => $form->createView(), $deleteRoleScopesForm),
             'add_role_scopes_form' => $addRoleScopesForm->createView(),
         ]);
     }
@@ -573,9 +567,7 @@ class PermissionsGroupController extends AbstractController
             if (!array_key_exists($roleScope->getRole(), $expandedRoles)) {
                 $expandedRoles[$roleScope->getRole()] =
                       array_map(
-                          static function (Role $role) {
-                              return $role->getRole();
-                          },
+                          static fn (Role $role) => $role->getRole(),
                           $this->roleHierarchy
                               ->getReachableRoles(
                                   [new Role($roleScope->getRole())]
diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index 9d3941411..ecf8a3c9c 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -337,14 +337,13 @@ class UserController extends CRUDController
                 [
                     'add_groupcenter_form' => $this->createAddLinkGroupCenterForm($entity, $request)->createView(),
                     'delete_groupcenter_form' => array_map(
-                        static function (Form $form) {
-                            return $form->createView();
-                        },
+                        static fn (Form $form) => $form->createView(),
                         iterator_to_array($this->getDeleteLinkGroupCenterByUser($entity, $request), true)
                     ),
                 ]
             );
-        } elseif ('index' === $action) {
+        }
+        if ('index' === $action) {
             return array_merge(
                 ['allow_change_password' => $this->parameterBag->get('chill_main.access_user_change_password')],
                 $defaultTemplateParameters
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
index ee09cc1a6..36647612b 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
@@ -345,12 +345,10 @@ class WorkflowController extends AbstractController
             if ($transitionForm->isSubmitted() && $transitionForm->isValid()) {
                 if (!$workflow->can($entityWorkflow, $transition = $transitionForm['transition']->getData()->getName())) {
                     $blockers = $workflow->buildTransitionBlockerList($entityWorkflow, $transition);
-                    $msgs = array_map(function (TransitionBlocker $tb) {
-                        return $this->translator->trans(
-                            $tb->getMessage(),
-                            $tb->getParameters()
-                        );
-                    }, iterator_to_array($blockers));
+                    $msgs = array_map(fn (TransitionBlocker $tb) => $this->translator->trans(
+                        $tb->getMessage(),
+                        $tb->getParameters()
+                    ), iterator_to_array($blockers));
 
                     throw $this->createAccessDeniedException(
                         sprintf(
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
index ae53f09df..d6a27c943 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
@@ -37,9 +37,7 @@ class MenuCompilerPass implements CompilerPassInterface
             ];
         }
 
-        usort($services, static function ($a, $b) {
-            return $a['priority'] <=> $b['priority'];
-        });
+        usort($services, static fn ($a, $b) => $a['priority'] <=> $b['priority']);
 
         foreach ($services as $service) {
             $class = $container->getDefinition($service['id'])->getClass();
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Greatest.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Greatest.php
index b9ca9c4b6..c76bd22cf 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Greatest.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Greatest.php
@@ -33,9 +33,7 @@ class Greatest extends FunctionNode
 
     public function getSql(SqlWalker $sqlWalker)
     {
-        return 'GREATEST(' . implode(', ', array_map(static function (Node $expr) use ($sqlWalker) {
-            return $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/Least.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Least.php
index 0c8a1b17d..9befa5f40 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Least.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Least.php
@@ -33,9 +33,7 @@ class Least extends FunctionNode
 
     public function getSql(SqlWalker $sqlWalker)
     {
-        return 'LEAST(' . implode(', ', array_map(static function (Node $expr) use ($sqlWalker) {
-            return $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/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index 8bf4d1be5..1bd1a453a 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -149,7 +149,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
      * @Groups({"write"})
      * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
      */
-    private ?ThirdParty $linkedToThirdParty;
+    private ?ThirdParty $linkedToThirdParty = null;
 
     /**
      * A geospatial field storing the coordinates of the Address.
diff --git a/src/Bundle/ChillMainBundle/Entity/AddressReference.php b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
index 57421749f..e75402c5f 100644
--- a/src/Bundle/ChillMainBundle/Entity/AddressReference.php
+++ b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
@@ -55,7 +55,7 @@ class AddressReference
      * @ORM\Column(type="integer")
      * @groups({"read"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
@@ -79,7 +79,7 @@ class AddressReference
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
      * @groups({"read"})
      */
-    private ?PostalCode $postcode;
+    private ?PostalCode $postcode = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
diff --git a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
index 37735bbc2..ea017f053 100644
--- a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
+++ b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
@@ -36,7 +36,7 @@ class GeographicalUnit
     /**
      * @ORM\ManyToOne(targetEntity=GeographicalUnitLayer::class, inversedBy="units")
      */
-    private ?GeographicalUnitLayer $layer;
+    private ?GeographicalUnitLayer $layer = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php
index b8586b2e6..dc81b1b54 100644
--- a/src/Bundle/ChillMainBundle/Entity/Notification.php
+++ b/src/Bundle/ChillMainBundle/Entity/Notification.php
@@ -120,12 +120,12 @@ class Notification implements TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime_immutable")
      */
-    private ?DateTimeImmutable $updatedAt;
+    private ?DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      */
-    private ?User $updatedBy;
+    private ?User $updatedBy = null;
 
     public function __construct()
     {
diff --git a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
index fa505e550..6c0d0be5b 100644
--- a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
+++ b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
@@ -121,9 +121,7 @@ class PermissionsGroup
     public function isRoleScopePresentOnce(ExecutionContextInterface $context)
     {
         $roleScopesId = array_map(
-            static function (RoleScope $roleScope) {
-                return $roleScope->getId();
-            },
+            static fn (RoleScope $roleScope) => $roleScope->getId(),
             $this->getRoleScopes()->toArray()
         );
         $countedIds = array_count_values($roleScopesId);
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
index e43d524a4..1f3070eb2 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
@@ -291,9 +291,7 @@ class EntityWorkflowStep
 
     public function removeDestEmail(string $email): self
     {
-        $this->destEmail = array_filter($this->destEmail, static function (string $existing) use ($email) {
-            return $email !== $existing;
-        });
+        $this->destEmail = array_filter($this->destEmail, static fn (string $existing) => $email !== $existing);
 
         return $this;
     }
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
index 7dc6f120f..b84c80118 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
@@ -199,9 +199,7 @@ class CSVListFormatter 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) {
-                return $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);
         }
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
index b062a9c3c..63d691443 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
@@ -187,9 +187,7 @@ class CSVPivotedListFormatter 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) {
-                return $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);
         }
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
index 66db056c4..dc09c55a1 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
@@ -445,7 +445,7 @@ class SpreadSheetFormatter implements FormatterInterface
             $this->initializeCache($key);
         }
 
-        $value = $value ?? '';
+        $value ??= '';
 
         return call_user_func($this->cacheDisplayableResult[$key], $value);
     }
diff --git a/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php b/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php
index c9882f557..fca338a6f 100644
--- a/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php
+++ b/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php
@@ -249,7 +249,7 @@ class ExportAddressHelper
             if (($params & $bitmask) === $bitmask) {
                 if ('geographical_units' === $key) {
                     // geographical unit generate keys dynamically, depending on layers
-                    $prefixes = array_merge($prefixes, array_keys($this->generateKeysForUnitsNames($prefix)), array_keys($this->generateKeysForUnitsRefs($prefix)));
+                    $prefixes = [...$prefixes, ...array_keys($this->generateKeysForUnitsNames($prefix)), ...array_keys($this->generateKeysForUnitsRefs($prefix))];
 
                     continue;
                 }
@@ -257,9 +257,7 @@ class ExportAddressHelper
                 $prefixes = array_merge(
                     $prefixes,
                     array_map(
-                        static function ($item) use ($prefix) {
-                            return $prefix . $item;
-                        },
+                        static fn ($item) => $prefix . $item,
                         self::COLUMN_MAPPING[$key]
                     )
                 );
diff --git a/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php b/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
index bb9b180f5..174fb3304 100644
--- a/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
+++ b/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
@@ -48,9 +48,7 @@ class PostalCodeChoiceLoader implements ChoiceLoaderInterface
     {
         return new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
             $this->lazyLoadedPostalCodes,
-            static function (?PostalCode $pc = null) use ($value) {
-                return call_user_func($value, $pc);
-            }
+            static fn (?PostalCode $pc = null) => call_user_func($value, $pc)
         );
     }
 
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
index 52e053795..01303bfbb 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
@@ -37,9 +37,7 @@ class ExportPickCenterDataMapper implements DataMapperInterface
 
         foreach ($this->regroupmentRepository->findAll() as $regroupment) {
             /** @phpstan-ignore-next-line  */
-            [$contained, $notContained] = $regroupment->getCenters()->partition(static function (Center $center): bool {
-                return false;
-            });
+            [$contained, $notContained] = $regroupment->getCenters()->partition(static fn (Center $center): bool => false);
 
             if (0 === count($notContained)) {
                 $pickedRegroupment[] = $regroupment;
diff --git a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
index cc215e7aa..6aa5eee40 100644
--- a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
@@ -42,9 +42,7 @@ class IdToEntityDataTransformer implements DataTransformerInterface
     {
         $this->repository = $repository;
         $this->multiple = $multiple;
-        $this->getId = $getId ?? static function (object $o) {
-            return $o->getId();
-        };
+        $this->getId = $getId ?? static fn (object $o) => $o->getId();
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Form/LocationFormType.php b/src/Bundle/ChillMainBundle/Form/LocationFormType.php
index 5a6776daf..ff2c563d3 100644
--- a/src/Bundle/ChillMainBundle/Form/LocationFormType.php
+++ b/src/Bundle/ChillMainBundle/Form/LocationFormType.php
@@ -36,15 +36,11 @@ final class LocationFormType extends AbstractType
         $builder
             ->add('locationType', EntityType::class, [
                 'class' => EntityLocationType::class,
-                'choice_attr' => static function (EntityLocationType $entity) {
-                    return [
-                        'data-address' => $entity->getAddressRequired(),
-                        'data-contact' => $entity->getContactData(),
-                    ];
-                },
-                'choice_label' => function (EntityLocationType $entity) {
-                    return $this->translatableStringHelper->localize($entity->getTitle());
-                },
+                'choice_attr' => static fn (EntityLocationType $entity) => [
+                    'data-address' => $entity->getAddressRequired(),
+                    'data-contact' => $entity->getContactData(),
+                ],
+                'choice_label' => fn (EntityLocationType $entity) => $this->translatableStringHelper->localize($entity->getTitle()),
             ])
             ->add('name', TextType::class)
             ->add('phonenumber1', ChillPhoneNumberType::class, ['required' => false])
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php
index cfc838f5a..48bd37dcc 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php
@@ -24,14 +24,10 @@ class ComposedGroupCenterType extends AbstractType
     {
         $builder->add('permissionsgroup', EntityType::class, [
             'class' => \Chill\MainBundle\Entity\PermissionsGroup::class,
-            'choice_label' => static function (PermissionsGroup $group) {
-                return $group->getName();
-            },
+            'choice_label' => static fn (PermissionsGroup $group) => $group->getName(),
         ])->add('center', EntityType::class, [
             'class' => \Chill\MainBundle\Entity\Center::class,
-            'choice_label' => static function (Center $center) {
-                return $center->getName();
-            },
+            'choice_label' => static fn (Center $center) => $center->getName(),
         ]);
     }
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
index 9175af23f..38f1475d5 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
@@ -82,16 +82,12 @@ class ComposedRoleScopeType extends AbstractType
 
                     return ['data-has-scope' => '1'];
                 },
-                'group_by' => function ($role, $key, $index) {
-                    return $this->roleProvider->getRoleTitle($role);
-                },
+                'group_by' => fn ($role, $key, $index) => $this->roleProvider->getRoleTitle($role),
             ])
             ->add('scope', EntityType::class, [
                 'class' => Scope::class,
+                'choice_label' => static fn (Scope $scope) => $translatableStringHelper->localize($scope->getName()),
                 'placeholder' => 'Choose amongst scopes',
-                'choice_label' => static function (Scope $scope) use ($translatableStringHelper) {
-                    return $translatableStringHelper->localize($scope->getName());
-                },
                 'required' => false,
                 'data' => null,
             ]);
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
index d4759a794..529bd9789 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
@@ -51,9 +51,7 @@ class EntityToJsonTransformer implements DataTransformerInterface
             }
 
             return array_map(
-                function ($item) {
-                    return $this->denormalizeOne($item);
-                },
+                fn ($item) => $this->denormalizeOne($item),
                 $denormalized
             );
         }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index 8287a8814..c89907cf3 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -67,9 +67,7 @@ final class PickCenterType extends AbstractType
             'choices' => $centers,
             'multiple' => true,
             'expanded' => true,
-            'choice_label' => static function (Center $c) {
-                return $c->getName();
-            },
+            'choice_label' => static fn (Center $c) => $c->getName(),
             'data' => $centers,
         ]);
 
@@ -80,9 +78,7 @@ final class PickCenterType extends AbstractType
                 'multiple' => true,
                 'expanded' => true,
                 'choices' => $this->regroupmentRepository->findAllActive(),
-                'choice_label' => static function (Regroupment $r) {
-                    return $r->getName();
-                },
+                'choice_label' => static fn (Regroupment $r) => $r->getName(),
             ]);
         }
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
index 0f6dd44bc..83e957623 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
@@ -90,9 +90,7 @@ class PickCenterType extends AbstractType
 
                     return ['center' => $data];
                 },
-                static function ($data) {
-                    return $data['center'];
-                }
+                static fn ($data) => $data['center']
             ));
     }
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php b/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php
index 84342dfc3..adb0f2a67 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php
@@ -34,17 +34,13 @@ class PickCivilityType extends AbstractType
             ->setDefault('label', 'Civility')
             ->setDefault(
                 'choice_label',
-                function (Civility $civility): string {
-                    return $this->translatableStringHelper->localize($civility->getName());
-                }
+                fn (Civility $civility): string => $this->translatableStringHelper->localize($civility->getName())
             )
             ->setDefault(
                 'query_builder',
-                static function (EntityRepository $er): QueryBuilder {
-                    return $er->createQueryBuilder('c')
-                        ->where('c.active = true')
-                        ->orderBy('c.order');
-                },
+                static fn (EntityRepository $er): QueryBuilder => $er->createQueryBuilder('c')
+                    ->where('c.active = true')
+                    ->orderBy('c.order'),
             )
             ->setDefault('placeholder', 'choose civility')
             ->setDefault('class', Civility::class);
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickLocationTypeType.php b/src/Bundle/ChillMainBundle/Form/Type/PickLocationTypeType.php
index 6774e0941..3d993c9f1 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickLocationTypeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickLocationTypeType.php
@@ -31,9 +31,7 @@ class PickLocationTypeType extends AbstractType
         $resolver
             ->setDefaults([
                 'class' => LocationType::class,
-                'choice_label' => function (LocationType $type) {
-                    return $this->translatableStringHelper->localize($type->getTitle());
-                },
+                'choice_label' => fn (LocationType $type) => $this->translatableStringHelper->localize($type->getTitle()),
                 'placeholder' => 'Pick a location type',
                 'required' => false,
                 'attr' => ['class' => 'select2'],
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php
index 792daa39e..d78957f29 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php
@@ -36,11 +36,9 @@ class PickUserLocationType extends AbstractType
             ->setDefaults([
                 'class' => Location::class,
                 'choices' => $this->locationRepository->findByPublicLocations(),
-                'choice_label' => function (Location $entity) {
-                    return $entity->getName() ?
-                        $entity->getName() . ' (' . $this->translatableStringHelper->localize($entity->getLocationType()->getTitle()) . ')' :
-                        $this->translatableStringHelper->localize($entity->getLocationType()->getTitle());
-                },
+                'choice_label' => fn (Location $entity) => $entity->getName() ?
+                    $entity->getName() . ' (' . $this->translatableStringHelper->localize($entity->getLocationType()->getTitle()) . ')' :
+                    $this->translatableStringHelper->localize($entity->getLocationType()->getTitle()),
                 'placeholder' => 'Pick a location',
                 'required' => false,
                 'attr' => ['class' => 'select2'],
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php b/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
index 60fefddfa..51a321be6 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
@@ -77,10 +77,8 @@ class PostalCodeType extends AbstractType
         $helper = $this->translatableStringHelper;
         $resolver
             ->setDefault('class', PostalCode::class)
-            ->setDefault('choice_label', static function (PostalCode $code) use ($helper) {
-                return $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/ScopePickerType.php b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
index 2529a0655..c86684a8a 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
@@ -67,9 +67,7 @@ class ScopePickerType extends AbstractType
                     $options['role'] instanceof Role ? $options['role']->getRole() : $options['role'],
                     $options['center']
                 ),
-                static function (Scope $s) {
-                    return $s->isActive();
-                }
+                static fn (Scope $s) => $s->isActive()
             )
         );
 
@@ -81,9 +79,7 @@ class ScopePickerType extends AbstractType
             $builder->add('scope', EntityType::class, [
                 'class' => Scope::class,
                 'placeholder' => 'Choose the circle',
-                'choice_label' => function (Scope $c) {
-                    return $this->translatableStringHelper->localize($c->getName());
-                },
+                'choice_label' => fn (Scope $c) => $this->translatableStringHelper->localize($c->getName()),
                 'choices' => $items,
             ]);
             $builder->setDataMapper(new ScopePickerDataMapper());
diff --git a/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php b/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php
index 6b1bb357a..c430a1053 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php
@@ -79,9 +79,7 @@ class UserPickerType extends AbstractType
             ->setAllowedTypes('having_permissions_group_flag', ['string', 'null'])
             ->setDefault('class', User::class)
             ->setDefault('placeholder', 'Choose an user')
-            ->setDefault('choice_label', function (User $u) {
-                return $this->userRender->renderString($u, []);
-            })
+            ->setDefault('choice_label', fn (User $u) => $this->userRender->renderString($u, []))
             ->setDefault('scope', null)
             ->setAllowedTypes('scope', [Scope::class, 'array', 'null'])
             ->setNormalizer('choices', function (Options $options) {
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index e2255a1ab..f8485aa99 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -77,18 +77,14 @@ class UserType extends AbstractType
                 'required' => false,
                 'placeholder' => 'Choose a main scope',
                 'class' => Scope::class,
-                'choice_label' => function (Scope $c) {
-                    return $this->translatableStringHelper->localize($c->getName());
-                },
+                'choice_label' => fn (Scope $c) => $this->translatableStringHelper->localize($c->getName()),
             ])
             ->add('userJob', EntityType::class, [
                 'label' => 'user job',
                 'required' => false,
                 'placeholder' => 'choose a job',
                 'class' => UserJob::class,
-                'choice_label' => function (UserJob $c) {
-                    return $this->translatableStringHelper->localize($c->getLabel());
-                },
+                'choice_label' => fn (UserJob $c) => $this->translatableStringHelper->localize($c->getLabel()),
                 'query_builder' => static function (EntityRepository $er) {
                     $qb = $er->createQueryBuilder('uj');
                     $qb->where('uj.active = TRUE');
@@ -101,9 +97,7 @@ class UserType extends AbstractType
                 'required' => false,
                 'placeholder' => 'choose a location',
                 'class' => Location::class,
-                'choice_label' => function (Location $l) {
-                    return $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');
diff --git a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
index f68a2a41c..c6278d133 100644
--- a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
+++ b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
@@ -69,9 +69,7 @@ class WorkflowStepType extends AbstractType
 
             $choices = array_combine(
                 array_map(
-                    static function (Transition $transition) {
-                        return $transition->getName();
-                    },
+                    static fn (Transition $transition) => $transition->getName(),
                     $transitions
                 ),
                 $transitions
@@ -88,14 +86,10 @@ class WorkflowStepType extends AbstractType
                         'backward' => 'backward',
                         'neutral' => 'neutral',
                     ],
-                    'choice_label' => function (string $key) use ($inputLabels) {
-                        return $this->translatableStringHelper->localize($inputLabels[$key]);
-                    },
-                    'choice_attr' => static function (string $key) {
-                        return [
-                            $key => $key,
-                        ];
-                    },
+                    'choice_label' => fn (string $key) => $this->translatableStringHelper->localize($inputLabels[$key]),
+                    'choice_attr' => static fn (string $key) => [
+                        $key => $key,
+                    ],
                     'mapped' => false,
                     'expanded' => true,
                     'data' => 'forward',
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
index ea5ed2062..e4ee3b062 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
@@ -72,7 +72,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                     ]
                 )
                 ->setExtras([
-                    'order' => -9999999,
+                    'order' => -9_999_999,
                     'icon' => 'map-marker',
                 ]);
 
@@ -84,7 +84,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                     'route' => 'chill_main_user_absence_index',
                 ])
                 ->setExtras([
-                    'order' => -8888888,
+                    'order' => -8_888_888,
                 ]);
 
             $menu
@@ -116,7 +116,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                         ['route' => 'change_my_password']
                     )
                     ->setExtras([
-                        'order' => 99999999998,
+                        'order' => 99_999_999_998,
                     ]);
             }
         }
@@ -129,7 +129,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                 ]
             )
             ->setExtras([
-                'order' => 99999999999,
+                'order' => 99_999_999_999,
                 'icon' => 'power-off',
             ]);
     }
diff --git a/src/Bundle/ChillMainBundle/Search/SearchProvider.php b/src/Bundle/ChillMainBundle/Search/SearchProvider.php
index a6b17133f..095b749bc 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchProvider.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchProvider.php
@@ -90,9 +90,7 @@ class SearchProvider
     public function getByOrder()
     {
         //sort the array
-        uasort($this->searchServices, static function (SearchInterface $a, SearchInterface $b) {
-            return $a->getOrder() <=> $b->getOrder();
-        });
+        uasort($this->searchServices, static fn (SearchInterface $a, SearchInterface $b) => $a->getOrder() <=> $b->getOrder());
 
         return $this->searchServices;
     }
@@ -115,9 +113,7 @@ class SearchProvider
     public function getHasAdvancedFormSearchServices()
     {
         //sort the array
-        uasort($this->hasAdvancedFormSearchServices, static function (HasAdvancedSearchFormInterface $a, HasAdvancedSearchFormInterface $b): int {
-            return $a->getOrder() <=> $b->getOrder();
-        });
+        uasort($this->hasAdvancedFormSearchServices, static fn (HasAdvancedSearchFormInterface $a, HasAdvancedSearchFormInterface $b): int => $a->getOrder() <=> $b->getOrder());
 
         return $this->hasAdvancedFormSearchServices;
     }
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
index 88a9cb4c5..c06ded0a8 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
@@ -54,9 +54,7 @@ class AddressReferenceBEFromBestAddress
             throw new RuntimeException('could not get the release definition', 0, $e);
         }
 
-        $asset = array_filter($release['assets'], static function (array $item) use ($lang, $list) {
-            return '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'];
     }
diff --git a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
index 64acd072a..aa04c9ac3 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
@@ -82,9 +82,7 @@ class PostalCodeBEFromBestAddress
             throw new RuntimeException('could not get the release definition', 0, $e);
         }
 
-        $postals = array_filter($release['assets'], static function (array $item) use ($lang) {
-            return '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/Mailer/ChillMailer.php b/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
index 4658d7e3b..36374c6af 100644
--- a/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
+++ b/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
@@ -39,9 +39,7 @@ class ChillMailer implements MailerInterface
         }
 
         $this->chillLogger->info('chill email sent', [
-            'to' => array_map(static function (Address $address) {
-                return $address->getAddress();
-            }, $message->getTo()),
+            'to' => array_map(static fn (Address $address) => $address->getAddress(), $message->getTo()),
             'subject' => $message->getSubject(),
         ]);
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
index 9246cf1e6..d641b94a8 100644
--- a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
@@ -134,9 +134,7 @@ final class NotificationTest extends KernelTestCase
         $this->assertEquals($senderId, $notification->getSender()->getId());
         $this->assertCount(count($addressesIds), $notification->getUnreadBy());
 
-        $unreadIds = $notification->getUnreadBy()->map(static function (User $u) {
-            return $u->getId();
-        });
+        $unreadIds = $notification->getUnreadBy()->map(static fn (User $u) => $u->getId());
 
         foreach ($addressesIds as $addresseeId) {
             $this->assertContains($addresseeId, $unreadIds);
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
index ce41c9a21..0e37f0fde 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
@@ -96,9 +96,7 @@ final class ScopePickerTypeTest extends TypeTestCase
 
         $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
         $translatableStringHelper->localize(Argument::type('array'))->will(
-            static function ($args) {
-                return $args[0]['fr'];
-            }
+            static fn ($args) => $args[0]['fr']
         );
 
         $type = new ScopePickerType(
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
index 392e9a4ff..49419f261 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
@@ -52,9 +52,7 @@ final class ExtractDateFromPatternTest extends TestCase
         $this->assertContainsOnlyInstancesOf(DateTimeImmutable::class, $result->getFound());
 
         $dates = array_map(
-            static function (DateTimeImmutable $d) {
-                return $d->format('Y-m-d');
-            },
+            static fn (DateTimeImmutable $d) => $d->format('Y-m-d'),
             $result->getFound()
         );
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
index 8e3c27e99..8c681bfb0 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
@@ -211,9 +211,7 @@ final class AuthorizationHelperTest extends KernelTestCase
                 $centerA
             );
 
-        $usernames = array_map(static function (User $u) {
-            return $u->getUsername();
-        }, $users);
+        $usernames = array_map(static fn (User $u) => $u->getUsername(), $users);
 
         $this->assertContains('center a_social', $usernames);
     }
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
index 192ca0712..f3e04eeca 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
@@ -105,9 +105,7 @@ class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterfac
                     [
                         '%users%' => implode(
                             ', ',
-                            $entityWorkflow->getCurrentStep()->getAllDestUser()->map(function (User $u) {
-                                return $this->userRender->renderString($u, []);
-                            })->toArray()
+                            $entityWorkflow->getCurrentStep()->getAllDestUser()->map(fn (User $u) => $this->userRender->renderString($u, []))->toArray()
                         ),
                     ]
                 ));
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
index f02341ff7..76ad4a4b0 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
@@ -109,9 +109,7 @@ class NotificationOnTransition implements EventSubscriberInterface
                 'dest' => $subscriber,
                 'place' => $place,
                 'workflow' => $workflow,
-                'is_dest' => in_array($subscriber->getId(), array_map(static function (User $u) {
-                    return $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/Validator/EntityWorkflowCreationValidator.php b/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
index 0c8d1c72f..bb3586251 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
@@ -59,9 +59,7 @@ class EntityWorkflowCreationValidator extends \Symfony\Component\Validator\Const
 
         $workflows = $this->entityWorkflowManager->getSupportedWorkflows($value);
 
-        $matched = array_filter($workflows, static function (WorkflowInterface $workflow) use ($value) {
-            return $workflow->getName() === $value->getWorkflowName();
-        });
+        $matched = array_filter($workflows, static fn (WorkflowInterface $workflow) => $workflow->getName() === $value->getWorkflowName());
 
         if (0 === count($matched)) {
             $this->context->buildViolation($constraint->messageWorkflowNotAvailable)
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
index 70ea1d3c5..181f60a02 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
@@ -169,9 +169,7 @@ final class AccompanyingCourseApiController extends ApiController
         $accompanyingPeriods = $person->getCurrentAccompanyingPeriods();
         $accompanyingPeriodsChecked = array_filter(
             $accompanyingPeriods,
-            function (AccompanyingPeriod $period) {
-                return $this->isGranted(AccompanyingPeriodVoter::SEE, $period);
-            }
+            fn (AccompanyingPeriod $period) => $this->isGranted(AccompanyingPeriodVoter::SEE, $period)
         );
 
         return $this->json(array_values($accompanyingPeriodsChecked), Response::HTTP_OK, [], ['groups' => ['read']]);
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
index e9e27f9c9..b32454387 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
@@ -222,14 +222,10 @@ class AccompanyingPeriodController extends AbstractController
         $accompanyingPeriodsRaw = $this->accompanyingPeriodACLAwareRepository
             ->findByPerson($person, AccompanyingPeriodVoter::SEE);
 
-        usort($accompanyingPeriodsRaw, static function ($a, $b) {
-            return $b->getOpeningDate() > $a->getOpeningDate();
-        });
+        usort($accompanyingPeriodsRaw, static fn ($a, $b) => $b->getOpeningDate() > $a->getOpeningDate());
 
         // filter visible or not visible
-        $accompanyingPeriods = array_filter($accompanyingPeriodsRaw, function (AccompanyingPeriod $ap) {
-            return $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,
@@ -331,9 +327,7 @@ class AccompanyingPeriodController extends AbstractController
         /** @var AccompanyingPeriod $period */
         $period = array_filter(
             $person->getAccompanyingPeriods(),
-            static function (AccompanyingPeriod $p) use ($period_id) {
-                return $p->getId() === ($period_id);
-            }
+            static fn (AccompanyingPeriod $p) => $p->getId() === ($period_id)
         )[0] ?? null;
 
         if (null === $period) {
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php
index a91b0f5ff..6bbb6c368 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php
@@ -105,12 +105,8 @@ class AccompanyingPeriodRegulationListController
         $builder
             ->add('services', EntityType::class, [
                 'class' => Scope::class,
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('s');
-                },
-                'choice_label' => function (Scope $s) {
-                    return $this->translatableStringHelper->localize($s->getName());
-                },
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('s'),
+                'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
                 'multiple' => true,
                 'label' => 'Service',
                 'required' => false,
@@ -123,9 +119,7 @@ class AccompanyingPeriodRegulationListController
 
                     return $qb;
                 },
-                'choice_label' => function (UserJob $j) {
-                    return $this->translatableStringHelper->localize($j->getLabel());
-                },
+                'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
                 'multiple' => true,
                 'label' => 'Métier',
                 'required' => false,
@@ -147,9 +141,7 @@ class AccompanyingPeriodRegulationListController
 
                     return $qb;
                 },
-                'choice_label' => static function (Location $l) {
-                    return $l->getName();
-                },
+                'choice_label' => static fn (Location $l) => $l->getName(),
                 'multiple' => true,
                 'group_by' => function (Location $l) {
                     if (null === $type = $l->getLocationType()) {
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
index 43d35934b..61e030322 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
@@ -164,9 +164,7 @@ class HouseholdCompositionController extends AbstractController
             $isEdit = $request->query->has('edit');
 
             if ($isEdit) {
-                $householdCompositions = $household->getCompositions()->filter(static function (HouseholdComposition $composition) use ($request) {
-                    return $composition->getId() === $request->query->getInt('edit');
-                });
+                $householdCompositions = $household->getCompositions()->filter(static fn (HouseholdComposition $composition) => $composition->getId() === $request->query->getInt('edit'));
 
                 if ($householdCompositions->count() !== 1) {
                     throw new BadRequestHttpException('could not find the composition with this id associated to the household');
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
index 7b9eb0084..42092249b 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
@@ -81,9 +81,7 @@ class HouseholdController extends AbstractController
             }
         }
 
-        usort($accompanyingPeriods, static function ($a, $b) {
-            return $b->getOpeningDate() <=> $a->getOpeningDate();
-        });
+        usort($accompanyingPeriods, static fn ($a, $b) => $b->getOpeningDate() <=> $a->getOpeningDate());
 
         $oldMembers = $household->getNonCurrentMembers();
         $accompanyingPeriodsOld = [];
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
index bf0d998ff..505f307e6 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
@@ -108,14 +108,10 @@ class PersonApiController extends ApiController
         $addresses = $person
             ->getAccompanyingPeriodParticipations()
             ->filter(
-                static function (AccompanyingPeriodParticipation $accompanyingPeriodParticipation): bool {
-                    return null !== $accompanyingPeriodParticipation->getAccompanyingPeriod()->getAddressLocation();
-                }
+                static fn (AccompanyingPeriodParticipation $accompanyingPeriodParticipation): bool => null !== $accompanyingPeriodParticipation->getAccompanyingPeriod()->getAddressLocation()
             )
             ->map(
-                static function (AccompanyingPeriodParticipation $accompanyingPeriodParticipation): ?Address {
-                    return $accompanyingPeriodParticipation->getAccompanyingPeriod()->getAddressLocation();
-                }
+                static fn (AccompanyingPeriodParticipation $accompanyingPeriodParticipation): ?Address => $accompanyingPeriodParticipation->getAccompanyingPeriod()->getAddressLocation()
             )
             ->filter(
                 // We remove potential null addresses.
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
index 3ae5c5b7c..4fe877a72 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
@@ -44,9 +44,7 @@ class SocialWorkSocialActionApiController extends ApiController
 
         $socialActions = $socialIssue->getRecursiveSocialActions()->toArray();
 
-        usort($socialActions, static function (SocialAction $sa, SocialAction $sb) {
-            return $sa->getOrdering() <=> $sb->getOrdering();
-        });
+        usort($socialActions, static fn (SocialAction $sa, SocialAction $sb) => $sa->getOrdering() <=> $sb->getOrdering());
 
         $pagination = $this->paginator->create(count($socialActions));
         // max one page
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
index 87746842a..78180adff 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
@@ -115,9 +115,7 @@ class LoadCustomFields extends AbstractFixture implements
 
         // get possible values for cfGroup
         $choices = array_map(
-            static function ($a) {
-                return $a['slug'];
-            },
+            static fn ($a) => $a['slug'],
             $this->customFieldChoice->getOptions()['choices']
         );
         // create faker
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index 510e1c327..a0f6e7d7e 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -828,9 +828,7 @@ class AccompanyingPeriod implements
         $collection = $this
             ->getParticipationsContainsPerson($person)
             ->filter(
-                static function (AccompanyingPeriodParticipation $participation): bool {
-                    return null === $participation->getEndDate();
-                }
+                static fn (AccompanyingPeriodParticipation $participation): bool => null === $participation->getEndDate()
             );
 
         return $collection->count() > 0 ? $collection->first() : null;
@@ -844,9 +842,7 @@ class AccompanyingPeriod implements
         return $this
             ->getParticipations()
             ->filter(
-                static function (AccompanyingPeriodParticipation $participation): bool {
-                    return null === $participation->getEndDate();
-                }
+                static fn (AccompanyingPeriodParticipation $participation): bool => null === $participation->getEndDate()
             );
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
index 592c833d3..1652a45e9 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
@@ -44,20 +44,20 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
      * @Assert\NotBlank
      * @Assert\NotNull
      */
-    private ?string $content;
+    private ?string $content = null;
 
     /**
      * @ORM\Column(type="datetime")
      * @Groups({"read", "docgen:read"})
      */
-    private ?DateTimeInterface $createdAt;
+    private ?DateTimeInterface $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      * @ORM\JoinColumn(nullable=false)
      * @Groups({"read", "docgen:read"})
      */
-    private ?User $creator;
+    private ?User $creator = null;
 
     /**
      * @ORM\Id
@@ -65,20 +65,20 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
      * @ORM\Column(type="integer")
      * @Groups({"read", "docgen:read"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="datetime")
      * @Groups({"read"})
      */
-    private ?DateTimeInterface $updatedAt;
+    private ?DateTimeInterface $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      * @ORM\JoinColumn(nullable=false)
      * @Groups({"read"})
      */
-    private ?User $updatedBy;
+    private ?User $updatedBy = null;
 
     public function getAccompanyingPeriod(): ?AccompanyingPeriod
     {
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
index 48e1ac1fc..8a99c7eb4 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
@@ -200,13 +200,11 @@ class Household
      */
     public function getCurrentAddress(?DateTime $at = null): ?Address
     {
-        $at = $at ?? new DateTime('today');
+        $at ??= new DateTime('today');
 
-        $addrs = $this->getAddresses()->filter(static function (Address $a) use ($at) {
-            return $a->getValidFrom() <= $at && (
-                null === $a->getValidTo() || $a->getValidTo() > $at
-            );
-        });
+        $addrs = $this->getAddresses()->filter(static fn (Address $a) => $a->getValidFrom() <= $at && (
+            null === $a->getValidTo() || $a->getValidTo() > $at
+        ));
 
         if ($addrs->count() > 0) {
             return $addrs->first();
@@ -338,9 +336,7 @@ class Household
     public function getCurrentPersons(?DateTimeImmutable $now = null): ReadableCollection
     {
         return $this->getCurrentMembers($now)
-            ->map(static function (HouseholdMember $m) {
-                return $m->getPerson();
-            });
+            ->map(static fn (HouseholdMember $m) => $m->getPerson());
     }
 
     public function getId(): ?int
@@ -367,9 +363,7 @@ class Household
             $membership->getStartDate(),
             $membership->getEndDate()
         )->filter(
-            static function (HouseholdMember $m) use ($membership) {
-                return $m->getPerson() !== $membership->getPerson();
-            }
+            static fn (HouseholdMember $m) => $m->getPerson() !== $membership->getPerson()
         );
     }
 
@@ -508,9 +502,7 @@ class Household
 
         usort(
             $compositionOrdered,
-            static function (HouseholdComposition $a, HouseholdComposition $b) {
-                return $a->getStartDate() <=> $b->getStartDate();
-            }
+            static fn (HouseholdComposition $a, HouseholdComposition $b) => $a->getStartDate() <=> $b->getStartDate()
         );
 
         $iterator = new ArrayIterator($compositionOrdered);
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
index 031279173..fad3b213a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
@@ -142,7 +142,7 @@ class HouseholdMember
 
     public function isCurrent(?DateTimeImmutable $at = null): bool
     {
-        $at = $at ?? new DateTimeImmutable('now');
+        $at ??= new DateTimeImmutable('now');
 
         return $this->getStartDate() < $at && (
             null === $this->getEndDate() || $this->getEndDate() > $at
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 63bd6efba..af8e7f92b 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -775,9 +775,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     ): int {
         // TODO should be optimized to avoid loading accompanying period ?
         return $this->getAccompanyingPeriodInvolved($asParticipantOpen, $asRequestor)
-            ->filter(function (AccompanyingPeriod $p) {
-                return $p->getStep() !== AccompanyingPeriod::STEP_DRAFT;
-            })
+            ->filter(fn (AccompanyingPeriod $p) => $p->getStep() !== AccompanyingPeriod::STEP_DRAFT)
             ->count();
     }
 
@@ -1341,9 +1339,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
 
         return $this->getAccompanyingPeriodParticipations()
             ->matching($criteria)
-            ->filter(static function (AccompanyingPeriodParticipation $app) {
-                return AccompanyingPeriod::STEP_CLOSED !== $app->getAccompanyingPeriod()->getStep();
-            });
+            ->filter(static fn (AccompanyingPeriodParticipation $app) => AccompanyingPeriod::STEP_CLOSED !== $app->getAccompanyingPeriod()->getStep());
     }
 
     public function getOtherPhoneNumbers(): Collection
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
index d95f4c7c8..52d6a34af 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
@@ -50,7 +50,7 @@ class PersonCurrentAddress
     /**
      * @ORM\Column(name="valid_to", type="date_immutable")
      */
-    protected ?DateTimeImmutable $validTo;
+    protected ?DateTimeImmutable $validTo = null;
 
     public function getAddress(): Address
     {
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index 576380476..a4b6cf085 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -55,7 +55,7 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
      * @ORM\Column(type="integer")
      * @Groups({"read", "docgen:read"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=PersonResourceKind::class, inversedBy="personResources")
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
index 5013ac9b7..068260b45 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
@@ -41,7 +41,7 @@ class PersonPhone
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(
@@ -59,7 +59,7 @@ class PersonPhone
     /**
      * @ORM\Column(type="text", length=40, nullable=true)
      */
-    private ?string $type;
+    private ?string $type = null;
 
     public function __construct()
     {
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
index 823f31426..f65192a04 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
@@ -45,7 +45,7 @@ class Result
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private ?DateTime $desactivationDate;
+    private ?DateTime $desactivationDate = null;
 
     /**
      * @ORM\ManyToMany(targetEntity=Goal::class, mappedBy="results")
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
index 80781b823..4ac96aac1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
@@ -128,9 +128,7 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
                 'placeholder' => 'Select a geographical layer',
                 'class' => GeographicalUnitLayer::class,
                 'choices' => $this->geographicalUnitLayerRepository->findAllHavingUnits(),
-                'choice_label' => function (GeographicalUnitLayer $item) {
-                    return $this->translatableStringHelper->localize($item->getName());
-                },
+                'choice_label' => fn (GeographicalUnitLayer $item) => $this->translatableStringHelper->localize($item->getName()),
             ]);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
index 395070a8a..3d785b586 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
@@ -147,9 +147,7 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
             ];
         }
 
-        return static function (string $value) use ($labels): string {
-            return $labels[$value];
-        };
+        return static fn (string $value): string => $labels[$value];
     }
 
     public function getQueryKeys($data)
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
index 6193f3c61..ff72994ba 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
@@ -100,9 +100,7 @@ class GeographicalUnitAggregator implements AggregatorInterface
                 'placeholder' => 'Select a geographical layer',
                 'class' => GeographicalUnitLayer::class,
                 'choices' => $this->geographicalUnitLayerRepository->findAllHavingUnits(),
-                'choice_label' => function (GeographicalUnitLayer $item) {
-                    return $this->translatableStringHelper->localize($item->getName());
-                },
+                'choice_label' => fn (GeographicalUnitLayer $item) => $this->translatableStringHelper->localize($item->getName()),
             ]);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
index 1eced58d3..d7c4097af 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
@@ -141,9 +141,7 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
             ];
         }
 
-        return static function ($value) use ($labels): string {
-            return $labels[$value];
-        };
+        return static fn ($value): string => $labels[$value];
     }
 
     public function getQueryKeys($data)
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
index a9f794888..978f88a10 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
@@ -64,9 +64,7 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
         $labels = array_combine($values, $values);
         $labels['_header'] = $this->getTitle();
 
-        return static function ($value) use ($labels) {
-            return $labels[$value];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
@@ -91,9 +89,7 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository->createQueryBuilder('acp');
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php
index 40253ea0b..122ee14d9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php
@@ -63,9 +63,7 @@ class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInter
         $labels = array_combine($values, $values);
         $labels['_header'] = $this->getTitle();
 
-        return static function ($value) use ($labels) {
-            return $labels[$value];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
@@ -90,9 +88,7 @@ class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInter
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->em->createQueryBuilder();
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php b/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
index 578cc1452..1613b63d3 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
@@ -62,9 +62,7 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
         $labels = array_combine($values, $values);
         $labels['_header'] = $this->getTitle();
 
-        return static function ($value) use ($labels) {
-            return $labels[$value];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
@@ -89,9 +87,7 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
index f1eaeb4cb..0b693b9d8 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
@@ -113,9 +113,7 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
index 07a307563..60429ae55 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
@@ -62,9 +62,7 @@ class CountPerson implements ExportInterface, GroupedExportInterface
         $labels = array_combine($values, $values);
         $labels['_header'] = $this->getTitle();
 
-        return static function ($value) use ($labels) {
-            return $labels[$value];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data)
@@ -94,9 +92,7 @@ class CountPerson implements ExportInterface, GroupedExportInterface
      */
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->personRepository->createQueryBuilder('person');
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php b/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
index 7acbd09cf..e52cc83b1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
@@ -64,9 +64,7 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
         $labels = array_combine($values, $values);
         $labels['_header'] = $this->getTitle();
 
-        return static function ($value) use ($labels) {
-            return $labels[$value];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
@@ -91,9 +89,7 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository->createQueryBuilder('acp');
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
index cacdf2ee1..045039930 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
@@ -290,9 +290,7 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php
index d0c1863c3..00fa8adb1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php
@@ -263,9 +263,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php b/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php
index 010618733..f0985436b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php
@@ -241,9 +241,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php b/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
index fc72de77b..24d929c00 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
@@ -146,9 +146,7 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
index 21675a86a..8145fd658 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
@@ -191,9 +191,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
      */
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         // throw an error if any fields are present
         if (!array_key_exists('fields', $data)) {
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriod.php
index bab67fb39..7cb066e87 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriod.php
@@ -159,9 +159,7 @@ class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterfac
      */
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         // throw an error if any fields are present
         if (!array_key_exists('fields', $data)) {
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php b/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
index c124f0227..31ca41cbb 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
@@ -112,9 +112,7 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository->createQueryBuilder('acp');
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
index 07e61b42e..e57370f30 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
@@ -59,9 +59,7 @@ class ClosingMotiveFilter implements FilterInterface
     {
         $builder->add('accepted_closingmotives', EntityType::class, [
             'class' => ClosingMotive::class,
-            'choice_label' => function (ClosingMotive $cm) {
-                return $this->translatableStringHelper->localize($cm->getName());
-            },
+            'choice_label' => fn (ClosingMotive $cm) => $this->translatableStringHelper->localize($cm->getName()),
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php
index 62cf49d6d..f585cfafb 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php
@@ -61,11 +61,9 @@ class CreatorJobFilter implements FilterInterface
         $builder->add('creator_job', EntityType::class, [
             'class' => UserJob::class,
             'choices' => $this->userJobRepository->findAllActive(),
-            'choice_label' => function (UserJob $j) {
-                return $this->translatableStringHelper->localize(
-                    $j->getLabel()
-                );
-            },
+            'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize(
+                $j->getLabel()
+            ),
             'multiple' => true,
             'expanded' => true,
             'label' => 'Job',
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
index 1839268e1..ab7f4257e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
@@ -69,9 +69,7 @@ class EvaluationFilter implements FilterInterface
         $builder->add('accepted_evaluations', EntityType::class, [
             'class' => Evaluation::class,
             'choices' => $this->evaluationRepository->findAllActive(),
-            'choice_label' => function (Evaluation $ev) {
-                return $this->translatableStringHelper->localize($ev->getTitle());
-            },
+            'choice_label' => fn (Evaluation $ev) => $this->translatableStringHelper->localize($ev->getTitle()),
             'multiple' => true,
             'expanded' => false,
             'attr' => ['class' => 'select2'],
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
index 5bbb22e53..d35565c80 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
@@ -107,9 +107,7 @@ class GeographicalUnitStatFilter implements FilterInterface
                 'placeholder' => 'Select a geographical unit',
                 'choices' => $this->geographicalUnitRepository->findAll(),
                 'choice_value' => static fn (SimpleGeographicalUnitDTO $item) => $item->id,
-                'choice_label' => function (SimpleGeographicalUnitDTO $item) {
-                    return $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',
                 ],
@@ -124,9 +122,7 @@ class GeographicalUnitStatFilter implements FilterInterface
             '%units' => implode(
                 ', ',
                 array_map(
-                    function (SimpleGeographicalUnitDTO $item) {
-                        return $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/OriginFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
index 445535734..00febc640 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
@@ -59,9 +59,7 @@ class OriginFilter implements FilterInterface
     {
         $builder->add('accepted_origins', EntityType::class, [
             'class' => Origin::class,
-            'choice_label' => function (Origin $o) {
-                return $this->translatableStringHelper->localize($o->getLabel());
-            },
+            'choice_label' => fn (Origin $o) => $this->translatableStringHelper->localize($o->getLabel()),
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
index 65e38f41e..6a0c71d55 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
@@ -59,9 +59,7 @@ final class EvaluationTypeFilter implements FilterInterface
     {
         $builder->add('accepted_evaluationtype', EntityType::class, [
             'class' => Evaluation::class,
-            'choice_label' => function (Evaluation $ev): string {
-                return $this->translatableStringHelper->localize($ev->getTitle());
-            },
+            'choice_label' => fn (Evaluation $ev): string => $this->translatableStringHelper->localize($ev->getTitle()),
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
index 922702418..22761c158 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
@@ -78,11 +78,9 @@ class CompositionFilter implements FilterInterface
         $builder
             ->add('accepted_composition', EntityType::class, [
                 'class' => HouseholdCompositionType::class,
-                'choice_label' => function (HouseholdCompositionType $type) {
-                    return $this->translatableStringHelper->localize(
-                        $type->getLabel()
-                    );
-                },
+                'choice_label' => fn (HouseholdCompositionType $type) => $this->translatableStringHelper->localize(
+                    $type->getLabel()
+                ),
                 'multiple' => true,
                 'expanded' => true,
             ])
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php
index 0fe1973e9..7580a37a3 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php
@@ -81,9 +81,7 @@ class AddressRefStatusFilter implements \Chill\MainBundle\Export\FilterInterface
             ->add('ref_statuses', ChoiceType::class, [
                 'label' => 'export.filter.person.by_address_ref_status.Status',
                 'choices' => [Address::ADDR_REFERENCE_STATUS_TO_REVIEW, Address::ADDR_REFERENCE_STATUS_REVIEWED, Address::ADDR_REFERENCE_STATUS_MATCH],
-                'choice_label' => function (string $item) {
-                    return 'export.filter.person.by_address_ref_status.'.$item;
-                },
+                'choice_label' => fn (string $item) => 'export.filter.person.by_address_ref_status.'.$item,
                 'multiple' => true,
                 'expanded' => true,
                 'data' => [Address::ADDR_REFERENCE_STATUS_TO_REVIEW]
@@ -99,9 +97,7 @@ class AddressRefStatusFilter implements \Chill\MainBundle\Export\FilterInterface
                 '%statuses%' => implode(
                     ', ',
                     array_map(
-                        function (string $item) {
-                            return 'export.filter.person.by_address_ref_status.'.$item;
-                        },
+                        fn (string $item) => 'export.filter.person.by_address_ref_status.'.$item,
                         $data['ref_statuses'] ?? RollingDate::T_TODAY
                     )
                 ),
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
index 228749c34..739945b98 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
@@ -67,9 +67,7 @@ class GenderFilter implements
         $qb->add('where', $where);
         $qb->setParameter('person_gender', array_filter(
             $data['accepted_genders'],
-            static function ($el) {
-                return 'null' !== $el;
-            }
+            static fn ($el) => 'null' !== $el
         ));
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
index 9bdb3f2d4..79f5cb2d4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
@@ -98,9 +98,7 @@ 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' => function (SimpleGeographicalUnitDTO $item) {
-                    return $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',
                 ],
@@ -117,9 +115,7 @@ class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
                 '%units%' => implode(
                     ', ',
                     array_map(
-                        function (SimpleGeographicalUnitDTO $item) {
-                            return $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 aad98a394..47a75871c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
@@ -49,11 +49,9 @@ class MaritalStatusFilter implements FilterInterface
     {
         $builder->add('maritalStatus', EntityType::class, [
             'class' => MaritalStatus::class,
-            'choice_label' => function (MaritalStatus $ms) {
-                return $this->translatableStringHelper->localize(
-                    $ms->getName()
-                );
-            },
+            'choice_label' => fn (MaritalStatus $ms) => $this->translatableStringHelper->localize(
+                $ms->getName()
+            ),
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
index 1156527cc..b1d77d60e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
@@ -72,9 +72,7 @@ class NationalityFilter implements
     {
         $countries = $data['nationalities'];
 
-        $names = array_map(function (Country $c) {
-            return $this->translatableStringHelper->localize($c->getName());
-        }, [$countries]);
+        $names = array_map(fn (Country $c) => $this->translatableStringHelper->localize($c->getName()), [$countries]);
 
         return [
             'Filtered by nationality : %nationalities%',
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
index 90003c6bf..21bb40947 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
@@ -100,9 +100,7 @@ class ResidentialAddressAtThirdpartyFilter implements FilterInterface
         $builder->add('thirdparty_cat', EntityType::class, [
             'class' => ThirdPartyCategory::class,
             'label' => 'Category',
-            'choice_label' => function (ThirdPartyCategory $tpc) {
-                return $this->translatableStringHelper->localize($tpc->getName());
-            },
+            'choice_label' => fn (ThirdPartyCategory $tpc) => $this->translatableStringHelper->localize($tpc->getName()),
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
index a69e1ac76..144bf3260 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
@@ -69,11 +69,9 @@ class JobFilter implements FilterInterface
     {
         $builder->add('job', EntityType::class, [
             'class' => UserJob::class,
-            'choice_label' => function (UserJob $j) {
-                return $this->translatableStringHelper->localize(
-                    $j->getLabel()
-                );
-            },
+            'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize(
+                $j->getLabel()
+            ),
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
index 8cb2f6421..315025722 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
@@ -69,11 +69,9 @@ class ScopeFilter implements FilterInterface
     {
         $builder->add('scope', EntityType::class, [
             'class' => Scope::class,
-            'choice_label' => function (Scope $s) {
-                return $this->translatableStringHelper->localize(
-                    $s->getName()
-                );
-            },
+            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize(
+                $s->getName()
+            ),
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
index 853d50744..11fd0ed9d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
@@ -136,7 +136,7 @@ class SocialWorkTypeFilter implements FilterInterface
         }
 
         return ['Filtered actions by type, goals and results: %selected%', [
-            '%selected%' => implode(', ', array_merge($actionTypes, $goals, $results)),
+            '%selected%' => implode(', ', [...$actionTypes, ...$goals, ...$results]),
         ]];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php b/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
index 0e63fe580..03db7c156 100644
--- a/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+++ b/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
@@ -55,9 +55,7 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
     {
         return new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
             $this->lazyLoadedPersons,
-            static function (Person $p) use ($value) {
-                return call_user_func($value, $p);
-            }
+            static fn (Person $p) => call_user_func($value, $p)
         );
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php
index d6919cc5d..a63b008c6 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php
@@ -40,9 +40,7 @@ class HouseholdCompositionType extends AbstractType
             ->add('householdCompositionType', EntityType::class, [
                 'class' => \Chill\PersonBundle\Entity\Household\HouseholdCompositionType::class,
                 'choices' => $types,
-                'choice_label' => function (\Chill\PersonBundle\Entity\Household\HouseholdCompositionType $type) {
-                    return $this->translatableStringHelper->localize($type->getLabel());
-                },
+                'choice_label' => fn (\Chill\PersonBundle\Entity\Household\HouseholdCompositionType $type) => $this->translatableStringHelper->localize($type->getLabel()),
                 'label' => 'household_composition.Household composition',
             ])
             ->add('startDate', ChillDateType::class, [
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonType.php b/src/Bundle/ChillPersonBundle/Form/PersonType.php
index 42e62929d..927812929 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonType.php
@@ -118,12 +118,8 @@ class PersonType extends AbstractType
             ]);
 
             $builder->get('placeOfBirth')->addModelTransformer(new CallbackTransformer(
-                static function ($string) {
-                    return strtoupper((string) $string);
-                },
-                static function ($string) {
-                    return strtoupper((string) $string);
-                }
+                static fn ($string) => strtoupper((string) $string),
+                static fn ($string) => strtoupper((string) $string)
             ));
         }
 
@@ -167,9 +163,7 @@ class PersonType extends AbstractType
             'allow_delete' => true,
             'by_reference' => false,
             'label' => false,
-            'delete_empty' => static function (?PersonPhone $pp = null) {
-                return 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/SocialWork/GoalType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
index 6d07bf64f..a6f55e917 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
@@ -46,9 +46,7 @@ class GoalType extends AbstractType
                 'class' => Result::class,
                 'required' => false,
                 'multiple' => true,
-                'choice_label' => function (Result $r) {
-                    return $this->translatableStringHelper->localize($r->getTitle());
-                },
+                'choice_label' => fn (Result $r) => $this->translatableStringHelper->localize($r->getTitle()),
                 'attr' => ['class' => 'select2 '],
             ])
             ->add('desactivationDate', ChillDateType::class, [
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
index 5a6095f7b..0b6cbe73d 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
@@ -50,16 +50,12 @@ class SocialActionType extends AbstractType
             ->add('issue', EntityType::class, [
                 'class' => SocialIssue::class,
                 'label' => 'socialAction.socialIssue',
-                'choice_label' => function (SocialIssue $issue) {
-                    return $this->translatableStringHelper->localize($issue->getTitle());
-                },
+                'choice_label' => fn (SocialIssue $issue) => $this->translatableStringHelper->localize($issue->getTitle()),
             ])
             ->add('parent', EntityType::class, [
                 'class' => SocialAction::class,
                 'required' => false,
-                'choice_label' => function (SocialAction $issue) {
-                    return $this->translatableStringHelper->localize($issue->getTitle());
-                },
+                'choice_label' => fn (SocialAction $issue) => $this->translatableStringHelper->localize($issue->getTitle()),
             ])
             ->add('ordering', NumberType::class, [
                 'required' => true,
@@ -70,9 +66,7 @@ class SocialActionType extends AbstractType
                 'required' => false,
                 'multiple' => true,
                 'attr' => ['class' => 'select2'],
-                'choice_label' => function (Result $r) {
-                    return $this->translatableStringHelper->localize($r->getTitle());
-                },
+                'choice_label' => fn (Result $r) => $this->translatableStringHelper->localize($r->getTitle()),
             ])
 
             ->add('goals', EntityType::class, [
@@ -80,9 +74,7 @@ class SocialActionType extends AbstractType
                 'required' => false,
                 'multiple' => true,
                 'attr' => ['class' => 'select2'],
-                'choice_label' => function (Goal $g) {
-                    return $this->translatableStringHelper->localize($g->getTitle());
-                },
+                'choice_label' => fn (Goal $g) => $this->translatableStringHelper->localize($g->getTitle()),
             ])
 
             ->add('evaluations', EntityType::class, [
@@ -90,9 +82,7 @@ class SocialActionType extends AbstractType
                 'required' => false,
                 'multiple' => true,
                 'attr' => ['class' => 'select2'],
-                'choice_label' => function (Evaluation $e) {
-                    return $this->translatableStringHelper->localize($e->getTitle());
-                },
+                'choice_label' => fn (Evaluation $e) => $this->translatableStringHelper->localize($e->getTitle()),
             ])
 
             ->add('defaultNotificationDelay', DateIntervalType::class, [
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php b/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php
index 2f96d4966..240bcfbb4 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php
@@ -60,18 +60,14 @@ class ClosingMotivePickerType extends AbstractType
             'class' => ClosingMotive::class,
             'empty_data' => null,
             'placeholder' => 'Choose a motive',
-            'choice_label' => function (ClosingMotive $cm) {
-                return $this->entityRenderExtension->renderString($cm);
-            },
+            'choice_label' => fn (ClosingMotive $cm) => $this->entityRenderExtension->renderString($cm),
             'only_leaf' => true,
         ]);
 
         $resolver
             ->setAllowedTypes('only_leaf', 'bool')
-            ->setNormalizer('choices', function (Options $options) {
-                return $this->repository
-                    ->getActiveClosingMotive($options['only_leaf']);
-            });
+            ->setNormalizer('choices', fn (Options $options) => $this->repository
+                ->getActiveClosingMotive($options['only_leaf']));
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
index 501af5b9d..026a24bb6 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
@@ -113,15 +113,11 @@ class PickPersonType extends AbstractType
         // add the default options
         $resolver->setDefaults([
             'class' => Person::class,
-            'choice_label' => static function (Person $p) {
-                return $p->getFirstname() . ' ' . $p->getLastname();
-            },
+            'choice_label' => static fn (Person $p) => $p->getFirstname() . ' ' . $p->getLastname(),
             'placeholder' => 'Pick a person',
-            'choice_attr' => static function (Person $p) {
-                return [
-                    'data-center' => $p->getCenter()->getId(),
-                ];
-            },
+            'choice_attr' => static fn (Person $p) => [
+                'data-center' => $p->getCenter()->getId(),
+            ],
             'attr' => ['class' => 'select2 '],
             'choice_loader' => function (Options $options) {
                 $centers = $this->filterCentersfom($options);
@@ -139,9 +135,7 @@ class PickPersonType extends AbstractType
     protected function filterCentersfom(Options $options)
     {
         if (null === $options['role']) {
-            $centers = array_map(static function (GroupCenter $g) {
-                return $g->getCenter();
-            }, $this->user->getGroupCenters()->toArray());
+            $centers = array_map(static fn (GroupCenter $g) => $g->getCenter(), $this->user->getGroupCenters()->toArray());
         } else {
             $centers = $this->authorizationHelper
                 ->getReachableCenters($this->user, $options['role']->getRole());
@@ -164,9 +158,7 @@ class PickPersonType extends AbstractType
 
                 if (
                     !in_array($c->getId(), array_map(
-                        static function (Center $c) {
-                            return $c->getId();
-                        },
+                        static fn (Center $c) => $c->getId(),
                         $centers
                     ), true)
                 ) {
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickSocialActionType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickSocialActionType.php
index 7c0da43b1..fd947e9cd 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickSocialActionType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickSocialActionType.php
@@ -38,9 +38,7 @@ class PickSocialActionType extends AbstractType
             ->setDefaults([
                 'class' => SocialAction::class,
                 'choices' => $this->actionRepository->findAllActive(),
-                'choice_label' => function (SocialAction $sa) {
-                    return $this->actionRender->renderString($sa, []);
-                },
+                'choice_label' => fn (SocialAction $sa) => $this->actionRender->renderString($sa, []),
                 'placeholder' => 'Pick a social action',
                 'required' => false,
                 'attr' => ['class' => 'select2'],
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickSocialIssueType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickSocialIssueType.php
index e79c17191..b560337ac 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickSocialIssueType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickSocialIssueType.php
@@ -38,9 +38,7 @@ class PickSocialIssueType extends AbstractType
             ->setDefaults([
                 'class' => SocialIssue::class,
                 'choices' => $this->issueRepository->findAllActive(),
-                'choice_label' => function (SocialIssue $si) {
-                    return $this->issueRender->renderString($si, []);
-                },
+                'choice_label' => fn (SocialIssue $si) => $this->issueRender->renderString($si, []),
                 'placeholder' => 'Pick a social issue',
                 'required' => false,
                 'attr' => ['class' => 'select2'],
diff --git a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
index 0b67537cb..33d01de1b 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
@@ -76,9 +76,7 @@ class PrivacyEventSubscriber implements EventSubscriberInterface
         $involved = $this->getInvolved();
         $involved['period_id'] = $event->getPeriod()->getId();
         $involved['persons'] = $event->getPeriod()->getPersons()
-            ->map(static function (Person $p) {
-                return $p->getId();
-            })
+            ->map(static fn (Person $p) => $p->getId())
             ->toArray();
 
         $this->logger->notice(
@@ -102,9 +100,7 @@ class PrivacyEventSubscriber implements EventSubscriberInterface
 
         if ($event->hasPersons()) {
             $involved['persons'] = array_map(
-                static function (Person $p) {
-                    return $p->getId();
-                },
+                static fn (Person $p) => $p->getId(),
                 $event->getPersons()
             );
         }
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
index cc9e7b145..30c79147c 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -322,9 +322,7 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
                         ),
                     ]
                 ),
-                array_map(static function (Center $c) {
-                    return $c->getId();
-                }, $authorizedCenters)
+                array_map(static fn (Center $c) => $c->getId(), $authorizedCenters)
             );
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
index 47a15db54..6ba1ac1a9 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
@@ -97,9 +97,7 @@ class HouseholdVoter extends Voter implements ProvideRoleHierarchyInterface, Chi
 
     private function checkAssociatedMembersRole(Household $household, string $attribute): bool
     {
-        foreach ($household->getCurrentMembers()->map(static function (HouseholdMember $member) {
-            return $member->getPerson();
-        }) as $person) {
+        foreach ($household->getCurrentMembers()->map(static fn (HouseholdMember $member) => $member->getPerson()) as $person) {
             if ($this->security->isGranted($attribute, $person)) {
                 return true;
             }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
index 0e1c81592..bc13dec66 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
@@ -150,12 +150,8 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
                     $this->closingMotiveRender->renderString($period->getClosingMotive(), []) : '',
                 'ref' => $this->normalizer->normalize($period->getUser(), $format, $userContext),
                 'hasRef' => $period->getUser() !== null,
-                'socialIssuesText' => implode(', ', array_map(function (SocialIssue $s) {
-                    return $this->socialIssueRender->renderString($s, []);
-                }, $period->getSocialIssues()->toArray())),
-                'scopesText' => implode(', ', array_map(function (Scope $s) {
-                    return $this->translatableStringHelper->localize($s->getName());
-                }, $scopes)),
+                '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,
                 'requestorKind' => $period->getRequestorKind(),
                 'hasLocation' => $period->getLocation() !== null,
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
index 8cd917961..a0268ae31 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
@@ -48,9 +48,7 @@ class AccompanyingPeriodWorkEvaluationNormalizer implements ContextAwareNormaliz
         $initial = $this->normalizer->normalize($object, $format, array_merge(
             $context,
             [self::IGNORE_EVALUATION => spl_object_hash($object)],
-            [AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => static function ($object, $format, $context) {
-                return $object->getId();
-            }]
+            [AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => static fn ($object, $format, $context) => $object->getId()]
         ));
 
         // due to bug: https://api-platform.com/docs/core/serialization/#collection-relation
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
index 74ca55398..7b500e6bb 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
@@ -94,9 +94,7 @@ class PersonDocGenNormalizer implements
             // we simplify the list of attributes for the embedded persons
             AbstractNormalizer::GROUPS => ['docgen:read'],
             // when a person reference the same person... take care of circular references
-            AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => function ($object, $format, $context) {
-                return $this->normalizer->normalize(null, $format, $context);
-            },
+            AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => fn ($object, $format, $context) => $this->normalizer->normalize(null, $format, $context),
         ]);
 
         if (null === $person) {
@@ -117,9 +115,7 @@ class PersonDocGenNormalizer implements
             'altNames' => implode(
                 ', ',
                 array_map(
-                    static function (PersonAltName $altName) {
-                        return $altName->getLabel();
-                    },
+                    static fn (PersonAltName $altName) => $altName->getLabel(),
                     $person->getAltNames()->toArray()
                 )
             ),
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index a94ae3af9..2cadd0c75 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -257,12 +257,10 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
     {
         return $altNames
             ->map(
-                static function (PersonAltName $personAltName): array {
-                    return [
-                        'key' => $personAltName->getKey(),
-                        'label' => $personAltName->getLabel(),
-                    ];
-                }
+                static fn (PersonAltName $personAltName): array => [
+                    'key' => $personAltName->getKey(),
+                    'label' => $personAltName->getLabel(),
+                ]
             )
             ->toArray();
     }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
index 3f2e46b3f..32b1635c4 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
@@ -37,9 +37,7 @@ class SocialIssueNormalizer implements ContextAwareNormalizerInterface, Normaliz
                     'type' => 'social_issue',
                     'id' => $socialIssue->getId(),
                     'parent_id' => $socialIssue->hasParent() ? $socialIssue->getParent()->getId() : null,
-                    'children_ids' => $socialIssue->getChildren()->map(static function (SocialIssue $si) {
-                        return $si->getId();
-                    }),
+                    'children_ids' => $socialIssue->getChildren()->map(static fn (SocialIssue $si) => $si->getId()),
                     'title' => $socialIssue->getTitle(),
                     'text' => $this->render->renderString($socialIssue, []),
                 ];
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index 4a08eff08..a42765c12 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -143,14 +143,10 @@ class AccompanyingPeriodContext implements
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
                 'class' => DocumentCategory::class,
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('c')
-                        ->where('c.documentClass = :docClass')
-                        ->setParameter('docClass', AccompanyingCourseDocument::class);
-                },
-                'choice_label' => function ($entity = null) {
-                    return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
-                },
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('c')
+                    ->where('c.documentClass = :docClass')
+                    ->setParameter('docClass', AccompanyingCourseDocument::class),
+                'choice_label' => fn ($entity = null) => $entity ? $this->translatableStringHelper->localize($entity->getName()) : '',
             ]);
     }
 
@@ -160,9 +156,7 @@ class AccompanyingPeriodContext implements
     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, mixed $entity): void
     {
         $options = $template->getOptions();
-        $persons = new ArrayCollection($entity->getCurrentParticipations()->map(static function (AccompanyingPeriodParticipation $p) {
-            return $p->getPerson();
-        })->toArray());
+        $persons = new ArrayCollection($entity->getCurrentParticipations()->map(static fn (AccompanyingPeriodParticipation $p) => $p->getPerson())->toArray());
 
         foreach ($entity->getCurrentParticipations() as $p) {
             foreach ($p->getPerson()->getResources() as $r) {
@@ -187,9 +181,7 @@ class AccompanyingPeriodContext implements
                 $builder->add($key, EntityType::class, [
                     'class' => Person::class,
                     'choices' => $persons,
-                    'choice_label' => function (Person $p) {
-                        return $this->personRender->renderString($p, ['addAge' => true]);
-                    },
+                    'choice_label' => fn (Person $p) => $this->personRender->renderString($p, ['addAge' => true]),
                     'multiple' => false,
                     'expanded' => true,
                     'required' => false,
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index 4718b7b00..34b339822 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -63,9 +63,7 @@ class AccompanyingPeriodWorkEvaluationContext implements
             $this->accompanyingPeriodWorkContext->adminFormReverseTransform($data),
             [
                 'evaluations' => array_map(
-                    static function (Evaluation $e) {
-                        return $e->getId();
-                    },
+                    static fn (Evaluation $e) => $e->getId(),
                     $data['evaluations']
                 ),
             ]
@@ -78,9 +76,7 @@ class AccompanyingPeriodWorkEvaluationContext implements
             $this->accompanyingPeriodWorkContext->adminFormTransform($data),
             [
                 'evaluations' => array_map(
-                    function ($id) {
-                        return $this->evaluationRepository->find($id);
-                    },
+                    fn ($id) => $this->evaluationRepository->find($id),
                     $data['evaluations'] ?? []
                 ),
             ]
@@ -97,9 +93,7 @@ class AccompanyingPeriodWorkEvaluationContext implements
             'class' => Evaluation::class,
             'label' => 'Linked evaluations',
             'choices' => $this->evaluationRepository->findAll(),
-            'choice_label' => function (Evaluation $e) {
-                return $this->translatableStringHelper->localize($e->getTitle());
-            },
+            'choice_label' => fn (Evaluation $e) => $this->translatableStringHelper->localize($e->getTitle()),
             'multiple' => true,
             'attr' => ['class' => 'select2'],
         ]);
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index c7c7d2352..1fdfd23d9 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -126,14 +126,10 @@ final class PersonContext implements PersonContextInterface
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
                 'class' => DocumentCategory::class,
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('c')
-                        ->where('c.documentClass = :docClass')
-                        ->setParameter('docClass', PersonDocument::class);
-                },
-                'choice_label' => function ($entity = null) {
-                    return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
-                },
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('c')
+                    ->where('c.documentClass = :docClass')
+                    ->setParameter('docClass', PersonDocument::class),
+                'choice_label' => fn ($entity = null) => $entity ? $this->translatableStringHelper->localize($entity->getName()) : '',
                 'required' => true,
             ]);
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
index 596e0a870..ac722f2f6 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
@@ -342,9 +342,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
 
         // check that the person id is contained
         $participationsPersonsIds = array_map(
-            static function ($participation) {
-                return $participation->person->id;
-            },
+            static fn ($participation) => $participation->person->id,
             $data->participations
         );
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
index 710c5fc6b..f01eeeaa9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
@@ -161,9 +161,7 @@ final class HouseholdApiControllerTest extends WebTestCase
         $this->assertArrayHasKey('count', $data);
         $this->assertArrayHasKey('results', $data);
 
-        $householdIds = array_map(static function ($r) {
-            return $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/PersonControllerUpdateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
index bb70866e2..94b618e41 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
@@ -294,49 +294,23 @@ final class PersonControllerUpdateTest extends WebTestCase
     public function validTextFieldsProvider()
     {
         return [
-            ['firstName', 'random Value', static function (Person $person) {
-                return $person->getFirstName();
-            }],
-            ['lastName', 'random Value', static function (Person $person) {
-                return $person->getLastName();
-            }],
+            ['firstName', 'random Value', static fn (Person $person) => $person->getFirstName()],
+            ['lastName', 'random Value', static fn (Person $person) => $person->getLastName()],
             // reminder: this value is capitalized
-            ['placeOfBirth', 'A PLACE', static function (Person $person) {
-                return $person->getPlaceOfBirth();
-            }],
-            ['birthdate', '1980-12-15', static function (Person $person) {
-                return $person->getBirthdate()->format('Y-m-d');
-            }],
+            ['placeOfBirth', 'A PLACE', static fn (Person $person) => $person->getPlaceOfBirth()],
+            ['birthdate', '1980-12-15', static fn (Person $person) => $person->getBirthdate()->format('Y-m-d')],
             // TODO test on phonenumber update
             // ['phonenumber', '+32123456789', static function (Person $person) { return $person->getPhonenumber(); }],
-            ['memo', 'jfkdlmq jkfldmsq jkmfdsq', static function (Person $person) {
-                return $person->getMemo();
-            }],
-            ['countryOfBirth', 'BE', static function (Person $person) {
-                return $person->getCountryOfBirth()->getCountryCode();
-            }],
-            ['nationality', 'FR', static function (Person $person) {
-                return $person->getNationality()->getCountryCode();
-            }],
-            ['placeOfBirth', '', static function (Person $person) {
-                return $person->getPlaceOfBirth();
-            }],
-            ['birthdate', '', static function (Person $person) {
-                return $person->getBirthdate();
-            }],
+            ['memo', 'jfkdlmq jkfldmsq jkmfdsq', static fn (Person $person) => $person->getMemo()],
+            ['countryOfBirth', 'BE', static fn (Person $person) => $person->getCountryOfBirth()->getCountryCode()],
+            ['nationality', 'FR', static fn (Person $person) => $person->getNationality()->getCountryCode()],
+            ['placeOfBirth', '', static fn (Person $person) => $person->getPlaceOfBirth()],
+            ['birthdate', '', static fn (Person $person) => $person->getBirthdate()],
             //['phonenumber', '', static function (Person $person) { return $person->getPhonenumber(); }],
-            ['memo', '', static function (Person $person) {
-                return $person->getMemo();
-            }],
-            ['countryOfBirth', null, static function (Person $person) {
-                return $person->getCountryOfBirth();
-            }],
-            ['nationality', null, static function (Person $person) {
-                return $person->getNationality();
-            }],
-            ['gender', Person::FEMALE_GENDER, static function (Person $person) {
-                return $person->getGender();
-            }],
+            ['memo', '', static fn (Person $person) => $person->getMemo()],
+            ['countryOfBirth', null, static fn (Person $person) => $person->getCountryOfBirth()],
+            ['nationality', null, static fn (Person $person) => $person->getNationality()],
+            ['gender', Person::FEMALE_GENDER, static fn (Person $person) => $person->getGender()],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
index 403f89dd4..441358c02 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
@@ -197,24 +197,12 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
     public function validTextFieldsProvider()
     {
         return [
-            ['firstName', 'random Value', static function (Person $person) {
-                return $person->getFirstName();
-            }],
-            ['lastName', 'random Value', static function (Person $person) {
-                return $person->getLastName();
-            }],
-            ['birthdate', '15-12-1980', static function (Person $person) {
-                return $person->getBirthdate()->format('d-m-Y');
-            }],
-            ['memo', 'jfkdlmq jkfldmsq jkmfdsq', static function (Person $person) {
-                return $person->getMemo();
-            }],
-            ['birthdate', '', static function (Person $person) {
-                return $person->getBirthdate();
-            }],
-            ['gender', Person::FEMALE_GENDER, static function (Person $person) {
-                return $person->getGender();
-            }],
+            ['firstName', 'random Value', static fn (Person $person) => $person->getFirstName()],
+            ['lastName', 'random Value', static fn (Person $person) => $person->getLastName()],
+            ['birthdate', '15-12-1980', static fn (Person $person) => $person->getBirthdate()->format('d-m-Y')],
+            ['memo', 'jfkdlmq jkfldmsq jkmfdsq', static fn (Person $person) => $person->getMemo()],
+            ['birthdate', '', static fn (Person $person) => $person->getBirthdate()],
+            ['gender', Person::FEMALE_GENDER, static fn (Person $person) => $person->getGender()],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
index 2f38da244..0a9c22df1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
@@ -152,9 +152,7 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
         $locations = $period->getLocationHistories()->toArray();
 
-        usort($locations, static function (AccompanyingPeriod\AccompanyingPeriodLocationHistory $a, AccompanyingPeriod\AccompanyingPeriodLocationHistory $b) {
-            return $a->getStartDate() <=> $b->getStartDate();
-        });
+        usort($locations, static fn (AccompanyingPeriod\AccompanyingPeriodLocationHistory $a, AccompanyingPeriod\AccompanyingPeriodLocationHistory $b) => $a->getStartDate() <=> $b->getStartDate());
 
         $iterator = new ArrayIterator($locations);
         $iterator->rewind();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php b/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
index a58560bdd..8ec7ee573 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
@@ -101,19 +101,13 @@ final class MembersEditorTest extends TestCase
         $editor = $factory->createEditor($household2 = new Household());
         $editor->addMovement(new DateTimeImmutable('yesterday'), $person, $positionNotSharing);
 
-        $sharings = $household->getCurrentMembers()->filter(static function (HouseholdMember $m) {
-            return $m->getShareHousehold();
-        });
-        $notSharing = $household2->getCurrentMembers()->filter(static function (HouseholdMember $m) {
-            return !$m->getShareHousehold();
-        });
+        $sharings = $household->getCurrentMembers()->filter(static fn (HouseholdMember $m) => $m->getShareHousehold());
+        $notSharing = $household2->getCurrentMembers()->filter(static fn (HouseholdMember $m) => !$m->getShareHousehold());
 
         $this->assertCount(1, $notSharing);
         $this->assertCount(1, $sharings);
 
-        $getPerson = static function (HouseholdMember $m) {
-            return $m->getPerson();
-        };
+        $getPerson = static fn (HouseholdMember $m) => $m->getPerson();
 
         $this->assertContains($person, $notSharing->map($getPerson));
     }
@@ -143,19 +137,13 @@ final class MembersEditorTest extends TestCase
         $editor = $factory->createEditor($household);
         $editor->addMovement(new DateTimeImmutable('yesterday'), $person, $positionNotSharing);
 
-        $sharings = $household->getCurrentMembers()->filter(static function (HouseholdMember $m) {
-            return $m->getShareHousehold();
-        });
-        $notSharing = $household->getCurrentMembers()->filter(static function (HouseholdMember $m) {
-            return !$m->getShareHousehold();
-        });
+        $sharings = $household->getCurrentMembers()->filter(static fn (HouseholdMember $m) => $m->getShareHousehold());
+        $notSharing = $household->getCurrentMembers()->filter(static fn (HouseholdMember $m) => !$m->getShareHousehold());
 
         $this->assertCount(1, $notSharing);
         $this->assertCount(0, $sharings);
 
-        $getPerson = static function (HouseholdMember $m) {
-            return $m->getPerson();
-        };
+        $getPerson = static fn (HouseholdMember $m) => $m->getPerson();
 
         $this->assertContains($person, $notSharing->map($getPerson));
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
index e85813d62..f7a05f7ce 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
@@ -318,9 +318,7 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
         $normalizerManager = $this->prophesize(NormalizerInterface::class);
         $normalizerManager->supportsNormalization(Argument::any(), 'docgen', Argument::any())->willReturn(true);
         $normalizerManager->normalize(Argument::type(Person::class), 'docgen', Argument::any())
-            ->will(static function ($args) use ($normalizer) {
-                return $normalizer->normalize($args[0], $args[1], $args[2]);
-            });
+            ->will(static fn ($args) => $normalizer->normalize($args[0], $args[1], $args[2]));
         $normalizerManager->normalize(Argument::any(), 'docgen', Argument::any())->will(
             static function ($args) {
                 if (is_iterable($args[0])) {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
index 05d2eace1..6b3f49fde 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
@@ -118,9 +118,7 @@ final class RelationshipDocGenNormalizerTest extends TestCase
     {
         $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
         $translatableStringHelper->localize(Argument::type('array'))->will(
-            static function ($args) {
-                return $args[0][array_keys($args[0])[0]];
-            }
+            static fn ($args) => $args[0][array_keys($args[0])[0]]
         );
 
         $normalizer = new RelationshipDocGenNormalizer(
@@ -130,9 +128,7 @@ final class RelationshipDocGenNormalizerTest extends TestCase
         $normalizerManager = $this->prophesize(NormalizerInterface::class);
         $normalizerManager->supportsNormalization(Argument::any(), 'docgen', Argument::any())->willReturn(true);
         $normalizerManager->normalize(Argument::type(Relationship::class), 'docgen', Argument::any())
-            ->will(static function ($args) use ($normalizer) {
-                return $normalizer->normalize($args[0], $args[1], $args[2]);
-            });
+            ->will(static fn ($args) => $normalizer->normalize($args[0], $args[1], $args[2]));
         $normalizerManager->normalize(Argument::any(), 'docgen', Argument::any())->will(
             static function ($args) {
                 if (null === $args[0]) {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php
index 17c6195b3..d0138dc30 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php
@@ -263,9 +263,7 @@ final class PersonContextTest extends TestCase
         if (null === $translatableStringHelper) {
             $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
             // return only the 'fr' key
-            $translatableStringHelper->localize(Argument::type('array'))->will(static function ($args) {
-                return $args[0]['fr'];
-            });
+            $translatableStringHelper->localize(Argument::type('array'))->will(static fn ($args) => $args[0]['fr']);
             $translatableStringHelper = $translatableStringHelper->reveal();
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextWithThirdPartyTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextWithThirdPartyTest.php
index a4f08e7c1..70bccfda4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextWithThirdPartyTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextWithThirdPartyTest.php
@@ -70,9 +70,7 @@ final class PersonContextWithThirdPartyTest extends KernelTestCase
     {
         $normalizer = $this->prophesize(NormalizerInterface::class);
         $normalizer->normalize(Argument::type(ThirdParty::class), 'docgen', Argument::type('array'))
-            ->will(static function ($args): array {
-                return ['class' => '3party', 'hash' => spl_object_hash($args[0])];
-            });
+            ->will(static fn ($args): array => ['class' => '3party', 'hash' => spl_object_hash($args[0])]);
 
         $personContext = $this->prophesize(PersonContextInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
index 9454d31d0..ed0337f1f 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
@@ -74,9 +74,7 @@ class AccompanyingPeriodValidityValidator extends ConstraintValidator
             $periodIssuesWithAncestors = array_merge(
                 $periodIssuesWithAncestors,
                 array_map(
-                    static function (SocialIssue $si) {
-                        return spl_object_hash($si);
-                    },
+                    static fn (SocialIssue $si) => spl_object_hash($si),
                     $si->getAncestors(true)
                 )
             );
diff --git a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
index 16ae19daa..9adae0097 100644
--- a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+++ b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
@@ -306,7 +306,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
         }
 
         // add the key from slugs and return
-        return array_merge($fields, array_keys($this->slugs));
+        return [...$fields, ...array_keys($this->slugs)];
     }
 
     public function getResult($query, $data)
@@ -331,9 +331,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         // throw an error if any fields are present
         if (!array_key_exists('fields', $data)) {
@@ -505,9 +503,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
     private function getCustomFields()
     {
         return array_filter($this->customfieldsGroup
-            ->getCustomFields()->toArray(), static function (CustomField $cf) {
-                return $cf->getType() !== 'title';
-            });
+            ->getCustomFields()->toArray(), static fn (CustomField $cf) => $cf->getType() !== 'title');
     }
 
     private function getLabelForCustomField($key, array $values, $data)
diff --git a/src/Bundle/ChillReportBundle/Search/ReportSearch.php b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
index e392c37f5..b08e01ee5 100644
--- a/src/Bundle/ChillReportBundle/Search/ReportSearch.php
+++ b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
@@ -97,9 +97,7 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
 
         foreach ($reachableCenters as $center) {
             $reachableScopesId = array_map(
-                static function (Scope $scope) {
-                    return $scope->getId();
-                },
+                static fn (Scope $scope) => $scope->getId(),
                 $this->helper->getReachableScopes($this->user, $role, $center)
             );
             $whereElement->add(
diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
index d299860bc..5c25861b1 100644
--- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
@@ -68,9 +68,7 @@ final class ReportControllerNextTest extends WebTestCase
         //filter customFieldsGroup to get only "situation de logement"
         $filteredCustomFieldsGroupHouse = array_filter(
             $customFieldsGroups,
-            static function (CustomFieldsGroup $group) {
-                return in_array('Situation de logement', $group->getName(), true);
-            }
+            static fn (CustomFieldsGroup $group) => in_array('Situation de logement', $group->getName(), true)
         );
         $this->group = $filteredCustomFieldsGroupHouse[0];
     }
diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
index 1afe851b8..69ccd3d54 100644
--- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
@@ -86,9 +86,7 @@ final class ReportControllerTest extends WebTestCase
         //filter customFieldsGroup to get only "situation de logement"
         $filteredCustomFieldsGroupHouse = array_filter(
             $customFieldsGroups,
-            static function (CustomFieldsGroup $group) {
-                return in_array('Situation de logement', $group->getName(), true);
-            }
+            static fn (CustomFieldsGroup $group) => in_array('Situation de logement', $group->getName(), true)
         );
         self::$group = $filteredCustomFieldsGroupHouse[0];
 
diff --git a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
index ecaabb495..95f85ed1f 100644
--- a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
@@ -67,9 +67,7 @@ final class TimelineProviderTest extends WebTestCase
             self::$em
                 ->getRepository(\Chill\MainBundle\Entity\Scope::class)
                 ->findAll(),
-            static function (Scope $scope) {
-                return $scope->getName()['en'] === 'social';
-            }
+            static fn (Scope $scope) => $scope->getName()['en'] === 'social'
         );
 
         $report = (new Report())
diff --git a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
index 900920a7f..0e28fffa9 100644
--- a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+++ b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
@@ -267,7 +267,7 @@ class TimelineReportProvider implements TimelineProviderInterface
                 '{scopes_ids}' => implode(', ', array_fill(0, count($scopeIds), '?')),
             ]);
             // append $scopeIds to parameters
-            $parameters = array_merge($parameters, $scopeIds);
+            $parameters = [...$parameters, ...$scopeIds];
         }
 
         if (0 === count($formattedClauses)) {
diff --git a/src/Bundle/ChillTaskBundle/Controller/TaskController.php b/src/Bundle/ChillTaskBundle/Controller/TaskController.php
index 6525d5572..435c9eaa2 100644
--- a/src/Bundle/ChillTaskBundle/Controller/TaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/TaskController.php
@@ -94,9 +94,7 @@ class TaskController extends AbstractController
         $transitionInstance = array_values( // array_values needed to reset keys (array_filter preserves keys)
             array_filter(
                 $workflow->getEnabledTransitions($task),
-                static function (Transition $t) use ($transition) {
-                    return $t->getName() === $transition;
-                }
+                static fn (Transition $t) => $t->getName() === $transition
             )
         )[0];
 
diff --git a/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php b/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
index 4020eeef3..2af71810d 100644
--- a/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
+++ b/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
@@ -218,13 +218,9 @@ class SingleTaskListType extends AbstractType
         $users = $this->getUsersAssigneedToTask($options);
         $choices = array_combine(
             // get usernames
-            array_map(static function (User $user) {
-                return $user->getUsername();
-            }, $users),
+            array_map(static fn (User $user) => $user->getUsername(), $users),
             // get ids
-            array_map(static function (User $user) {
-                return $user->getId();
-            }, $users)
+            array_map(static fn (User $user) => $user->getId(), $users)
         );
         $choices['Unassigned'] = '_unassigned';
 
diff --git a/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php b/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
index c51eb9ed4..2ff7092f0 100644
--- a/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
+++ b/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
@@ -92,9 +92,7 @@ final class SingleTaskControllerTest extends WebTestCase
 
         $center = array_filter(
             $centers,
-            static function (Center $c) use ($centerName) {
-                return $c->getName() === $centerName;
-            }
+            static fn (Center $c) => $c->getName() === $centerName
         )[0];
 
         $ids = $em
diff --git a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
index b29c1818e..9a8fcf6bd 100644
--- a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
+++ b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
@@ -86,9 +86,7 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn
             ->findBy(['id' => $ids]);
 
         return array_combine(
-            array_map(static function ($e) {
-                return $e->getId();
-            }, $events),
+            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 4d8ddd062..aa8776aa2 100644
--- a/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+++ b/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
@@ -97,9 +97,7 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
             ->findBy(['id' => $ids]);
 
         return array_combine(
-            array_map(static function ($e) {
-                return $e->getId();
-            }, $events),
+            array_map(static fn ($e) => $e->getId(), $events),
             $events
         );
     }
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
index 6b40f01b9..e813cbd7f 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
@@ -69,9 +69,7 @@ class LoadThirdParty extends Fixture implements DependentFixtureInterface
     private function getCenters(): Iterator
     {
         $references = array_map(
-            static function ($a) {
-                return $a['ref'];
-            },
+            static fn ($a) => $a['ref'],
             LoadCenters::$centers
         );
         $number = random_int(1, count($references));
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index ca24d2442..09b8ba516 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -189,7 +189,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      * @ORM\JoinColumn(name="created_by", referencedColumnName="id")
      */
-    private ?User $createdBy;
+    private ?User $createdBy = null;
 
     /**
      * @ORM\Column(name="email", type="string", length=255, nullable=true)
@@ -272,13 +272,13 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(name="updated_at", type="datetime_immutable", nullable=true)
      */
-    private ?DateTimeImmutable $updatedAt;
+    private ?DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      * @ORM\JoinColumn(name="updated_by", referencedColumnName="id")
      */
-    private ?User $updatedBy;
+    private ?User $updatedBy = null;
 
     /**
      * ThirdParty constructor.
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
index ed4b3c1e7..0dd4f16e6 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
@@ -103,15 +103,11 @@ class PickThirdPartyType extends AbstractType
 
         $resolver
             ->setDefault('class', ThirdParty::class)
-            ->setDefault('choice_label', static function (ThirdParty $tp) {
-                return $tp->getName();
-            })
-            ->setDefault('choice_loader', function (Options $options) {
-                return new ThirdPartyChoiceLoader(
-                    $options['center'],
-                    $this->em->getRepository(ThirdParty::class)
-                );
-            });
+            ->setDefault('choice_label', static fn (ThirdParty $tp) => $tp->getName())
+            ->setDefault('choice_loader', fn (Options $options) => new ThirdPartyChoiceLoader(
+                $options['center'],
+                $this->em->getRepository(ThirdParty::class)
+            ));
     }
 
     public function getParent(): string
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
index eb7966084..26cb0ae2e 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
@@ -77,9 +77,7 @@ class PickThirdPartyTypeCategoryType extends \Symfony\Component\Form\AbstractTyp
 
                 return self::PREFIX_TYPE . $item;
             },
-            'choice_value' => function ($item) {
-                return $this->reverseTransform($item);
-            },
+            'choice_value' => fn ($item) => $this->reverseTransform($item),
         ]);
     }