Revert "apply rector rules for exports"

This reverts commit 3adf3625
2025-06-07 18:44:08 +00:00 · 2023-06-18 11:57:26 +02:00 · 2023-06-18 11:57:26 +02:00 · 960acb8c0a
commit 960acb8c0a
parent c52ba06ea0
167 changed files with 51 additions and 672 deletions
--- a/docs/source/_static/code/exports/BirthdateFilter.php
+++ b/docs/source/_static/code/exports/BirthdateFilter.php
@ -62,6 +62,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
    {
        $builder->add('date_from', DateType::class, [
            'label' => 'Born after this date',
+            'data' => new DateTime(),
            'attr' => ['class' => 'datepicker'],
            'widget' => 'single_text',
            'format' => 'dd-MM-yyyy',
@ -69,15 +70,12 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac

        $builder->add('date_to', DateType::class, [
            'label' => 'Born before this date',
+            'data' => new DateTime(),
            'attr' => ['class' => 'datepicker'],
            'widget' => 'single_text',
            'format' => 'dd-MM-yyyy',
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return ['date_from' => new DateTime(), 'date_to' => new DateTime()];
-    }

    // here, we create a simple string which will describe the action of
    // the filter in the Response
--- a/docs/source/_static/code/exports/CountPerson.php
+++ b/docs/source/_static/code/exports/CountPerson.php
@ -36,10 +36,6 @@ class CountPerson implements ExportInterface
    {
        // this export does not add any form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes()
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
@ -40,10 +40,6 @@ class ByActivityNumberAggregator implements AggregatorInterface
    {
        // No form needed
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByCreatorAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByCreatorAggregator.php
@ -52,10 +52,6 @@ class ByCreatorAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
@ -57,10 +57,6 @@ class BySocialActionAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
@ -57,10 +57,6 @@ class BySocialIssueAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php
@ -57,10 +57,6 @@ class ByThirdpartyAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/CreatorScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/CreatorScopeAggregator.php
@ -57,10 +57,6 @@ class CreatorScopeAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
@ -75,12 +75,10 @@ class DateAggregator implements AggregatorInterface
            'choices' => self::CHOICES,
            'multiple' => false,
            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return ['frequency' => self::DEFAULT_CHOICE];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php
@ -57,10 +57,6 @@ class LocationTypeAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
@ -60,10 +60,6 @@ class ActivityTypeAggregator implements AggregatorInterface
    {
        // no form required for this aggregator
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data): Closure
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
@ -58,10 +58,6 @@ class ActivityUserAggregator implements AggregatorInterface
    {
        // nothing to add
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, $values, $data): Closure
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php
@ -56,10 +56,6 @@ class ActivityUsersAggregator implements AggregatorInterface
    {
        // nothing to add on the form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php
@ -55,10 +55,6 @@ class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorI
    {
        // nothing to add in the form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php
@ -55,10 +55,6 @@ class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\Aggregato
    {
        // nothing to add in the form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
@ -110,10 +110,6 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
            ]
        );
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
@ -47,10 +47,6 @@ class SentReceivedAggregator implements AggregatorInterface
    {
        // No form needed
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data): callable
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
@ -39,10 +39,6 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
    public function buildForm(FormBuilderInterface $builder)
    {
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes(): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
@ -40,10 +40,6 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
    {
        // TODO: Implement buildForm() method.
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes(): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
@ -39,10 +39,6 @@ class CountActivity implements ExportInterface, GroupedExportInterface
    public function buildForm(FormBuilderInterface $builder)
    {
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes(): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
@ -40,10 +40,6 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
    {
        // TODO: Implement buildForm() method.
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes(): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
@ -40,10 +40,6 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
    {
        // TODO: Implement buildForm() method.
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes(): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
@ -35,10 +35,6 @@ class CountActivity implements ExportInterface, GroupedExportInterface
    public function buildForm(FormBuilderInterface $builder)
    {
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes()
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
@ -53,10 +53,6 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
    public function buildForm(FormBuilderInterface $builder)
    {
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes()
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
@ -68,10 +68,6 @@ class ActivityTypeFilter implements FilterInterface
            'expanded' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByCreatorFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByCreatorFilter.php
@ -52,10 +52,6 @@ class ByCreatorFilter implements FilterInterface
            'multiple' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
@ -60,10 +60,6 @@ class BySocialActionFilter implements FilterInterface
            'multiple' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
@ -60,10 +60,6 @@ class BySocialIssueFilter implements FilterInterface
            'multiple' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php
@ -67,12 +67,10 @@ class EmergencyFilter implements FilterInterface
            'choices' => self::CHOICES,
            'multiple' => false,
            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return ['accepted_emergency' => self::DEFAULT_CHOICE];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php
@ -44,10 +44,6 @@ class HasNoActivityFilter implements FilterInterface
    {
        //no form needed
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationFilter.php
@ -46,10 +46,6 @@ class LocationFilter implements FilterInterface
            'label' => 'pick location',
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php
@ -65,10 +65,6 @@ class LocationTypeFilter implements FilterInterface
            //'label' => false,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php
@ -69,12 +69,9 @@ class SentReceivedFilter implements FilterInterface
            'multiple' => false,
            'expanded' => true,
            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return ['accepted_sentreceived' => self::DEFAULT_CHOICE];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php
@ -61,10 +61,6 @@ class UserFilter implements FilterInterface
            'label' => 'Creators',
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
@ -71,10 +71,6 @@ class UserScopeFilter implements FilterInterface
            'expanded' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
@ -127,10 +127,6 @@ class ActivityDateFilter implements FilterInterface
            }
        });
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string')
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@ -78,10 +78,6 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
            ],
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string')
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
@ -56,10 +56,6 @@ class ActivityUsersFilter implements FilterInterface
            'label' => 'Users',
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string')
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
@ -82,10 +82,6 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
            'expanded' => false,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string')
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
@ -112,6 +112,7 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
    {
        $builder->add('date_from', DateType::class, [
            'label' => 'Implied in an activity after this date',
+            'data' => new DateTime(),
            'attr' => ['class' => 'datepicker'],
            'widget' => 'single_text',
            'format' => 'dd-MM-yyyy',
@ -119,6 +120,7 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt

        $builder->add('date_to', DateType::class, [
            'label' => 'Implied in an activity before this date',
+            'data' => new DateTime(),
            'attr' => ['class' => 'datepicker'],
            'widget' => 'single_text',
            'format' => 'dd-MM-yyyy',
@ -128,6 +130,7 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
            'class' => ActivityReason::class,
            'choice_label' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getName()),
            'group_by' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
+            'data' => $this->activityReasonRepository->findAll(),
            'multiple' => true,
            'expanded' => false,
            'label' => 'Activity reasons for those activities',
@ -173,10 +176,6 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
            }
        });
    }
-    public function getFormDefaultData(): array
-    {
-        return ['date_from' => new DateTime(), 'date_to' => new DateTime(), 'reasons' => $this->activityReasonRepository->findAll()];
-    }

    public function describeAction($data, $format = 'string')
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
@ -60,10 +60,6 @@ class UsersJobFilter implements FilterInterface
            'expanded' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string')
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
@ -67,10 +67,6 @@ class UsersScopeFilter implements FilterInterface
            'expanded' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string')
    {
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php
@ -50,10 +50,6 @@ class ByActivityTypeAggregator implements AggregatorInterface
    {
        // No form needed
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php
@ -57,10 +57,6 @@ class ByUserJobAggregator implements AggregatorInterface
    {
        // nothing to add in the form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php
@ -57,10 +57,6 @@ class ByUserScopeAggregator implements AggregatorInterface
    {
        // nothing to add in the form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/AvgAsideActivityDuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/AvgAsideActivityDuration.php
@ -34,10 +34,6 @@ class AvgAsideActivityDuration implements ExportInterface, GroupedExportInterfac
    public function buildForm(FormBuilderInterface $builder)
    {
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes(): array
    {
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php
@ -34,10 +34,6 @@ class CountAsideActivity implements ExportInterface, GroupedExportInterface
    public function buildForm(FormBuilderInterface $builder)
    {
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes(): array
    {
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumAsideActivityDuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumAsideActivityDuration.php
@ -34,10 +34,6 @@ class SumAsideActivityDuration implements ExportInterface, GroupedExportInterfac
    public function buildForm(FormBuilderInterface $builder)
    {
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes(): array
    {
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php
@ -76,10 +76,6 @@ class ByActivityTypeFilter implements FilterInterface
                },
            ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
@ -119,10 +119,6 @@ class ByDateFilter implements FilterInterface
            }
        });
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
@ -53,10 +53,6 @@ class ByUserFilter implements FilterInterface
            'label' => 'Creators',
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php
@ -60,10 +60,6 @@ class ByUserJobFilter implements FilterInterface
            'expanded' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string')
    {
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php
@ -67,10 +67,6 @@ class ByUserScopeFilter implements FilterInterface
            'expanded' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string')
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
@ -58,10 +58,6 @@ final class AgentAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data): Closure
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
@ -59,10 +59,6 @@ class CancelReasonAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data): Closure
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
@ -58,10 +58,6 @@ final class JobAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data): Closure
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
@ -52,10 +52,6 @@ final class LocationAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data): Closure
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
@ -58,10 +58,6 @@ final class LocationTypeAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data): Closure
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
@ -40,10 +40,6 @@ class MonthYearAggregator implements AggregatorInterface
    {
        // No form needed
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data): Closure
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
@ -58,10 +58,6 @@ final class ScopeAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data): Closure
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/UrgencyAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/UrgencyAggregator.php
@ -56,10 +56,6 @@ class UrgencyAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data): Closure
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
@ -36,10 +36,6 @@ class CountCalendars implements ExportInterface, GroupedExportInterface
    {
        // No form necessary
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes(): array
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
@ -36,10 +36,6 @@ class StatCalendarAvgDuration implements ExportInterface, GroupedExportInterface
    {
        // no form needed
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes(): array
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
@ -36,10 +36,6 @@ class StatCalendarSumDuration implements ExportInterface, GroupedExportInterface
    {
        // no form needed
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getAllowedFormattersTypes(): array
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
@ -63,10 +63,6 @@ class AgentFilter implements FilterInterface
            'expanded' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
@ -67,10 +67,6 @@ class BetweenDatesFilter implements FilterInterface
                'data' => new RollingDate(RollingDate::T_TODAY),
            ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php
@ -69,12 +69,9 @@ class CalendarRangeFilter implements FilterInterface
            'multiple' => false,
            'expanded' => true,
            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return ['hasCalendarRange' => self::DEFAULT_CHOICE];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
@ -76,10 +76,6 @@ class JobFilter implements FilterInterface
            'expanded' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string'): array
    {
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
@ -76,10 +76,6 @@ class ScopeFilter implements FilterInterface
            'expanded' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function describeAction($data, $format = 'string')
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
@ -57,10 +57,6 @@ class AdministrativeLocationAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php
@ -39,10 +39,6 @@ class ByActionNumberAggregator implements AggregatorInterface
    {
        // No form needed
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
@ -52,10 +52,6 @@ class ClosingMotiveAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php
@ -48,10 +48,6 @@ class ConfidentialAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php
@ -57,10 +57,6 @@ class CreatorJobAggregator implements AggregatorInterface
    {
        // No form needed
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
@ -84,10 +84,6 @@ final class DurationAggregator implements AggregatorInterface
            'expanded' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php
@ -48,10 +48,6 @@ class EmergencyAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php
@ -61,10 +61,6 @@ final class EvaluationAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
@ -133,10 +133,6 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
                'expanded' => true,
            ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
@ -48,10 +48,6 @@ class IntensityAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
@ -59,10 +59,6 @@ final class OriginAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
@ -81,14 +81,11 @@ final class ReferrerAggregator implements AggregatorInterface
    {
        $builder
            ->add('date_calc', PickRollingDateType::class, [
+                'data' => new RollingDate(RollingDate::T_TODAY),
                'label' => 'export.aggregator.course.by_referrer.Computation date for referrer',
                'required' => true,
            ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
@ -88,14 +88,11 @@ class ReferrerScopeAggregator implements AggregatorInterface
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('date_calc', PickRollingDateType::class, [
+            'data' => new RollingDate(RollingDate::T_TODAY),
            'label' => 'export.aggregator.course.by_user_scope.Computation date for referrer',
            'required' => true,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
@ -69,10 +69,6 @@ final class RequestorAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
@ -57,10 +57,6 @@ final class ScopeAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php
@ -58,10 +58,6 @@ final class SocialActionAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
@ -58,10 +58,6 @@ final class SocialIssueAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
@ -76,11 +76,9 @@ final class StepAggregator implements AggregatorInterface

    public function buildForm(FormBuilderInterface $builder)
    {
-        $builder->add('on_date', PickRollingDateType::class, []);
-    }
-    public function getFormDefaultData(): array
-    {
-        return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
+        $builder->add('on_date', PickRollingDateType::class, [
+            'data' => new RollingDate(RollingDate::T_TODAY),
+        ]);
    }

    public function getLabels($key, array $values, $data)
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php
@ -57,10 +57,6 @@ final class UserJobAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php
@ -75,12 +75,9 @@ class ByEndDateAggregator implements AggregatorInterface
            'multiple' => false,
            'expanded' => true,
            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return ['frequency' => self::DEFAULT_CHOICE];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php
@ -75,12 +75,9 @@ class ByMaxDateAggregator implements AggregatorInterface
            'multiple' => false,
            'expanded' => true,
            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return ['frequency' => self::DEFAULT_CHOICE];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php
@ -75,12 +75,9 @@ class ByStartDateAggregator implements AggregatorInterface
            'multiple' => false,
            'expanded' => true,
            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return ['frequency' => self::DEFAULT_CHOICE];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
@ -52,10 +52,6 @@ class EvaluationTypeAggregator implements AggregatorInterface
    {
        // no form
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/HavingEndDateAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/HavingEndDateAggregator.php
@ -48,10 +48,6 @@ class HavingEndDateAggregator implements AggregatorInterface
    {
        // No form needed
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
@ -72,11 +72,9 @@ class ChildrenNumberAggregator implements AggregatorInterface

    public function buildForm(FormBuilderInterface $builder)
    {
-        $builder->add('on_date', PickRollingDateType::class, []);
-    }
-    public function getFormDefaultData(): array
-    {
-        return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
+        $builder->add('on_date', PickRollingDateType::class, [
+            'data' => new RollingDate(RollingDate::T_TODAY),
+        ]);
    }

    public function getLabels($key, array $values, $data)
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
@ -77,11 +77,9 @@ class CompositionAggregator implements AggregatorInterface

    public function buildForm(FormBuilderInterface $builder)
    {
-        $builder->add('on_date', PickRollingDateType::class, []);
-    }
-    public function getFormDefaultData(): array
-    {
-        return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
+        $builder->add('on_date', PickRollingDateType::class, [
+            'data' => new RollingDate(RollingDate::T_TODAY),
+        ]);
    }

    public function getLabels($key, array $values, $data)
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
@ -50,15 +50,12 @@ final class AgeAggregator implements AggregatorInterface, ExportElementValidated
    {
        $builder->add('date_age_calculation', DateType::class, [
            'label' => 'Calculate age in relation to this date',
+            'data' => new DateTime(),
            'attr' => ['class' => 'datepicker'],
            'widget' => 'single_text',
            'format' => 'dd-MM-yyyy',
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return ['date_age_calculation' => new DateTime()];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/ByHouseholdCompositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/ByHouseholdCompositionAggregator.php
@ -94,12 +94,9 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
    {
        $builder->add('date_calc', PickRollingDateType::class, [
            'label' => 'export.aggregator.person.by_household_composition.Calc date',
+            'data' => new RollingDate(RollingDate::T_TODAY),
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
@ -108,10 +108,6 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
            'multiple' => false,
        ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
@ -48,10 +48,6 @@ final class GenderAggregator implements AggregatorInterface
    public function buildForm(FormBuilderInterface $builder)
    {
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public function getLabels($key, array $values, $data)
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
@ -105,10 +105,6 @@ class GeographicalUnitAggregator implements AggregatorInterface
                'expanded' => true,
            ]);
    }
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }

    public static function getDefaultAlias(): string
    {
--- a/Show More
+++ b/Show More