diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
index 99adf4fe0..698c8b370 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
@@ -15,9 +15,9 @@ use Chill\ActivityBundle\Entity\ActivityType;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
+final readonly class ActivityTypeRepository implements ActivityTypeRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
index a0c23a4ad..b2bb9e82e 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
@@ -15,9 +15,9 @@ use Chill\BudgetBundle\Entity\ChargeKind;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class ChargeKindRepository implements ChargeKindRepositoryInterface
+final readonly class ChargeKindRepository implements ChargeKindRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
index 723f26748..18051f120 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
@@ -15,9 +15,9 @@ use Chill\BudgetBundle\Entity\ResourceKind;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class ResourceKindRepository implements ResourceKindRepositoryInterface
+final readonly class ResourceKindRepository implements ResourceKindRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
index b46ee09b2..1ee3f0ba1 100644
--- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
@@ -21,14 +21,14 @@ use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-final class RelatorioDriver implements DriverInterface
+final readonly class RelatorioDriver implements DriverInterface
 {
-    private readonly string $url;
+    private string $url;
 
     public function __construct(
-        private readonly HttpClientInterface $client,
+        private HttpClientInterface $client,
         ParameterBagInterface $parameterBag,
-        private readonly LoggerInterface $logger
+        private LoggerInterface $logger
     ) {
         $this->url = $parameterBag->get('chill_doc_generator')['driver']['relatorio']['url'];
     }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
index b5f409032..498daf7ba 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
@@ -16,11 +16,11 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Component\HttpFoundation\RequestStack;
 
-final class DocGeneratorTemplateRepository implements DocGeneratorTemplateRepositoryInterface
+final readonly class DocGeneratorTemplateRepository implements DocGeneratorTemplateRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager, private readonly RequestStack $requestStack)
+    public function __construct(EntityManagerInterface $entityManager, private RequestStack $requestStack)
     {
         $this->repository = $entityManager->getRepository(DocGeneratorTemplate::class);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
index 86faf6ea1..3e8d060c3 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
@@ -20,11 +20,11 @@ use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-final class AddressReferenceRepository implements ObjectRepository
+final readonly class AddressReferenceRepository implements ObjectRepository
 {
-    private readonly EntityManagerInterface $entityManager;
+    private EntityManagerInterface $entityManager;
 
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
index 074b1fc32..4dbd09cab 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
@@ -17,9 +17,9 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-final class AddressRepository implements ObjectRepository
+final readonly class AddressRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/CenterRepository.php b/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
index 0b507faa1..1bc5a7405 100644
--- a/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
@@ -15,9 +15,9 @@ use Chill\MainBundle\Entity\Center;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class CenterRepository implements CenterRepositoryInterface
+final readonly class CenterRepository implements CenterRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/CountryRepository.php b/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
index 701019dba..ae318e35e 100644
--- a/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
@@ -17,9 +17,9 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-final class CountryRepository implements ObjectRepository
+final readonly class CountryRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php
index 11a03c209..1135b889d 100644
--- a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php
@@ -15,9 +15,9 @@ use Chill\MainBundle\Entity\GeographicalUnitLayer;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class GeographicalUnitLayerLayerRepository implements GeographicalUnitLayerRepositoryInterface
+final readonly class GeographicalUnitLayerLayerRepository implements GeographicalUnitLayerRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
index 608609a11..35ec31ff3 100644
--- a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
@@ -18,9 +18,9 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 
-final class GeographicalUnitRepository implements GeographicalUnitRepositoryInterface
+final readonly class GeographicalUnitRepository implements GeographicalUnitRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php b/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
index 2d9ad8c5a..d0f5d8561 100644
--- a/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
@@ -16,9 +16,9 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
 
-final class GroupCenterRepository implements ObjectRepository
+final readonly class GroupCenterRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php b/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
index d8c5d54f8..28d21d2c1 100644
--- a/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
@@ -15,9 +15,9 @@ use Chill\MainBundle\Entity\Language;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class LanguageRepository implements LanguageRepositoryInterface
+final readonly class LanguageRepository implements LanguageRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php b/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
index 910d924db..598894b61 100644
--- a/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
@@ -16,9 +16,9 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
 
-final class PermissionsGroupRepository implements ObjectRepository
+final readonly class PermissionsGroupRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
index 0949f52ba..0779ea90a 100644
--- a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
@@ -19,11 +19,11 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 
-final class PostalCodeRepository implements PostalCodeRepositoryInterface
+final readonly class PostalCodeRepository implements PostalCodeRepositoryInterface
 {
-    private readonly EntityManagerInterface $entityManager;
+    private EntityManagerInterface $entityManager;
 
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
index e18279944..793015f5b 100644
--- a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
@@ -18,9 +18,9 @@ use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\NoResultException;
 use Doctrine\Persistence\ObjectRepository;
 
-final class RegroupmentRepository implements ObjectRepository
+final readonly class RegroupmentRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php b/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
index ddf52af5b..a00d2ce35 100644
--- a/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
@@ -16,9 +16,9 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
 
-final class RoleScopeRepository implements ObjectRepository
+final readonly class RoleScopeRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
index aa3c78270..4f752bce0 100644
--- a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
@@ -17,11 +17,11 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 
-final class ScopeRepository implements ScopeRepositoryInterface
+final readonly class ScopeRepository implements ScopeRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager, private readonly TranslatableStringHelperInterface $translatableStringHelper)
+    public function __construct(EntityManagerInterface $entityManager, private TranslatableStringHelperInterface $translatableStringHelper)
     {
         $this->repository = $entityManager->getRepository(Scope::class);
     }
diff --git a/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
index b5fedeec0..b7fc7a8cc 100644
--- a/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
@@ -15,11 +15,11 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-final class TranslatableStringHelper implements TranslatableStringHelperInterface
+final readonly class TranslatableStringHelper implements TranslatableStringHelperInterface
 {
-    private readonly string $defaultLocale;
+    private string $defaultLocale;
 
-    public function __construct(private readonly RequestStack $requestStack, private readonly TranslatorInterface $translator, ParameterBagInterface $parameterBag)
+    public function __construct(private RequestStack $requestStack, private TranslatorInterface $translator, ParameterBagInterface $parameterBag)
     {
         $this->defaultLocale = $parameterBag->get('kernel.default_locale');
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
index 6061f36ca..e15539fb1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
@@ -20,13 +20,13 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
-final class OriginAggregator implements AggregatorInterface
+final readonly class OriginAggregator implements AggregatorInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(
         EntityManagerInterface $em,
-        private readonly TranslatableStringHelper $translatableStringHelper
+        private TranslatableStringHelper $translatableStringHelper
     ) {
         $this->repository = $em->getRepository(Origin::class);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
index 4e092beb0..7c24b8a61 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
@@ -21,9 +21,9 @@ use Doctrine\ORM\EntityRepository;
  * @method AccompanyingPeriodWorkGoal[]    findAll()
  * @method AccompanyingPeriodWorkGoal[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-final class AccompanyingPeriodWorkGoalRepository
+final readonly class AccompanyingPeriodWorkGoalRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
index 3759cf2cd..5ad717d0c 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
@@ -15,9 +15,9 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class CommentRepository
+final readonly class CommentRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
index 1668b456e..2e50386c8 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
@@ -15,9 +15,9 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class OriginRepository
+final readonly class OriginRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php
index a5dbf4b69..66a2daea5 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php
@@ -15,9 +15,9 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class ResourceRepository
+final readonly class ResourceRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
index 616c56eb0..0a2d00bcd 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
@@ -15,9 +15,9 @@ use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class AccompanyingPeriodParticipationRepository
+final readonly class AccompanyingPeriodParticipationRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
index 7b681a8f5..73f1beecb 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
@@ -18,9 +18,9 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-final class AccompanyingPeriodRepository implements ObjectRepository
+final readonly class AccompanyingPeriodRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
index 5a0dee15d..1bd72fd35 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
@@ -16,9 +16,9 @@ use Chill\PersonBundle\Entity\Household\HouseholdComposition;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class HouseholdCompositionRepository implements HouseholdCompositionRepositoryInterface
+final readonly class HouseholdCompositionRepository implements HouseholdCompositionRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
index 2b748865b..666895696 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
@@ -15,9 +15,9 @@ use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class HouseholdCompositionTypeRepository implements HouseholdCompositionTypeRepositoryInterface
+final readonly class HouseholdCompositionTypeRepository implements HouseholdCompositionTypeRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
index e76e88fc3..777b14cdd 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
@@ -15,9 +15,9 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class HouseholdMembersRepository
+final readonly class HouseholdMembersRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
index 2904ffb61..271883080 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
@@ -18,7 +18,7 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-final class HouseholdRepository implements ObjectRepository
+final readonly class HouseholdRepository implements ObjectRepository
 {
     private const SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION = <<<'SQL'
         WITH participations AS (
@@ -40,9 +40,9 @@ final class HouseholdRepository implements ObjectRepository
         SELECT {select} FROM households {limits}
         SQL;
 
-    private readonly EntityManagerInterface $em;
+    private EntityManagerInterface $em;
 
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
index ebcfabe4f..f9132c2bd 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
@@ -16,9 +16,9 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
 
-final class PersonHouseholdAddressRepository implements ObjectRepository
+final readonly class PersonHouseholdAddressRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
index 32ca5b8fa..585f2aedb 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
@@ -18,9 +18,9 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
 
-final class PositionRepository implements ObjectRepository
+final readonly class PositionRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
index 4a1ee1dd6..8a8bf0e7c 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
@@ -15,9 +15,9 @@ use Chill\PersonBundle\Entity\PersonAltName;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class PersonAltNameRepository
+final readonly class PersonAltNameRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php
index 6694f0e32..f1946bd37 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php
@@ -16,9 +16,9 @@ use Chill\PersonBundle\Entity\PersonNotDuplicate;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class PersonNotDuplicateRepository
+final readonly class PersonNotDuplicateRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
index b2bff2ce5..3caae8444 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
@@ -17,9 +17,9 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-final class PersonResourceRepository implements ObjectRepository
+final readonly class PersonResourceRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
index a7b739f7d..1c89a98f6 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
@@ -15,9 +15,9 @@ use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class EvaluationRepository implements EvaluationRepositoryInterface
+final readonly class EvaluationRepository implements EvaluationRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
index f99bd54a5..ec89c597d 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
@@ -18,9 +18,9 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-final class GoalRepository implements ObjectRepository
+final readonly class GoalRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
index 786c6635a..0d470d2d7 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
@@ -19,9 +19,9 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-final class ResultRepository implements ObjectRepository
+final readonly class ResultRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
index da6bfcc46..fe530e84b 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
@@ -17,9 +17,9 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-final class SocialActionRepository implements ObjectRepository
+final readonly class SocialActionRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
index 21f06afd1..c9bb3a189 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
@@ -17,9 +17,9 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-final class SocialIssueRepository implements ObjectRepository
+final readonly class SocialIssueRepository implements ObjectRepository
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index bf4b7da0d..890fa40ff 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -47,25 +47,25 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 /**
  * @see PersonContextTest
  */
-final class PersonContext implements PersonContextInterface
+final readonly class PersonContext implements PersonContextInterface
 {
-    private readonly bool $showScopes;
+    private bool $showScopes;
 
     public function __construct(
-        private readonly AuthorizationHelperInterface $authorizationHelper,
-        private readonly BaseContextData $baseContextData,
-        private readonly CenterResolverManagerInterface $centerResolverManager,
-        private readonly DocumentCategoryRepository $documentCategoryRepository,
-        private readonly EntityManagerInterface $em,
-        private readonly NormalizerInterface $normalizer,
+        private AuthorizationHelperInterface $authorizationHelper,
+        private BaseContextData $baseContextData,
+        private CenterResolverManagerInterface $centerResolverManager,
+        private DocumentCategoryRepository $documentCategoryRepository,
+        private EntityManagerInterface $em,
+        private NormalizerInterface $normalizer,
         ParameterBagInterface $parameterBag,
-        private readonly ScopeRepositoryInterface $scopeRepository,
-        private readonly Security $security,
-        private readonly TranslatorInterface $translator,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper,
-        private readonly ThirdPartyRender $thirdPartyRender,
-        private readonly ThirdPartyRepository $thirdPartyRepository,
-        private readonly ResidentialAddressRepository $residentialAddressRepository
+        private ScopeRepositoryInterface $scopeRepository,
+        private Security $security,
+        private TranslatorInterface $translator,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+        private ThirdPartyRender $thirdPartyRender,
+        private ThirdPartyRepository $thirdPartyRepository,
+        private ResidentialAddressRepository $residentialAddressRepository
     ) {
         $this->showScopes = $parameterBag->get('chill_main')['acl']['form_show_scopes'];
     }
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
index f263afcc8..2b569014d 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
@@ -27,18 +27,18 @@ use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Mime\MimeTypes;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 
-final class ChillDocumentManager implements DocumentManagerInterface
+final readonly class ChillDocumentManager implements DocumentManagerInterface
 {
-    private readonly RequestInterface $request;
+    private RequestInterface $request;
 
     public function __construct(
-        private readonly DocumentLockManagerInterface $documentLockManager,
-        private readonly EntityManagerInterface $entityManager,
+        private DocumentLockManagerInterface $documentLockManager,
+        private EntityManagerInterface $entityManager,
         HttpMessageFactoryInterface $httpMessageFactory,
-        private readonly Psr17Interface $psr17,
+        private Psr17Interface $psr17,
         RequestStack $requestStack,
-        private readonly StoredObjectManagerInterface $storedObjectManager,
-        private readonly StoredObjectRepository $storedObjectRepository
+        private StoredObjectManagerInterface $storedObjectManager,
+        private StoredObjectRepository $storedObjectRepository
     ) {
         $this->request = $httpMessageFactory->createRequest($requestStack->getCurrentRequest());
     }