mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
Php cs fixes and phpstan
This commit is contained in:
parent
73b0dd6009
commit
f1844ae02b
@ -34,4 +34,14 @@ class GenderRepository extends ServiceEntityRepository
|
|||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult();
|
->getResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function findByGenderTranslation($gender): array
|
||||||
|
{
|
||||||
|
return $this->createQueryBuilder('g')
|
||||||
|
->select('g')
|
||||||
|
->where('g.genderTranslation = :gender')
|
||||||
|
->setParameter('gender', $gender)
|
||||||
|
->getQuery()
|
||||||
|
->getResult();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -275,7 +275,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
|
|||||||
*/
|
*/
|
||||||
public function getRandomGender(): string
|
public function getRandomGender(): string
|
||||||
{
|
{
|
||||||
return $this->genders[array_rand($this->genders)->value];
|
return $this->genders[array_rand($this->genders)];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -30,8 +30,11 @@ class GenderFilter implements
|
|||||||
DataTransformerInterface
|
DataTransformerInterface
|
||||||
{
|
{
|
||||||
// inject gender repository and find the active genders so that you can pass them to the ChoiceType (ordered by ordering)
|
// inject gender repository and find the active genders so that you can pass them to the ChoiceType (ordered by ordering)
|
||||||
public function __construct(private readonly TranslatorInterface $translator, private readonly TranslatableStringHelperInterface $translatableStringHelper,
|
public function __construct(
|
||||||
private readonly GenderRepository $genderRepository) {}
|
private readonly TranslatorInterface $translator,
|
||||||
|
private readonly TranslatableStringHelperInterface $translatableStringHelper,
|
||||||
|
private readonly GenderRepository $genderRepository
|
||||||
|
) {}
|
||||||
|
|
||||||
public function addRole(): ?string
|
public function addRole(): ?string
|
||||||
{
|
{
|
||||||
@ -44,7 +47,7 @@ class GenderFilter implements
|
|||||||
$isIn = $qb->expr()->in('person.gender', ':person_gender');
|
$isIn = $qb->expr()->in('person.gender', ':person_gender');
|
||||||
|
|
||||||
$acceptedGenders = $data['accepted_genders_entity'];
|
$acceptedGenders = $data['accepted_genders_entity'];
|
||||||
$nullIncluded = in_array(null, $acceptedGenders, true);
|
$nullIncluded = in_array(null, $acceptedGenders ?? [], true);
|
||||||
|
|
||||||
if (!$nullIncluded) {
|
if (!$nullIncluded) {
|
||||||
$clause = $isIn;
|
$clause = $isIn;
|
||||||
@ -53,7 +56,7 @@ class GenderFilter implements
|
|||||||
}
|
}
|
||||||
|
|
||||||
$qb->andWhere($clause);
|
$qb->andWhere($clause);
|
||||||
$qb->setParameter('person_gender', array_filter($acceptedGenders, fn ($gender) => null !== $gender));
|
$qb->setParameter('person_gender', array_filter($acceptedGenders ?? [], fn ($gender) => null !== $gender));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function applyOn()
|
public function applyOn()
|
||||||
@ -80,6 +83,7 @@ class GenderFilter implements
|
|||||||
|
|
||||||
public function transformData(?array $before): array
|
public function transformData(?array $before): array
|
||||||
{
|
{
|
||||||
|
$transformedData = [];
|
||||||
$transformedData['accepted_genders_entity'] = $before['accepted_genders_entity'] ?? [];
|
$transformedData['accepted_genders_entity'] = $before['accepted_genders_entity'] ?? [];
|
||||||
|
|
||||||
if (array_key_exists('accepted_genders', $before)) {
|
if (array_key_exists('accepted_genders', $before)) {
|
||||||
|
@ -39,12 +39,12 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
|
|||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly \Twig\Environment $templating,
|
private readonly \Twig\Environment $templating,
|
||||||
private readonly ExtractDateFromPattern $extractDateFromPattern,
|
private readonly ExtractDateFromPattern $extractDateFromPattern,
|
||||||
private readonly ExtractPhonenumberFromPattern $extractPhonenumberFromPattern,
|
private readonly ExtractPhonenumberFromPattern $extractPhonenumberFromPattern,
|
||||||
private readonly PaginatorFactory $paginatorFactory,
|
private readonly PaginatorFactory $paginatorFactory,
|
||||||
private readonly PersonACLAwareRepositoryInterface $personACLAwareRepository,
|
private readonly PersonACLAwareRepositoryInterface $personACLAwareRepository,
|
||||||
private readonly GenderRepository $genderRepository,
|
private readonly GenderRepository $genderRepository,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function buildForm(FormBuilderInterface $builder)
|
public function buildForm(FormBuilderInterface $builder)
|
||||||
{
|
{
|
||||||
@ -112,6 +112,7 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
|
|||||||
$string .= !isset($data['phonenumber']) ? '' : 'phonenumber:'.$data['phonenumber']->getNationalNumber();
|
$string .= !isset($data['phonenumber']) ? '' : 'phonenumber:'.$data['phonenumber']->getNationalNumber();
|
||||||
|
|
||||||
$string .= !isset($data['gender']) ? '' : 'gender:"'.$data['gender']->getId().'"';
|
$string .= !isset($data['gender']) ? '' : 'gender:"'.$data['gender']->getId().'"';
|
||||||
|
|
||||||
return $string;
|
return $string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,7 +11,6 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
|
namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
|
||||||
|
|
||||||
use Chill\MainBundle\Entity\GenderEnum;
|
|
||||||
use Chill\MainBundle\Test\Export\AbstractFilterTest;
|
use Chill\MainBundle\Test\Export\AbstractFilterTest;
|
||||||
use Chill\PersonBundle\Entity\Person;
|
use Chill\PersonBundle\Entity\Person;
|
||||||
use Chill\PersonBundle\Export\Filter\PersonFilters\GenderFilter;
|
use Chill\PersonBundle\Export\Filter\PersonFilters\GenderFilter;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user