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.
This commit is contained in:
Julien Fastré 2024-02-14 22:35:15 +01:00
parent 1f460916b6
commit 35d55cced4
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
67 changed files with 139 additions and 324 deletions

View File

@ -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([

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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();
}
}

View File

@ -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();
}
}

View File

@ -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();
}
}

View File

@ -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();
}
}

View File

@ -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 [

View File

@ -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();

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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();
}

View File

@ -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();
}
}

View File

@ -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 [

View File

@ -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 [

View File

@ -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();
}
}

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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')

View File

@ -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 [

View File

@ -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 [

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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')

View File

@ -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,
];

View File

@ -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 [

View File

@ -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 [

View File

@ -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;
}
}

View File

@ -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 [

View File

@ -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);

View File

@ -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 [

View File

@ -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 [

View File

@ -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);

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [

View File

@ -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 [