remove usage of deprecated Role into Export

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php

@@ -33,7 +33,7 @@ class BySocialActionAggregator implements AggregatorInterface
         $this->actionRepository = $actionRepository;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php

@@ -33,7 +33,7 @@ class BySocialIssueAggregator implements AggregatorInterface
         $this->issueRender = $issueRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php

@@ -33,7 +33,7 @@ class ByThirdpartyAggregator implements AggregatorInterface
         $this->thirdPartyRender = $thirdPartyRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php

@@ -33,7 +33,7 @@ class ByUserAggregator implements AggregatorInterface
         $this->userRender = $userRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php

@@ -38,7 +38,7 @@ class DateAggregator implements AggregatorInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php

@@ -33,7 +33,7 @@ class LocationTypeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php

@@ -33,7 +33,7 @@ class UserScopeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php

@@ -39,9 +39,9 @@ class ActivityTypeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php

@@ -37,9 +37,9 @@ class ActivityUserAggregator implements AggregatorInterface
         $this->userRender = $userRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)

src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php

@@ -48,9 +48,9 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php

@@ -92,9 +92,9 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php

@@ -92,9 +92,9 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php

@@ -93,9 +93,9 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php

@@ -92,9 +92,9 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php

@@ -92,9 +92,9 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php

@@ -97,9 +97,9 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers()

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php

@@ -275,9 +275,9 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::LISTS);
+        return ActivityStatsVoter::LISTS;
     }
 
     public function supportsModifiers()

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php

@@ -127,9 +127,9 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
             ->setParameter(':centers', $centers);
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers()

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php

@@ -30,7 +30,7 @@ class BySocialActionFilter implements FilterInterface
         $this->actionRender = $actionRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php

@@ -30,7 +30,7 @@ class BySocialIssueFilter implements FilterInterface
         $this->issueRender = $issueRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php

@@ -30,7 +30,7 @@ class ByUserFilter implements FilterInterface
         $this->userRender = $userRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php

@@ -35,7 +35,7 @@ class EmergencyFilter implements FilterInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php

@@ -30,7 +30,7 @@ class LocationTypeFilter implements FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php

@@ -36,7 +36,7 @@ class SentReceivedFilter implements FilterInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php

@@ -29,7 +29,7 @@ class UserFilter implements FilterInterface
         $this->userRender = $userRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php

@@ -30,7 +30,7 @@ class UserScopeFilter implements FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php

@@ -33,7 +33,7 @@ class ActivityDateFilter implements FilterInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php

@@ -42,9 +42,9 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         $this->activityTypeRepository = $activityTypeRepository;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php

@@ -44,9 +44,9 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         $this->activityReasonRepository = $activityReasonRepository;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php

@@ -52,7 +52,7 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php

@@ -33,7 +33,7 @@ final class AgentAggregator implements AggregatorInterface
         $this->userRender = $userRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php

@@ -33,7 +33,7 @@ class CancelReasonAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php

@@ -33,7 +33,7 @@ final class JobAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php

@@ -29,7 +29,7 @@ final class LocationAggregator implements AggregatorInterface
         $this->locationRepository = $locationRepository;
     }
 
-    public function addRole(): ?Role
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php

@@ -33,7 +33,7 @@ final class LocationTypeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php

