php csfixes

This commit is contained in:
Julie Lenaerts 2022-11-02 10:28:52 +01:00
parent dc149c7fd5
commit 1228a0323c
26 changed files with 64 additions and 60 deletions

View File

@ -2,7 +2,7 @@
declare(strict_types=1); declare(strict_types=1);
/** /*
* Chill is a software for social workers * Chill is a software for social workers
* *
* For the full copyright and license information, please view * For the full copyright and license information, please view
@ -41,7 +41,7 @@ class ByActivityNumberAggregator implements AggregatorInterface
public function getLabels($key, array $values, $data) public function getLabels($key, array $values, $data)
{ {
return function ($value): string { return static function ($value): string {
if ('_header' === $value) { if ('_header' === $value) {
return ''; return '';
} }

View File

@ -2,7 +2,7 @@
declare(strict_types=1); declare(strict_types=1);
/** /*
* Chill is a software for social workers * Chill is a software for social workers
* *
* For the full copyright and license information, please view * For the full copyright and license information, please view
@ -11,9 +11,10 @@ declare(strict_types=1);
namespace Chill\ActivityBundle\Export\Aggregator; namespace Chill\ActivityBundle\Export\Aggregator;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\ActivityBundle\Export\Declarations; use Chill\ActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\AggregatorInterface;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use LogicException;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
class SentReceivedAggregator implements AggregatorInterface class SentReceivedAggregator implements AggregatorInterface
@ -41,10 +42,11 @@ class SentReceivedAggregator implements AggregatorInterface
public function getLabels($key, array $values, $data) public function getLabels($key, array $values, $data)
{ {
return function ($value): string { return static function ($value): string {
if ('_header' === $value) { if ('_header' === $value) {
return ''; return '';
} }
switch ($value) { switch ($value) {
case 'sent': case 'sent':
return 'is sent'; return 'is sent';
@ -53,7 +55,7 @@ class SentReceivedAggregator implements AggregatorInterface
return 'is received'; return 'is received';
default: default:
throw new \LogicException(sprintf('The value %s is not valid', $value)); throw new LogicException(sprintf('The value %s is not valid', $value));
} }
}; };
} }

View File

@ -14,9 +14,10 @@ namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
use Chill\ActivityBundle\Entity\Activity; use Chill\ActivityBundle\Entity\Activity;
use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Export\FilterInterface;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use Doctrine\ORM\Query\Expr;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Doctrine\ORM\Query\Expr; use function in_array;
class HasNoActivityFilter implements FilterInterface class HasNoActivityFilter implements FilterInterface
{ {
@ -36,7 +37,7 @@ class HasNoActivityFilter implements FilterInterface
//TODO check this: //TODO check this:
->andWhere(' ->andWhere('
NOT EXISTS ( NOT EXISTS (
SELECT 1 FROM '. Activity::class .' activity SELECT 1 FROM ' . Activity::class . ' activity
WHERE activity.accompanyingPeriod = acp WHERE activity.accompanyingPeriod = acp
) )
'); ');
@ -61,4 +62,4 @@ class HasNoActivityFilter implements FilterInterface
{ {
return 'Filter acp which has no activity'; return 'Filter acp which has no activity';
} }
} }

View File

@ -39,9 +39,9 @@ class UsersJobFilter implements FilterInterface
$qb $qb
->andWhere( ->andWhere(
$qb->expr()->exists( $qb->expr()->exists(
'SELECT 1 FROM ' . Activity::class . ' activity_users_job_filter_act 'SELECT 1 FROM ' . Activity::class . ' activity_users_job_filter_act
JOIN activity_users_job_filter_act.users users WHERE users.userJob IN (:activity_users_job_filter_jobs) AND activity_users_job_filter_act = activity ' JOIN activity_users_job_filter_act.users users WHERE users.userJob IN (:activity_users_job_filter_jobs) AND activity_users_job_filter_act = activity '
) )
) )
->setParameter('activity_users_job_filter_jobs', $data['jobs']); ->setParameter('activity_users_job_filter_jobs', $data['jobs']);
} }

View File

@ -2,7 +2,7 @@
declare(strict_types=1); declare(strict_types=1);
/** /*
* Chill is a software for social workers * Chill is a software for social workers
* *
* For the full copyright and license information, please view * For the full copyright and license information, please view
@ -11,8 +11,8 @@ declare(strict_types=1);
namespace Chill\AsideActivityBundle\Export\Aggregator; namespace Chill\AsideActivityBundle\Export\Aggregator;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\AsideActivityBundle\Export\Declarations; use Chill\AsideActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\AggregatorInterface;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
@ -41,7 +41,7 @@ class ByActivityTypeAggregator implements AggregatorInterface
public function getLabels($key, array $values, $data) public function getLabels($key, array $values, $data)
{ {
return function ($value): string { return static function ($value): string {
if ('_header' === $value) { if ('_header' === $value) {
return ''; return '';
} }

View File

@ -17,4 +17,4 @@ namespace Chill\AsideActivityBundle\Export;
abstract class Declarations abstract class Declarations
{ {
public const ASIDE_ACTIVITY_TYPE = 'aside_activity'; public const ASIDE_ACTIVITY_TYPE = 'aside_activity';
} }

View File

@ -11,14 +11,14 @@ declare(strict_types=1);
namespace Chill\AsideActivityBundle\Export\Export; namespace Chill\AsideActivityBundle\Export\Export;
use Chill\AsideActivityBundle\Export\Declarations;
use Chill\AsideActivityBundle\Repository\AsideActivityRepository; use Chill\AsideActivityBundle\Repository\AsideActivityRepository;
use Chill\MainBundle\Export\ExportInterface; use Chill\MainBundle\Export\ExportInterface;
use Chill\MainBundle\Export\FormatterInterface; use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\GroupedExportInterface; use Chill\MainBundle\Export\GroupedExportInterface;
use Chill\AsideActivityBundle\Export\Declarations;
use Symfony\Component\Form\FormBuilderInterface;
use Doctrine\ORM\Query; use Doctrine\ORM\Query;
use LogicException; use LogicException;
use Symfony\Component\Form\FormBuilderInterface;
class CountAsideActivity implements ExportInterface, GroupedExportInterface class CountAsideActivity implements ExportInterface, GroupedExportInterface
{ {
@ -105,7 +105,3 @@ class CountAsideActivity implements ExportInterface, GroupedExportInterface
return []; return [];
} }
} }

View File

@ -11,8 +11,8 @@ declare(strict_types=1);
namespace Chill\AsideActivityBundle\Export\Filter; namespace Chill\AsideActivityBundle\Export\Filter;
use Chill\MainBundle\Export\FilterInterface;
use Chill\AsideActivityBundle\Export\Declarations; use Chill\AsideActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\FilterInterface;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
@ -52,4 +52,4 @@ class ByActivityTypeFilter implements FilterInterface
{ {
return 'Filter by aside activity type'; return 'Filter by aside activity type';
} }
} }

View File

@ -11,8 +11,8 @@ declare(strict_types=1);
namespace Chill\AsideActivityBundle\Export\Filter; namespace Chill\AsideActivityBundle\Export\Filter;
use Chill\MainBundle\Export\FilterInterface;
use Chill\AsideActivityBundle\Export\Declarations; use Chill\AsideActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\FilterInterface;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
@ -52,4 +52,4 @@ class ByDateFilter implements FilterInterface
{ {
return 'Filter by aside activity date'; return 'Filter by aside activity date';
} }
} }

View File

@ -2,7 +2,7 @@
declare(strict_types=1); declare(strict_types=1);
/** /*
* Chill is a software for social workers * Chill is a software for social workers
* *
* For the full copyright and license information, please view * For the full copyright and license information, please view
@ -41,7 +41,7 @@ class ByActionNumberAggregator implements AggregatorInterface
public function getLabels($key, array $values, $data) public function getLabels($key, array $values, $data)
{ {
return function ($value): string { return static function ($value): string {
if ('_header' === $value) { if ('_header' === $value) {
return ''; return '';
} }

View File

@ -18,6 +18,7 @@ use Chill\PersonBundle\Entity\Household\HouseholdComposition;
use Chill\PersonBundle\Entity\Household\HouseholdMember; use Chill\PersonBundle\Entity\Household\HouseholdMember;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use Chill\PersonBundle\Repository\Household\HouseholdCompositionTypeRepositoryInterface; use Chill\PersonBundle\Repository\Household\HouseholdCompositionTypeRepositoryInterface;
use DateTimeImmutable;
use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\Query\Expr\Join;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
@ -96,7 +97,7 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
$builder->add('date_calc', ChillDateType::class, [ $builder->add('date_calc', ChillDateType::class, [
'label' => 'export.aggregator.course.by_household_composition.Calc date', 'label' => 'export.aggregator.course.by_household_composition.Calc date',
'input_format' => 'datetime_immutable', 'input_format' => 'datetime_immutable',
'data' => new \DateTimeImmutable('now'), 'data' => new DateTimeImmutable('now'),
]); ]);
} }

View File

@ -2,7 +2,7 @@
declare(strict_types=1); declare(strict_types=1);
/** /*
* Chill is a software for social workers * Chill is a software for social workers
* *
* For the full copyright and license information, please view * For the full copyright and license information, please view
@ -41,7 +41,7 @@ class CreatorJobAggregator implements AggregatorInterface
public function getLabels($key, array $values, $data) public function getLabels($key, array $values, $data)
{ {
return function ($value): string { return static function ($value): string {
if ('_header' === $value) { if ('_header' === $value) {
return ''; return '';
} }

View File

@ -2,7 +2,7 @@
declare(strict_types=1); declare(strict_types=1);
/** /*
* Chill is a software for social workers * Chill is a software for social workers
* *
* For the full copyright and license information, please view * For the full copyright and license information, please view
@ -41,7 +41,7 @@ class ByEndDateAggregator implements AggregatorInterface
public function getLabels($key, array $values, $data) public function getLabels($key, array $values, $data)
{ {
return function ($value): string { return static function ($value): string {
if ('_header' === $value) { if ('_header' === $value) {
return ''; return '';
} }

View File

@ -2,7 +2,7 @@
declare(strict_types=1); declare(strict_types=1);
/** /*
* Chill is a software for social workers * Chill is a software for social workers
* *
* For the full copyright and license information, please view * For the full copyright and license information, please view
@ -41,7 +41,7 @@ class ByMaxDateAggregator implements AggregatorInterface
public function getLabels($key, array $values, $data) public function getLabels($key, array $values, $data)
{ {
return function ($value): string { return static function ($value): string {
if ('_header' === $value) { if ('_header' === $value) {
return ''; return '';
} }

View File

@ -2,7 +2,7 @@
declare(strict_types=1); declare(strict_types=1);
/** /*
* Chill is a software for social workers * Chill is a software for social workers
* *
* For the full copyright and license information, please view * For the full copyright and license information, please view
@ -41,7 +41,7 @@ class ByStartDateAggregator implements AggregatorInterface
public function getLabels($key, array $values, $data) public function getLabels($key, array $values, $data)
{ {
return function ($value): string { return static function ($value): string {
if ('_header' === $value) { if ('_header' === $value) {
return ''; return '';
} }

View File

@ -2,7 +2,7 @@
declare(strict_types=1); declare(strict_types=1);
/** /*
* Chill is a software for social workers * Chill is a software for social workers
* *
* For the full copyright and license information, please view * For the full copyright and license information, please view
@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Export\Aggregator\EvaluationAggregators;
use Chill\MainBundle\Export\AggregatorInterface; use Chill\MainBundle\Export\AggregatorInterface;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use LogicException;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
class HavingEndDateAggregator implements AggregatorInterface class HavingEndDateAggregator implements AggregatorInterface
@ -45,10 +46,11 @@ class HavingEndDateAggregator implements AggregatorInterface
public function getLabels($key, array $values, $data) public function getLabels($key, array $values, $data)
{ {
return function ($value): string { return static function ($value): string {
if ('_header' === $value) { if ('_header' === $value) {
return ''; return '';
} }
switch ($value) { switch ($value) {
case true: case true:
return 'enddate is specified'; return 'enddate is specified';
@ -57,9 +59,8 @@ class HavingEndDateAggregator implements AggregatorInterface
return 'enddate is not specified'; return 'enddate is not specified';
default: default:
throw new \LogicException(sprintf('The value %s is not valid', $value)); throw new LogicException(sprintf('The value %s is not valid', $value));
} }
}; };
} }

View File

@ -2,7 +2,7 @@
declare(strict_types=1); declare(strict_types=1);
/** /*
* Chill is a software for social workers * Chill is a software for social workers
* *
* For the full copyright and license information, please view * For the full copyright and license information, please view
@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
use Chill\MainBundle\Export\AggregatorInterface; use Chill\MainBundle\Export\AggregatorInterface;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use LogicException;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
class CurrentActionAggregator implements AggregatorInterface class CurrentActionAggregator implements AggregatorInterface
@ -27,7 +28,7 @@ class CurrentActionAggregator implements AggregatorInterface
{ {
$qb $qb
->addSelect(' ->addSelect('
(CASE true WHEN acpw.startDate IS NULL ELSE false END) (CASE true WHEN acpw.startDate IS NULL ELSE false END)
AS acpw_current_action_aggregator AS acpw_current_action_aggregator
') ')
->addGroupBy('acpw_current_action_aggregator'); ->addGroupBy('acpw_current_action_aggregator');
@ -45,10 +46,11 @@ class CurrentActionAggregator implements AggregatorInterface
public function getLabels($key, array $values, $data) public function getLabels($key, array $values, $data)
{ {
return function ($value): string { return static function ($value): string {
if ('_header' === $value) { if ('_header' === $value) {
return ''; return '';
} }
switch ($value) { switch ($value) {
case true: case true:
return 'Current action'; return 'Current action';
@ -57,7 +59,7 @@ class CurrentActionAggregator implements AggregatorInterface
return 'Not current action'; return 'Not current action';
default: default:
throw new \LogicException(sprintf('The value %s is not valid', $value)); throw new LogicException(sprintf('The value %s is not valid', $value));
} }
}; };
} }

View File

@ -52,4 +52,4 @@ class CreatorFilter implements FilterInterface
{ {
return 'Filter by creator'; return 'Filter by creator';
} }
} }

View File

@ -52,4 +52,4 @@ class CreatorJobFilter implements FilterInterface
{ {
return 'Filter by creator job'; return 'Filter by creator job';
} }
} }

View File

@ -15,6 +15,7 @@ use Chill\MainBundle\Export\FilterInterface;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class HasNoActionFilter implements FilterInterface class HasNoActionFilter implements FilterInterface
{ {
@ -51,4 +52,4 @@ class HasNoActionFilter implements FilterInterface
{ {
return 'Filter by which has no action'; return 'Filter by which has no action';
} }
} }

View File

@ -15,10 +15,10 @@ use Chill\MainBundle\Export\FilterInterface;
use Chill\MainBundle\Form\Type\ChillDateType; use Chill\MainBundle\Form\Type\ChillDateType;
use Chill\PersonBundle\Entity\AccompanyingPeriod\UserHistory; use Chill\PersonBundle\Entity\AccompanyingPeriod\UserHistory;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use DateTime;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use DateTime;
class HasNoReferrerFilter implements FilterInterface class HasNoReferrerFilter implements FilterInterface
{ {
@ -32,12 +32,12 @@ class HasNoReferrerFilter implements FilterInterface
$qb $qb
->andWhere(' ->andWhere('
NOT EXISTS ( NOT EXISTS (
SELECT 1 FROM '. UserHistory::class .' uh SELECT 1 FROM ' . UserHistory::class . ' uh
WHERE uh.startDate < :date WHERE uh.startDate < :date
AND ( AND (
uh.endDate IS NULL uh.endDate IS NULL
or uh.endDate > :date or uh.endDate > :date
) )
AND uh.accompanyingPeriod = acp AND uh.accompanyingPeriod = acp
) )
') ')
@ -69,4 +69,4 @@ class HasNoReferrerFilter implements FilterInterface
{ {
return 'Filter by which has no referrer'; return 'Filter by which has no referrer';
} }
} }

View File

@ -52,4 +52,4 @@ class HasTemporaryLocationFilter implements FilterInterface
{ {
return 'Filter by temporary location'; return 'Filter by temporary location';
} }
} }

View File

@ -14,10 +14,10 @@ namespace Chill\PersonBundle\Export\Filter\EvaluationFilters;
use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Export\FilterInterface;
use Chill\MainBundle\Form\Type\ChillDateType; use Chill\MainBundle\Form\Type\ChillDateType;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use DateTime;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use DateTime;
class ByEndDateFilter implements FilterInterface class ByEndDateFilter implements FilterInterface
{ {
@ -64,4 +64,4 @@ class ByEndDateFilter implements FilterInterface
{ {
return 'Filter by end date evaluations'; return 'Filter by end date evaluations';
} }
} }

View File

@ -14,10 +14,10 @@ namespace Chill\PersonBundle\Export\Filter\EvaluationFilters;
use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Export\FilterInterface;
use Chill\MainBundle\Form\Type\ChillDateType; use Chill\MainBundle\Form\Type\ChillDateType;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use DateTime;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use DateTime;
class ByStartDateFilter implements FilterInterface class ByStartDateFilter implements FilterInterface
{ {
@ -64,4 +64,4 @@ class ByStartDateFilter implements FilterInterface
{ {
return 'Filter by start date evaluations'; return 'Filter by start date evaluations';
} }
} }

View File

@ -47,4 +47,4 @@ class CurrentEvaluationsFilter implements FilterInterface
{ {
return 'Filter by current evaluations'; return 'Filter by current evaluations';
} }
} }

View File

@ -47,4 +47,4 @@ class CurrentActionFilter implements FilterInterface
{ {
return 'Filter by current actions'; return 'Filter by current actions';
} }
} }