Merge remote-tracking branch 'origin/master' into upgrade-sf5

src/Bundle/ChillEventBundle/config/services/authorization.yaml

@@ -1,18 +0,0 @@
-services:
-    chill_event.event_voter:
-        class: Chill\EventBundle\Security\Authorization\EventVoter
-        arguments:
-            - "@security.access.decision_manager"
-            - "@chill.main.security.authorization.helper"
-            - "@logger"
-        tags:
-            - { name: security.voter }
-
-    chill_event.event_participation:
-        class: Chill\EventBundle\Security\Authorization\ParticipationVoter
-        arguments:
-            - "@security.access.decision_manager"
-            - "@chill.main.security.authorization.helper"
-            - "@logger"
-        tags:
-            - { name: security.voter }

src/Bundle/ChillEventBundle/config/services/export.yaml

@@ -0,0 +1,41 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    # indicators
+
+    Chill\EventBundle\Export\Export\CountEvents:
+        tags:
+            - { name: chill.export, alias: 'count_events' }
+    Chill\EventBundle\Export\Export\CountEventParticipations:
+        tags:
+            - { name: chill.export, alias: 'count_event_participants' }
+
+    # filters
+
+    Chill\EventBundle\Export\Filter\EventDateFilter:
+        tags:
+            - { name: chill.export_filter, alias: 'event_date_filter' }
+
+    Chill\EventBundle\Export\Filter\EventTypeFilter:
+        tags:
+            - { name: chill.export_filter, alias: 'event_type_filter' }
+
+    Chill\EventBundle\Export\Filter\RoleFilter:
+        tags:
+            - { name: chill.export_filter, alias: 'role_filter' }
+
+    # aggregators
+
+    Chill\EventBundle\Export\Aggregator\EventTypeAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: event_type_aggregator }
+
+    Chill\EventBundle\Export\Aggregator\EventDateAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: event_date_aggregator }
+
+    Chill\EventBundle\Export\Aggregator\RoleAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: role_aggregator }

src/Bundle/ChillEventBundle/config/services/security.yaml

@@ -0,0 +1,14 @@
+services:
+    Chill\EventBundle\Security\EventVoter:
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: security.voter }
+            - { name: chill.role }
+
+    Chill\EventBundle\Security\ParticipationVoter:
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: security.voter }
+            - { name: chill.role }