From 35d55cced41e8368dbdcd24077eb88be8da06109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 14 Feb 2024 22:35:15 +0100 Subject: [PATCH] Update test methods to static in AbstractFilterTest The methods getFormData() and getQueryBuilders() across multiple test classes have been updated to static methods. This refactoring is part of a broader effort to improve code structure and readability. A rector rule has been employed to assist in the systematic update of these existing methods. --- rector.php | 1 + .../Filter/ACPFilters/ActivityTypeFilterTest.php | 8 ++------ .../Filter/ACPFilters/ByCreatorFilterTest.php | 8 ++------ .../ACPFilters/BySocialActionFilterTest.php | 9 ++------- .../Filter/ACPFilters/BySocialIssueFilterTest.php | 8 ++------ .../Export/Filter/ActivityDateFilterTest.php | 7 ++----- .../Export/Filter/ActivityPresenceFilterTest.php | 8 ++------ .../Export/Filter/ActivityReasonFilterTest.php | 11 ++--------- .../Export/Filter/ActivityTypeFilterTest.php | 11 ++--------- .../Tests/Export/Filter/ByCreatorFilterTest.php | 8 ++------ .../Tests/Export/Filter/CreatorJobFilterTest.php | 4 ++-- .../Export/Filter/CreatorScopeFilterTest.php | 8 ++------ .../Tests/Export/Filter/EmergencyFilterTest.php | 5 ++--- .../Export/Filter/LocationTypeFilterTest.php | 8 ++------ .../PersonFilters/ActivityReasonFilterTest.php | 8 ++------ .../PersonHavingActivityBetweenDateFilterTest.php | 8 ++------ .../PersonHavingActivityBetweenDateFilterTest.php | 12 ++++-------- .../Tests/Export/Filter/PersonsFilterTest.php | 9 ++------- .../Export/Filter/SentReceivedFilterTest.php | 5 ++--- .../Tests/Export/Filter/UserFilterTest.php | 8 ++------ .../Tests/Export/Filter/AgentFilterTest.php | 11 ++--------- .../Export/Filter/BetweenDatesFilterTest.php | 5 ++--- .../Tests/Export/Filter/JobFilterTest.php | 6 ++---- .../Tests/Export/Filter/ScopeFilterTest.php | 6 ++---- .../ActiveOneDayBetweenDatesFilterTest.php | 5 ++--- .../AdministrativeLocationFilterTest.php | 8 ++------ .../ClosingMotiveFilterTest.php | 8 ++------ .../ConfidentialFilterTest.php | 5 ++--- .../EmergencyFilterTest.php | 5 ++--- .../EvaluationFilterTest.php | 8 ++------ .../GeographicalUnitStatFilterTest.php | 6 ++---- .../HasTemporaryLocationFilterTest.php | 5 ++--- .../IntensityFilterTest.php | 5 ++--- ...tAssociatedWithAReferenceAddressFilterTest.php | 6 ++---- .../OpenBetweenDatesFilterTest.php | 5 ++--- .../OriginFilterTest.php | 8 ++------ .../ReferrerFilterBetweenDatesTest.php | 13 ++++--------- .../ReferrerFilterTest.php | 15 ++++----------- .../RequestorFilterTest.php | 5 ++--- .../SocialActionFilterTest.php | 6 ++---- .../SocialIssueFilterTest.php | 7 ++----- .../AccompanyingCourseFilters/StepFilterTest.php | 5 ++--- .../UserJobFilterTest.php | 7 ++----- .../UserScopeFilterTest.php | 5 ++--- .../ByDateFilterTest.php | 5 ++--- .../ByStepFilterTest.php | 6 ++---- .../EvaluationTypeFilterTest.php | 8 ++------ .../EvaluationFilters/MaxDateFilterTest.php | 5 ++--- .../HouseholdFilters/CompositionFilterTest.php | 10 ++-------- .../Export/Filter/PersonFilters/AgeFilterTest.php | 5 ++--- .../Filter/PersonFilters/BirthdateFilterTest.php | 5 ++--- .../PersonFilters/DeadOrAliveFilterTest.php | 5 ++--- .../Filter/PersonFilters/DeathdateFilterTest.php | 5 ++--- .../Filter/PersonFilters/GenderFilterTest.php | 5 ++--- .../PersonFilters/MaritalStatusFilterTest.php | 8 ++------ .../PersonFilters/NationalityFilterTest.php | 8 ++------ .../ResidentialAddressAtThirdpartyFilterTest.php | 8 ++------ .../ResidentialAddressAtUserFilterTest.php | 5 ++--- .../WithParticipationBetweenDatesFilterTest.php | 5 ++--- .../SocialWorkFilters/CreatorFilterTest.php | 7 ++----- .../SocialWorkFilters/CreatorJobFilterTest.php | 6 ++---- .../SocialWorkFilters/CreatorScopeFilterTest.php | 6 ++---- .../HandlingThirdPartyFilterTest.php | 7 ++----- .../Filter/SocialWorkFilters/JobFilterTest.php | 6 ++---- .../SocialWorkFilters/ReferrerFilterTest.php | 8 ++------ .../Filter/SocialWorkFilters/ScopeFilterTest.php | 6 ++---- .../Tests/Export/Filter/ReportDateFilterTest.php | 5 ++--- 67 files changed, 139 insertions(+), 324 deletions(-) diff --git a/rector.php b/rector.php index b46dd36a6..4133bb7c4 100644 --- a/rector.php +++ b/rector.php @@ -52,6 +52,7 @@ return static function (RectorConfig $rectorConfig): void { // chill rules //$rectorConfig->rule(\Chill\Utils\Rector\Rector\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector::class); + $rectorConfig->rule(\Chill\Utils\Rector\Rector\ChillBundleMakeDataProviderStaticForAbstractFilterTestRector::class); // skip some path... $rectorConfig->skip([ diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php index f5ca24a14..ee9422385 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php @@ -41,20 +41,17 @@ final class ActivityTypeFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(ActivityType::class, 'at') ->select('at') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $a) { $data[] = [ 'accepted_activitytypes' => [], @@ -86,10 +83,9 @@ final class ActivityTypeFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php index 773b8c5d3..88e33a9ba 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php @@ -38,20 +38,17 @@ final class ByCreatorFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(User::class, 'u') ->select('u') ->getQuery() ->setMaxResults(2) ->getResult(); - $data = []; - foreach ($array as $a) { $data[] = [ 'accepted_users' => $a, @@ -61,10 +58,9 @@ final class ByCreatorFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php index 0ff72b061..ef5fdbf81 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php @@ -38,20 +38,16 @@ final class BySocialActionFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(SocialAction::class, 'sa') ->select('sa') ->getQuery() ->getResult(); - $data = []; - foreach ($array as $a) { $data[] = [ 'accepted_socialactions' => new ArrayCollection([$a]), @@ -61,10 +57,9 @@ final class BySocialActionFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php index 0f567d8a2..dba709aab 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php @@ -39,20 +39,17 @@ final class BySocialIssueFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(SocialIssue::class, 'si') ->select('si') ->getQuery() ->setMaxResults(2) ->getResult(); - $data = []; - foreach ($array as $a) { $data[] = [ 'accepted_socialissues' => new ArrayCollection([$a]), @@ -62,12 +59,11 @@ final class BySocialIssueFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { if (null === self::$kernel) { self::bootKernel(); } - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php index fa09a6cb0..d9b2e3144 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php @@ -38,7 +38,7 @@ final class ActivityDateFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ [ @@ -48,16 +48,13 @@ final class ActivityDateFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): iterable + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); - yield $em->createQueryBuilder() ->select('count(activity.id)') ->from(Activity::class, 'activity'); - self::ensureKernelShutdown(); } } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityPresenceFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityPresenceFilterTest.php index de4c54495..01c94ce63 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityPresenceFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityPresenceFilterTest.php @@ -44,10 +44,9 @@ class ActivityPresenceFilterTest extends AbstractFilterTest return new ActivityPresenceFilter($this->translatableStringHelper, $this->translator); } - public function getFormData() + public static function getFormData(): array { self::bootKernel(); - $presences = self::getContainer()->get(ActivityPresenceRepositoryInterface::class) ->findAll(); @@ -61,16 +60,13 @@ class ActivityPresenceFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); - yield $em->createQueryBuilder() ->select('count(activity.id)') ->from(Activity::class, 'activity'); - self::ensureKernelShutdown(); } } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php index a9687d15a..555364f9a 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php @@ -49,35 +49,29 @@ final class ActivityReasonFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData() + public static function getFormData(): array { self::bootKernel(); $data = []; - $em = self::getContainer() ->get(EntityManagerInterface::class); - $reasons = $em->createQuery('SELECT reason ' .'FROM ChillActivityBundle:ActivityReason reason') ->getResult(); - // generate an array of 5 different combination of results for ($i = 0; 5 > $i; ++$i) { $data[] = ['reasons' => new ArrayCollection(array_splice($reasons, ($i + 1) * -1))]; $data[] = ['reasons' => array_splice($reasons, ($i + 1) * -1)]; } - self::ensureKernelShutdown(); return $data; } - public function getQueryBuilders(): iterable + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); - yield $em->createQueryBuilder() ->select('count(activity.id)') ->from('ChillActivityBundle:Activity', 'activity'); @@ -90,7 +84,6 @@ final class ActivityReasonFilterTest extends AbstractFilterTest ->from('ChillActivityBundle:Activity', 'activity') ->join('activity.reasons', 'reasons') ->join('reasons.category', 'category'); - self::ensureKernelShutdown(); } } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php index 87349dd12..a9c44d591 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php @@ -39,20 +39,16 @@ final class ActivityTypeFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): iterable + public static function getFormData(): array { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(ActivityType::class, 'at') ->select('at') ->getQuery() ->getResult(); - $data = []; - foreach ($array as $a) { $data[] = [ 'types' => new ArrayCollection([$a]), @@ -65,16 +61,13 @@ final class ActivityTypeFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): iterable + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); - yield $em->createQueryBuilder() ->select('count(activity.id)') ->from(Activity::class, 'activity'); - self::ensureKernelShutdown(); } } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php index 9da5403b3..cbd168ce8 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php @@ -38,18 +38,15 @@ final class ByCreatorFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(User::class, 'u') ->select('u') ->getQuery() ->getResult(); - $data = []; - foreach ($array as $a) { $data[] = [ 'accepted_users' => $a, @@ -59,12 +56,11 @@ final class ByCreatorFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { if (null === self::$kernel) { self::bootKernel(); } - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorJobFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorJobFilterTest.php index d7cbc1f39..9babab132 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorJobFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorJobFilterTest.php @@ -51,7 +51,7 @@ class CreatorJobFilterTest extends AbstractFilterTest ); } - public function getFormData() + public static function getFormData(): array { $this->setUp(); $jobs = $this->userJobRepository->findAll(); @@ -61,7 +61,7 @@ class CreatorJobFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::setUp(); diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorScopeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorScopeFilterTest.php index f1ec8b63c..9fdb4ea61 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorScopeFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorScopeFilterTest.php @@ -38,20 +38,17 @@ final class CreatorScopeFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(Scope::class, 's') ->select('s') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $a) { $data[] = [ 'scopes' => $a, @@ -61,10 +58,9 @@ final class CreatorScopeFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php index 79abc750d..d1645533c 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php @@ -37,7 +37,7 @@ final class EmergencyFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ ['accepted_emergency' => true], @@ -45,10 +45,9 @@ final class EmergencyFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php index 17db5e622..b3ffa7abb 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php @@ -38,20 +38,17 @@ final class LocationTypeFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(LocationType::class, 'lt') ->select('lt') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $a) { $data[] = [ 'accepted_locationtype' => $a, @@ -61,10 +58,9 @@ final class LocationTypeFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php index b96f1ead5..0c9637e2e 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php @@ -39,20 +39,17 @@ final class ActivityReasonFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(ActivityReason::class, 'ar') ->select('ar') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $a) { $data[] = [ 'reasons' => new ArrayCollection([$a]), @@ -62,10 +59,9 @@ final class ActivityReasonFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php index b4f816dea..329256f3d 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php @@ -38,20 +38,17 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(ActivityReason::class, 'ar') ->select('ar') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $a) { $data[] = [ 'date_from' => \DateTime::createFromFormat('Y-m-d', '2021-07-01'), @@ -63,12 +60,11 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { if (null === self::$kernel) { self::bootKernel(); } - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php index b983c08a4..c5aa9f517 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php @@ -48,14 +48,13 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData() + public static function getFormData(): array { $date_from = \DateTime::createFromFormat('Y-m-d', '2015-01-15'); - $date_to = new \DateTime(); // today + $date_to = new \DateTime(); + // today $reasons = $this->getActivityReasons(); - $data = []; - for ($i = 0; 4 > $i; ++$i) { $data[] = [ 'date_from' => $date_from, @@ -67,13 +66,11 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer() ->get(EntityManagerInterface::class); - yield $em->createQueryBuilder() ->select('count(person.id)') ->from('ChillPersonBundle:Person', 'person') @@ -85,7 +82,6 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest ->join('activity.person', 'person') // add a fake where clause ->where('person.id > 0'); - self::ensureKernelShutdown(); } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonsFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonsFilterTest.php index 17dcda570..cf2ab05ac 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonsFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonsFilterTest.php @@ -39,15 +39,13 @@ class PersonsFilterTest extends AbstractFilterTest return new PersonsFilter($this->personRender); } - public function getFormData() + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $persons = $em->createQuery('SELECT p FROM '.Person::class.' p ') ->setMaxResults(2) ->getResult(); - self::ensureKernelShutdown(); return [ @@ -57,16 +55,13 @@ class PersonsFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); - yield $em->createQueryBuilder() ->select('count(activity.id)') ->from(Activity::class, 'activity'); - self::ensureKernelShutdown(); } } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php index c782fd4f6..843bfea1d 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php @@ -37,7 +37,7 @@ final class SentReceivedFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ ['accepted_sentreceived' => Activity::SENTRECEIVED_SENT], @@ -45,10 +45,9 @@ final class SentReceivedFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php index 94383565b..569fb5403 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php @@ -38,20 +38,17 @@ final class UserFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(User::class, 'u') ->select('u') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $a) { $data[] = [ 'accepted_users' => $a, @@ -61,10 +58,9 @@ final class UserFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php index cef9cf01c..d0d07acfd 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php @@ -51,39 +51,32 @@ final class AgentFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): iterable + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(User::class, 'u') ->select('u') ->getQuery() ->getResult(); - $data = []; - foreach ($array as $a) { yield [ 'accepted_agents' => $a, ]; } - self::ensureKernelShutdown(); } - public function getQueryBuilders(): iterable + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); - yield $em->createQueryBuilder() ->select('cal.id') ->from(Calendar::class, 'cal') ; - self::ensureKernelShutdown(); } } diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php index 6cd41601d..ab09c2672 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php @@ -51,7 +51,7 @@ final class BetweenDatesFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ [ @@ -61,10 +61,9 @@ final class BetweenDatesFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php index 010157acc..758b8ccbc 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php @@ -52,11 +52,10 @@ final class JobFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): iterable + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(UserJob::class, 'uj') ->select('uj') @@ -71,10 +70,9 @@ final class JobFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php index 88b2f9bf0..623f8f3f0 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php @@ -52,11 +52,10 @@ final class ScopeFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(Scope::class, 's') ->select('s') @@ -71,10 +70,9 @@ final class ScopeFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php index e08b2d4aa..8fd75acd6 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php @@ -38,7 +38,7 @@ final class ActiveOneDayBetweenDatesFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ [ @@ -48,10 +48,9 @@ final class ActiveOneDayBetweenDatesFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php index c6eb04e05..a9c5e6f50 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php @@ -37,20 +37,17 @@ final class AdministrativeLocationFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(Location::class, 'l') ->select('l') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $l) { $data[] = ['accepted_locations' => $l]; } @@ -58,10 +55,9 @@ final class AdministrativeLocationFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php index bf3384fcc..7b333df00 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php @@ -38,19 +38,16 @@ final class ClosingMotiveFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(ClosingMotive::class, 'm') ->select('m') ->getQuery() ->getResult(); - $data = []; - foreach ($array as $m) { $data[] = ['accepted_closingmotives' => $m]; } @@ -58,10 +55,9 @@ final class ClosingMotiveFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php index 38c703cff..e2f20df2c 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php @@ -36,7 +36,7 @@ final class ConfidentialFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ ['accepted_confidentials' => true], @@ -44,10 +44,9 @@ final class ConfidentialFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php index 3f6fa8e4d..ecc98d4fc 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php @@ -36,7 +36,7 @@ final class EmergencyFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ ['accepted_emergency' => true], @@ -44,10 +44,9 @@ final class EmergencyFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php index de6305759..8a9fb3c51 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php @@ -37,20 +37,17 @@ final class EvaluationFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(Evaluation::class, 'ev') ->select('ev') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $e) { $data[] = ['accepted_evaluations' => $e]; } @@ -58,10 +55,9 @@ final class EvaluationFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php index 1d3f271af..1f5323b82 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php @@ -39,11 +39,10 @@ final class GeographicalUnitStatFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $repo = self::getContainer()->get(GeographicalUnitRepositoryInterface::class); - $units = $repo->findAll(); return [ @@ -54,10 +53,9 @@ final class GeographicalUnitStatFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilterTest.php index 7c07014da..0e5be0f64 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilterTest.php @@ -38,7 +38,7 @@ class HasTemporaryLocationFilterTest extends AbstractFilterTest return new HasTemporaryLocationFilter($this->rollingDateConverter); } - public function getFormData() + public static function getFormData(): array { return [ [ @@ -52,10 +52,9 @@ class HasTemporaryLocationFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php index 8320345d1..8759b6881 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php @@ -37,7 +37,7 @@ final class IntensityFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ ['accepted_intensities' => 'occasional'], @@ -45,10 +45,9 @@ final class IntensityFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/NotAssociatedWithAReferenceAddressFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/NotAssociatedWithAReferenceAddressFilterTest.php index 796bbb30a..8978cdfa1 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/NotAssociatedWithAReferenceAddressFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/NotAssociatedWithAReferenceAddressFilterTest.php @@ -44,19 +44,17 @@ class NotAssociatedWithAReferenceAddressFilterTest extends AbstractFilterTest return new NotAssociatedWithAReferenceAddressFilter($dateConverter); } - public function getFormData() + public static function getFormData(): array { return [ ['date_calc' => new RollingDate(RollingDate::T_TODAY)], ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); - return [ $em->createQueryBuilder() ->select('acp.id') diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php index 33620ff6e..17515628a 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php @@ -38,7 +38,7 @@ final class OpenBetweenDatesFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ [ @@ -48,10 +48,9 @@ final class OpenBetweenDatesFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php index 82c368f11..1e22d0a57 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php @@ -38,20 +38,17 @@ final class OriginFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(Origin::class, 'o') ->select('o') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $l) { $data[] = ['accepted_origins' => $l]; } @@ -59,10 +56,9 @@ final class OriginFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterBetweenDatesTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterBetweenDatesTest.php index af7b1e0fa..8415e2017 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterBetweenDatesTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterBetweenDatesTest.php @@ -43,11 +43,11 @@ class ReferrerFilterBetweenDatesTest extends AbstractFilterTest return new ReferrerFilterBetweenDates($this->rollingDateConverter, $this->userRender); } - public function getFormData() + public static function getFormData(): array { - self:self::bootKernel(); + self: + self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $users = $em->createQueryBuilder() ->from(User::class, 'u') ->select('u') @@ -64,16 +64,13 @@ class ReferrerFilterBetweenDatesTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); - yield $em->createQueryBuilder() ->from(AccompanyingPeriod::class, 'acp') ->select('acp.id'); - $qb = $em->createQueryBuilder(); $qb ->from(AccompanyingPeriod\AccompanyingPeriodWork::class, 'acpw') @@ -81,9 +78,7 @@ class ReferrerFilterBetweenDatesTest extends AbstractFilterTest ->join('acp.participations', 'acppart') ->join('acppart.person', 'person') ; - $qb->select('COUNT(DISTINCT acpw.id) as export_result'); - yield $qb; } } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php index 00cbc8dd4..45bb6df46 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php @@ -39,20 +39,18 @@ final class ReferrerFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { - self:self::bootKernel(); + self: + self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(User::class, 'u') ->select('u') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $u) { $data[] = ['accepted_referrers' => $u, 'date_calc' => new RollingDate(RollingDate::T_TODAY)]; } @@ -60,16 +58,13 @@ final class ReferrerFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): iterable + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); - yield $em->createQueryBuilder() ->from(AccompanyingPeriod::class, 'acp') ->select('acp.id'); - $qb = $em->createQueryBuilder(); $qb ->from(AccompanyingPeriod\AccompanyingPeriodWork::class, 'acpw') @@ -77,9 +72,7 @@ final class ReferrerFilterTest extends AbstractFilterTest ->join('acp.participations', 'acppart') ->join('acppart.person', 'person') ; - $qb->select('COUNT(DISTINCT acpw.id) as export_result'); - yield $qb; } } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php index 6fb3b5291..459ff303f 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php @@ -37,7 +37,7 @@ final class RequestorFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ ['accepted_choices' => 'participation'], @@ -47,10 +47,9 @@ final class RequestorFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php index 4190c8e1b..c90369d2d 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php @@ -39,11 +39,10 @@ final class SocialActionFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): iterable + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(SocialAction::class, 'sa') ->select('sa') @@ -83,10 +82,9 @@ final class SocialActionFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php index f433e7987..b18e12010 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php @@ -39,26 +39,23 @@ final class SocialIssueFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): iterable + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(SocialIssue::class, 'si') ->select('si') ->getQuery() ->setMaxResults(1) ->getResult(); - yield ['accepted_socialissues' => new ArrayCollection($array)]; yield ['accepted_socialissues' => $array]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php index 34cafd926..d78f66b4d 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php @@ -38,7 +38,7 @@ final class StepFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): iterable + public static function getFormData(): array { foreach ([ ['accepted_steps_multi' => [AccompanyingPeriod::STEP_DRAFT]], @@ -51,10 +51,9 @@ final class StepFilterTest extends AbstractFilterTest } } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php index 6ac7da376..e6ae76ce7 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php @@ -40,29 +40,26 @@ final class UserJobFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): iterable + public static function getFormData(): array { self::bootKernel(); $jobs = self::getContainer()->get(EntityManagerInterface::class) ->createQuery('SELECT j FROM '.UserJob::class.' j') ->setMaxResults(1) ->getResult(); - yield [ 'jobs' => new ArrayCollection($jobs), 'date_calc' => new RollingDate(RollingDate::T_TODAY), ]; - yield [ 'jobs' => $jobs, 'date_calc' => new RollingDate(RollingDate::T_TODAY), ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php index 844622623..1cdb296d2 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php @@ -40,7 +40,7 @@ final class UserScopeFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $scopes = self::getContainer()->get(EntityManagerInterface::class) @@ -60,10 +60,9 @@ final class UserScopeFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByDateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByDateFilterTest.php index 77f131c98..a98d0c78e 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByDateFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByDateFilterTest.php @@ -40,7 +40,7 @@ class ByDateFilterTest extends AbstractFilterTest return new ByDateFilter($this->rollingDateConverter); } - public function getFormData() + public static function getFormData(): array { return [ [ @@ -50,11 +50,10 @@ class ByDateFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $qb = $em->createQueryBuilder() ->select('COUNT(DISTINCT acpstephistory.id) As export_result') ->from(AccompanyingPeriodStepHistory::class, 'acpstephistory') diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilterTest.php index 77ff35ad6..4d38d0a1e 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilterTest.php @@ -37,7 +37,7 @@ class ByStepFilterTest extends AbstractFilterTest return new ByStepFilter($translator); } - public function getFormData() + public static function getFormData(): array { return [ [ @@ -49,16 +49,14 @@ class ByStepFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $qb = $em->createQueryBuilder() ->select('COUNT(DISTINCT acpstephistory.id) As export_result') ->from(AccompanyingPeriodStepHistory::class, 'acpstephistory') ->join('acpstephistory.period', 'acp'); - return [ $qb, ]; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php index 591069949..415d2219e 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php @@ -38,20 +38,17 @@ final class EvaluationTypeFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(Evaluation::class, 'e') ->select('e') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $r) { $data[] = [ 'accepted_evaluationtype' => $r, @@ -61,10 +58,9 @@ final class EvaluationTypeFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php index a2cf0f566..42adf71c0 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php @@ -37,7 +37,7 @@ final class MaxDateFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ ['maxdate' => false], @@ -45,10 +45,9 @@ final class MaxDateFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php index a6b55cca6..d3ab4e2de 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php @@ -39,20 +39,17 @@ final class CompositionFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(HouseholdCompositionType::class, 'r') ->select('r') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $r) { $data[] = [ 'accepted_composition' => $r, @@ -63,10 +60,9 @@ final class CompositionFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): iterable + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); $qb = $em->createQueryBuilder(); $qb @@ -78,11 +74,9 @@ final class CompositionFilterTest extends AbstractFilterTest ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL') ->andWhere('hmember.startDate <= :count_household_at_date AND (hmember.endDate IS NULL OR hmember.endDate > :count_household_at_date)') ->setParameter('count_household_at_date', new \DateTimeImmutable('today')); - $qb ->select('COUNT(DISTINCT household.id) AS household_export_result') ->addSelect('COUNT(DISTINCT acp.id) AS acp_export_result'); - yield $qb; } } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php index 4c7a3d681..e7c12bd1b 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php @@ -38,7 +38,7 @@ final class AgeFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ [ @@ -49,10 +49,9 @@ final class AgeFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php index 256f6e0a8..51d40c9c3 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php @@ -38,7 +38,7 @@ final class BirthdateFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData() + public static function getFormData(): array { return [ [ @@ -48,10 +48,9 @@ final class BirthdateFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer() ->get(EntityManagerInterface::class); diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php index 186edc335..044524ff0 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php @@ -38,7 +38,7 @@ final class DeadOrAliveFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ [ @@ -52,10 +52,9 @@ final class DeadOrAliveFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php index e196c33f2..419f8d6bd 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php @@ -38,7 +38,7 @@ final class DeathdateFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ [ @@ -48,10 +48,9 @@ final class DeathdateFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php index d31969b5f..2d67987d4 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php @@ -37,7 +37,7 @@ final class GenderFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData() + public static function getFormData(): array { return [ [ @@ -52,10 +52,9 @@ final class GenderFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer() ->get(EntityManagerInterface::class); diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php index fdd11732e..6c51b08d3 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php @@ -38,20 +38,17 @@ final class MaritalStatusFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(MaritalStatus::class, 'm') ->select('m') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $m) { $data[] = [ 'maritalStatus' => $m, @@ -61,10 +58,9 @@ final class MaritalStatusFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php index e04b3ce90..b8d71a62d 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php @@ -38,15 +38,12 @@ final class NationalityFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $countries = array_slice($em->getRepository(Country::class)->findAll(), 0, 1); - $data = []; - foreach ($countries as $c) { $data[] = [ 'nationalities' => $c, @@ -56,10 +53,9 @@ final class NationalityFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php index 32ba578a5..ed5138511 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php @@ -41,20 +41,17 @@ final class ResidentialAddressAtThirdpartyFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $array = $em->createQueryBuilder() ->from(ThirdPartyCategory::class, 'tpc') ->select('tpc') ->getQuery() ->setMaxResults(1) ->getResult(); - $data = []; - foreach ($array as $r) { $data[] = [ 'thirdparty_cat' => [$r], @@ -65,10 +62,9 @@ final class ResidentialAddressAtThirdpartyFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php index 2effbd835..bbb31febe 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php @@ -39,17 +39,16 @@ final class ResidentialAddressAtUserFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ ['date_calc' => new RollingDate(RollingDate::T_TODAY)], ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/WithParticipationBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/WithParticipationBetweenDatesFilterTest.php index 6951ce0bd..d9b86c81b 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/WithParticipationBetweenDatesFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/WithParticipationBetweenDatesFilterTest.php @@ -38,7 +38,7 @@ final class WithParticipationBetweenDatesFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData() + public static function getFormData(): array { return [ [ @@ -48,10 +48,9 @@ final class WithParticipationBetweenDatesFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorFilterTest.php index e3126b8a2..e7c4ee8e6 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorFilterTest.php @@ -38,12 +38,10 @@ class CreatorFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData() + public static function getFormData(): array { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); - $creators = $em->createQuery('SELECT u FROM '.User::class.' u') ->setMaxResults(1) ->getResult(); @@ -55,10 +53,9 @@ class CreatorFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorJobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorJobFilterTest.php index bef52826a..19d6631e8 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorJobFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorJobFilterTest.php @@ -39,11 +39,10 @@ class CreatorJobFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData() + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $jobs = $em->createQuery('SELECT j FROM '.UserJob::class.' j') ->setMaxResults(1) ->getResult(); @@ -55,10 +54,9 @@ class CreatorJobFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorScopeFilterTest.php index a158eac31..3e1f98d3e 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorScopeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorScopeFilterTest.php @@ -38,11 +38,10 @@ class CreatorScopeFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData() + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $scopes = $em->createQuery('SELECT s FROM '.Scope::class.' s') ->setMaxResults(1) ->getResult(); @@ -54,10 +53,9 @@ class CreatorScopeFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/HandlingThirdPartyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/HandlingThirdPartyFilterTest.php index c2585cc24..46a1a95e1 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/HandlingThirdPartyFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/HandlingThirdPartyFilterTest.php @@ -39,12 +39,10 @@ class HandlingThirdPartyFilterTest extends AbstractFilterTest return new HandlingThirdPartyFilter($this->thirdPartyRender); } - public function getFormData() + public static function getFormData(): array { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); - $thirdParties = $em->createQuery('SELECT tp FROM '.ThirdParty::class.' tp') ->setMaxResults(2) ->getResult(); @@ -56,10 +54,9 @@ class HandlingThirdPartyFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders() + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php index be490bf63..fbe232941 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php @@ -39,11 +39,10 @@ final class JobFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $jobs = $em->createQuery('SELECT j FROM '.UserJob::class.' j') ->setMaxResults(1) ->getResult(); @@ -55,10 +54,9 @@ final class JobFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php index 8ed86da97..d185ac499 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php @@ -39,15 +39,12 @@ final class ReferrerFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $users = array_slice($em->getRepository(User::class)->findAll(), 0, 1); - $data = []; - foreach ($users as $u) { $data[] = [ 'accepted_agents' => $u, // some saved export does not have the parameter "agent_at" @@ -62,10 +59,9 @@ final class ReferrerFilterTest extends AbstractFilterTest return $data; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php index 77b8db28b..cc47a598f 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php @@ -38,11 +38,10 @@ final class ScopeFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { self::bootKernel(); $em = self::getContainer()->get(EntityManagerInterface::class); - $scopes = $em->createQuery('SELECT s FROM '.Scope::class.' s') ->setMaxResults(1) ->getResult(); @@ -54,10 +53,9 @@ final class ScopeFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [ diff --git a/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php b/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php index 9d6dc8ac7..9b1040fb8 100644 --- a/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php +++ b/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php @@ -38,7 +38,7 @@ final class ReportDateFilterTest extends AbstractFilterTest return $this->filter; } - public function getFormData(): array + public static function getFormData(): array { return [ [ @@ -48,10 +48,9 @@ final class ReportDateFilterTest extends AbstractFilterTest ]; } - public function getQueryBuilders(): array + public static function getQueryBuilders(): iterable { self::bootKernel(); - $em = self::getContainer()->get(EntityManagerInterface::class); return [