Fix DI on other services depending on updated repositories.

src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php

@@ -24,28 +24,17 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class AgeAggregator implements AggregatorInterface,
-    ExportElementValidatedInterface
+final class AgeAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    /**
-     *
-     * @var 
-     */
-    protected $translator;
-    
-    public function __construct($translator)
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }
 
-    
     public function addRole()
     {
         return null;

src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php

@@ -29,40 +29,23 @@ use Chill\MainBundle\Util\CountriesInfo;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Repository\CountryRepository;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
-
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class CountryOfBirthAggregator implements AggregatorInterface,
-    ExportElementValidatedInterface
+final class CountryOfBirthAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    /**
-     *
-     * @var EntityRepository
-     */
-    protected $countriesRepository;
+    private CountryRepository $countriesRepository;
 
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
+    private TranslatableStringHelper $translatableStringHelper;
 
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    private TranslatorInterface $translator;
 
-    public function __construct(EntityRepository $countriesRepository,
-            TranslatableStringHelper $translatableStringHelper,
-            TranslatorInterface $translator)
-    {
+    public function __construct(
+        CountryRepository $countriesRepository,
+        TranslatableStringHelper $translatableStringHelper,
+        TranslatorInterface $translator
+    ) {
         $this->countriesRepository = $countriesRepository;
         $this->translatableStringHelper = $translatableStringHelper;
         $this->translator = $translator;
@@ -73,7 +56,6 @@ class CountryOfBirthAggregator implements AggregatorInterface,
         return 'person';
     }
 
-
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('group_by_level', ChoiceType::class, array(

src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php

@@ -26,31 +26,20 @@ use Symfony\Component\Translation\TranslatorInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Declarations;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class GenderAggregator implements AggregatorInterface
+final class GenderAggregator implements AggregatorInterface
 {
-   
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
+    private TranslatorInterface $translator;
+
     public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }
-    
+
     public function applyOn()
     {
         return Declarations::PERSON_TYPE;
     }
-    
-    
+
     public function buildForm(FormBuilderInterface $builder)
     {
         

src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php

@@ -29,39 +29,23 @@ use Chill\MainBundle\Util\CountriesInfo;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Repository\CountryRepository;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class NationalityAggregator implements AggregatorInterface,
-    ExportElementValidatedInterface
+final class NationalityAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    /**
-     *
-     * @var EntityRepository
-     */
-    protected $countriesRepository;
+    private CountryRepository $countriesRepository;
 
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
+    private TranslatableStringHelper $translatableStringHelper;
 
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    private TranslatorInterface $translator;
 
-    public function __construct(EntityRepository $countriesRepository,
-            TranslatableStringHelper $translatableStringHelper,
-            TranslatorInterface $translator)
-    {
+    public function __construct(
+        CountryRepository $countriesRepository,
+        TranslatableStringHelper $translatableStringHelper,
+        TranslatorInterface $translator
+    ) {
         $this->countriesRepository = $countriesRepository;
         $this->translatableStringHelper = $translatableStringHelper;
         $this->translator = $translator;

src/Bundle/ChillPersonBundle/config/services.yaml

@@ -68,6 +68,11 @@ services:
         resource: '../Controller/'
         tags: ['controller.service_arguments']
 
+    Chill\PersonBundle\Export\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Export/'
+
     Chill\PersonBundle\Templating\Entity\:
         autowire: true
         autoconfigure: true

src/Bundle/ChillPersonBundle/config/services/exports.yaml

@@ -36,43 +36,39 @@ services:
     chill.person.export.filter_birthdate:
         class: Chill\PersonBundle\Export\Filter\BirthdateFilter
         tags:
-            - { name: chill.export_filter, alias: person_birthdate_filter } 
-                
+            - { name: chill.export_filter, alias: person_birthdate_filter }
+
     chill.person.export.filter_nationality:
         class: Chill\PersonBundle\Export\Filter\NationalityFilter
-        arguments:
-            - "@chill.main.helper.translatable_string"
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: person_nationality_filter }
             
     chill.person.export.aggregator_nationality:
         class: Chill\PersonBundle\Export\Aggregator\NationalityAggregator
-        arguments:
-            - "@chill.main.countries_repository"
-            - "@chill.main.helper.translatable_string"
-            - "@translator"
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: chill.export_aggregator, alias: person_nationality_aggregator }
             
     chill.person.export.aggregator_country_of_birth:
         class: Chill\PersonBundle\Export\Aggregator\CountryOfBirthAggregator
-        arguments:
-            - "@chill.main.countries_repository"
-            - "@chill.main.helper.translatable_string"
-            - "@translator"
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: chill.export_aggregator, alias: person_country_of_birth_aggregator }
             
     chill.person.export.aggregator_gender:
         class: Chill\PersonBundle\Export\Aggregator\GenderAggregator
-        arguments:
-            - "@translator"
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: chill.export_aggregator, alias: person_gender_aggregator }
     
     chill.person.export.aggregator_age:
         class: Chill\PersonBundle\Export\Aggregator\AgeAggregator
-        arguments:
-            - "@translator"
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: chill.export_aggregator, alias: person_age_aggregator }