diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php index 1be583bb6..10f16247e 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php @@ -37,7 +37,7 @@ final class ActivityTypeFilterTest extends AbstractFilterTest $request->willExtend(\Symfony\Component\HttpFoundation\Request::class); $request->getLocale()->willReturn('fr'); - $this->filter = self::$container->get('chill.person.export.filter_activitytype'); + $this->filter = self::$container->get('chill.activity.export.filter_activitytype'); } public function getFilter() diff --git a/src/Bundle/ChillActivityBundle/config/services/export.yaml b/src/Bundle/ChillActivityBundle/config/services/export.yaml index 9abf33487..bdaae8c8a 100644 --- a/src/Bundle/ChillActivityBundle/config/services/export.yaml +++ b/src/Bundle/ChillActivityBundle/config/services/export.yaml @@ -67,10 +67,10 @@ services: name: chill.export_filter alias: 'activity_person_having_ac_bw_date_filter' - chill.person.export.filter_activitytype: + chill.activity.export.filter_activitytype: class: Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter tags: - - { name: chill.export_filter, alias: accompanyingcourse_activitytype_filter } + - { name: chill.export_filter, alias: 'accompanyingcourse_activitytype_filter' } chill.activity.export.locationtype_filter: class: Chill\ActivityBundle\Export\Filter\ACPFilters\LocationTypeFilter diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActivityTypeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActivityTypeFilterTest.php deleted file mode 100644 index bce092b6e..000000000 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActivityTypeFilterTest.php +++ /dev/null @@ -1,80 +0,0 @@ -prophesize(); - - $request->willExtend(Request::class); - $request->getLocale()->willReturn('fr'); - - $this->filter = self::$container->get('chill.person.export.filter_activitytype'); - } - - public function getFilter() - { - return $this->filter; - } - - public function getFormData(): array - { - $em = self::$container->get(EntityManagerInterface::class); - - $array = $em->createQueryBuilder() - ->from(ActivityType::class, 'at') - ->select('at') - ->getQuery() - ->getResult(); - - $data = []; - - foreach ($array as $t) { - $data[] = ['accepted_activitytypes' => $t]; - } - - return $data; - } - - public function getQueryBuilders(): array - { - if (null === self::$kernel) { - self::bootKernel(); - } - - $em = self::$container->get(EntityManagerInterface::class); - - return [ - $em->createQueryBuilder() - ->from('ChillPersonBundle:AccompanyingPeriod', 'acp') - ->select('acp.id'), - ]; - } -}