@@ -20,7 +20,7 @@ use Symfony\Component\Security\Core\Role\Role;
 
 class MonthYearAggregator implements AggregatorInterface
 {
-    public function addRole(): ?Role
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php

@@ -33,7 +33,7 @@ final class ScopeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillCalendarBundle/Export/Export/CountAppointments.php

@@ -103,10 +103,10 @@ class CountAppointments implements ExportInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
         // which role should we give here?
-        return new Role(PersonVoter::STATS);
+        return PersonVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentAvgDuration.php

@@ -97,9 +97,9 @@ class StatAppointmentAvgDuration implements ExportInterface, GroupedExportInterf
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(AccompanyingPeriodVoter::STATS);
+        return AccompanyingPeriodVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentSumDuration.php

@@ -97,9 +97,9 @@ class StatAppointmentSumDuration implements ExportInterface, GroupedExportInterf
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(AccompanyingPeriodVoter::STATS);
+        return AccompanyingPeriodVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php

@@ -29,7 +29,7 @@ class AgentFilter implements FilterInterface
         $this->userRender = $userRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php

@@ -21,7 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class BetweenDatesFilter implements FilterInterface
 {
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php

@@ -35,7 +35,7 @@ class JobFilter implements FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php

@@ -35,7 +35,7 @@ class ScopeFilter implements FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillMainBundle/Export/ExportInterface.php

@@ -139,10 +139,8 @@ interface ExportInterface extends ExportElementInterface
 
     /**
      * Return the required Role to execute the Export.
-     *
-     * @return \Symfony\Component\Security\Core\Role\Role
      */
-    public function requiredRole();
+    public function requiredRole(): string;
 
     /**
      * Inform which ModifiersInterface (i.e. AggregatorInterface, FilterInterface)

src/Bundle/ChillMainBundle/Export/ExportManager.php

@@ -550,7 +550,7 @@ class ExportManager
         if (null === $centers) {
             $centers = $this->authorizationHelper->getReachableCenters(
                 $this->user,
-                $role->getRole(),
+                $role
             );
         }
 

src/Bundle/ChillMainBundle/Export/ModifierInterface.php

@@ -26,9 +26,9 @@ interface ModifierInterface extends ExportElementInterface
      * If null, will used the ExportInterface::requiredRole role from
      * the current executing export.
      *
-     * @return \Symfony\Component\Security\Core\Role\Role|null A role required to execute this ModifiersInterface
+     * @return string|null A role required to execute this ModifiersInterface
      */
-    public function addRole();
+    public function addRole(): ?string;
 
     /**
      * Alter the query initiated by the export, to add the required statements

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php

@@ -32,7 +32,7 @@ class AdministrativeLocationAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php

@@ -33,7 +33,7 @@ class ClosingMotiveAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php

@@ -27,7 +27,7 @@ class ConfidentialAggregator implements AggregatorInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php

@@ -35,7 +35,7 @@ class DurationAggregator implements AggregatorInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php

@@ -27,7 +27,7 @@ class EmergencyAggregator implements AggregatorInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php

@@ -33,7 +33,7 @@ final class EvaluationAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php

@@ -27,7 +27,7 @@ class IntensityAggregator implements AggregatorInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php

@@ -32,7 +32,7 @@ final class JobAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php

@@ -34,7 +34,7 @@ final class OriginAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php

@@ -32,7 +32,7 @@ final class ReferrerAggregator implements AggregatorInterface
         $this->userRender = $userRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php

@@ -32,7 +32,7 @@ final class ScopeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php

@@ -33,7 +33,7 @@ final class SocialActionAggregator implements AggregatorInterface
         $this->actionRepository = $actionRepository;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php

@@ -32,7 +32,7 @@ final class SocialIssueAggregator implements AggregatorInterface
         $this->issueRender = $issueRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php

@@ -33,7 +33,7 @@ final class StepAggregator implements AggregatorInterface //, FilterInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php

@@ -32,7 +32,7 @@ class EvaluationTypeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php

@@ -30,7 +30,7 @@ class ChildrenNumberAggregator implements AggregatorInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php

@@ -37,7 +37,7 @@ class CompositionAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

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

@@ -29,7 +29,7 @@ final class AgeAggregator implements AggregatorInterface, ExportElementValidated
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

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

@@ -42,7 +42,7 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

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

@@ -28,7 +28,7 @@ final class GenderAggregator implements AggregatorInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php

@@ -37,7 +37,7 @@ final class HouseholdPositionAggregator implements AggregatorInterface, ExportEl
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php

@@ -30,7 +30,7 @@ final class MaritalStatusAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

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

@@ -41,7 +41,7 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php

@@ -30,7 +30,7 @@ final class ActionTypeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php

@@ -30,7 +30,7 @@ final class GoalAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php

@@ -32,7 +32,7 @@ final class JobAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php

@@ -32,7 +32,7 @@ final class ReferrerAggregator implements AggregatorInterface
         $this->userRender = $userRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php

@@ -30,7 +30,7 @@ final class ResultAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php

@@ -32,7 +32,7 @@ final class ScopeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php

@@ -98,9 +98,9 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(AccompanyingPeriodVoter::STATS);
+        return AccompanyingPeriodVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php

@@ -98,9 +98,9 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(AccompanyingPeriodVoter::STATS);
+        return AccompanyingPeriodVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php

@@ -17,6 +17,7 @@ use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
@@ -100,10 +101,9 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        // TODO HouseholdVoter::STATS !??
-        return new Role(AccompanyingPeriodVoter::STATS);
+        return HouseholdVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php

@@ -108,9 +108,9 @@ class CountPerson implements ExportInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(PersonVoter::STATS);
+        return PersonVoter::STATS;
     }
 
     public function supportsModifiers()

src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php

@@ -98,9 +98,9 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
         return $qb;
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(AccompanyingPeriodVoter::STATS);
+        return AccompanyingPeriodVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php

@@ -99,10 +99,9 @@ class CountSocialWorkActions implements ExportInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        //TODO change to string, but changes needed also in ExportManager and possibly other locations.
-        return new Role(AccompanyingPeriodVoter::STATS);
+        return AccompanyingPeriodVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php

@@ -355,9 +355,9 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
         return $qb;
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(PersonVoter::LISTS);
+        return PersonVoter::LISTS;
     }
 
     public function supportsModifiers()

src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php

@@ -110,9 +110,9 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(AccompanyingPeriodVoter::STATS);
+        return AccompanyingPeriodVoter::STATS;
     }
 
     public function supportsModifiers(): array

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php

@@ -22,7 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ActiveOnDateFilter implements FilterInterface
 {
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php

@@ -22,7 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ActiveOneDayBetweenDatesFilter implements FilterInterface
 {
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActivityTypeFilter.php

@@ -32,7 +32,7 @@ class ActivityTypeFilter implements FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php

@@ -30,7 +30,7 @@ class AdministrativeLocationFilter implements FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php

@@ -30,7 +30,7 @@ class ClosingMotiveFilter implements FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php

@@ -35,7 +35,7 @@ class ConfidentialFilter implements FilterInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilter.php

@@ -35,7 +35,7 @@ class CurrentUserJobFilter implements FilterInterface
         $this->security = $security;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php

@@ -35,7 +35,7 @@ class CurrentUserScopeFilter implements FilterInterface
         $this->security = $security;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php

@@ -35,7 +35,7 @@ class EmergencyFilter implements FilterInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php

@@ -30,7 +30,7 @@ class EvaluationFilter implements FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php

@@ -34,7 +34,7 @@ use Symfony\Component\Form\FormBuilderInterface;
  */
 class GeographicalUnitStatFilter implements FilterInterface
 {
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php

@@ -35,7 +35,7 @@ class IntensityFilter implements FilterInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php

@@ -22,7 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class OpenBetweenDatesFilter implements FilterInterface
 {
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php

@@ -30,7 +30,7 @@ class OriginFilter implements FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php

@@ -29,7 +29,7 @@ class ReferrerFilter implements FilterInterface
         $this->userRender = $userRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php

@@ -44,7 +44,7 @@ class RequestorFilter implements FilterInterface
         $this->em = $em;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }