Merge branch 'master' into upgrade-sf5

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

@@ -96,11 +96,14 @@ services:
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_activeonedaybetweendates_filter }
 
-    chill.person.export.filter_referrer:
-        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ReferrerFilter
+    Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ReferrerFilter:
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_referrer_filter }
 
+    Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ReferrerFilterBetweenDates:
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_referrer_filter_between_dates }
+
     chill.person.export.filter_openbetweendates:
         class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OpenBetweenDatesFilter
         tags:
@@ -147,6 +150,10 @@ services:
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_info_within_filter }
 
+    Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\NotAssociatedWithAReferenceAddressFilter:
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_not_having_addr_reference_filter }
+
     ## Aggregators
     chill.person.export.aggregator_referrer_scope:
         class: Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ScopeAggregator
@@ -259,3 +266,7 @@ services:
     Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ClosingDateAggregator:
         tags:
             - { name: chill.export_aggregator, alias: accompanyingcourse_closing_date_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\PersonParticipatingAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: accompanyingcourse_person_part_aggregator }

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

@@ -0,0 +1,31 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    # exports
+    Chill\PersonBundle\Export\Export\CountAccompanyingCourseStepHistory:
+        tags:
+            - { name: chill.export, alias: count_acpstephistory }
+
+    # filters
+    Chill\PersonBundle\Export\Filter\AccompanyingPeriodStepHistoryFilters\ByDateFilter:
+        tags:
+            - { name: chill.export_filter, alias: acpstephistory_filter_by_date }
+
+    Chill\PersonBundle\Export\Filter\AccompanyingPeriodStepHistoryFilters\ByStepFilter:
+        tags:
+            - { name: chill.export_filter, alias: acpstephistory_filter_by_step }
+
+    # aggregators
+    Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregators\ByClosingMotiveAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: acpstephistory_agg_by_closing_motive }
+
+    Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregators\ByDateAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: acpstephistory_agg_by_date }
+
+    Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregators\ByStepAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: acpstephistory_agg_by_step }

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

@@ -116,6 +116,10 @@ services:
         tags:
             - { name: chill.export_filter, alias: person_without_household_composition_filter }
 
+    Chill\PersonBundle\Export\Filter\PersonFilters\WithParticipationBetweenDatesFilter:
+        tags:
+            - { name: chill.export_filter, alias: person_with_participation_between_dates_filter }
+
     ## Aggregators
     chill.person.export.aggregator_nationality:
         class: Chill\PersonBundle\Export\Aggregator\PersonAggregators\NationalityAggregator