Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 14:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

php cs fixes

Browse Source
This commit is contained in:
Julie Lenaerts
2024-10-08 16:49:54 +02:00
parent f34c94fd65
commit fa64f44cf1
15 changed files with 101 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
View File

@@ -15,6 +15,7 @@ use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
use Chill\MainBundle\Entity\Address;
use Chill\MainBundle\Entity\Center;
use Chill\MainBundle\Entity\Country;
use Chill\MainBundle\Entity\GenderEnum;
use Chill\MainBundle\Entity\PostalCode;
use Chill\MainBundle\Entity\Scope;
use Chill\MainBundle\Entity\User;
@@ -81,7 +82,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
protected NativeLoader $loader;
private array $genders = [Person::MALE_GENDER, Person::FEMALE_GENDER, Person::BOTH_GENDER];
private array $genders = [GenderEnum::MALE, GenderEnum::FEMALE, GenderEnum::NEUTRAL];
private array $peoples = [
[
@@ -90,7 +91,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
'birthdate' => '1948-12-27',
'placeOfBirth' => 'Châteauroux',
'nationality' => 'RU',
'gender' => Person::MALE_GENDER,
'gender' => GenderEnum::MALE,
'center' => 'Center A',
'accompanyingPeriods' => [
[
@@ -131,7 +132,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
'lastName' => 'Depardieu',
'firstName' => 'Charline',
'birthdate' => '1970-10-15',
'gender' => Person::FEMALE_GENDER,
'gender' => GenderEnum::FEMALE,
'center' => 'Center A',
'maritalStatus' => 'ms_legalco',
],

18
src/Bundle/ChillPersonBundle/Entity/Person.php
View File

@@ -1014,15 +1014,15 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
*
* @deprecated Keep for legacy. Used in Chill 1.5 for feminize before icu translations
*/
/* public function getGenderNumeric()
{
return match ($this->getGender()) {
self::FEMALE_GENDER => 1,
self::MALE_GENDER => 0,
self::BOTH_GENDER => 2,
default => -1,
};
}*/
/* public function getGenderNumeric()
{
return match ($this->getGender()) {
self::FEMALE_GENDER => 1,
self::MALE_GENDER => 0,
self::BOTH_GENDER => 2,
default => -1,
};
}*/
public function getHouseholdAddresses(): Collection
{

1
src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
View File

@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
use Chill\MainBundle\Export\AggregatorInterface;
use Chill\MainBundle\Repository\GenderRepository;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Export\Declarations;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;

12
src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
View File

@@ -12,17 +12,13 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Export\Filter\PersonFilters;
use Chill\MainBundle\Entity\Gender;
use Chill\MainBundle\Entity\GenderEnum;
use Chill\MainBundle\Export\ExportElementValidatedInterface;
use Chill\MainBundle\Export\FilterInterface;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Export\Declarations;
use Doctrine\ORM\Query\Expr;
use Doctrine\ORM\QueryBuilder;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\EnumType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Validator\Context\ExecutionContextInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
@@ -31,9 +27,7 @@ class GenderFilter implements
ExportElementValidatedInterface,
FilterInterface
{
public function __construct(private TranslatorInterface $translator, private TranslatableStringHelperInterface $translatableStringHelper)
{
}
public function __construct(private TranslatorInterface $translator, private TranslatableStringHelperInterface $translatableStringHelper) {}
public function addRole(): ?string
{
@@ -73,7 +67,7 @@ class GenderFilter implements
{
$builder->add('accepted_genders', EntityType::class, [
'class' => Gender::class,
'choice_label' => fn(Gender $g) => $this->translatableStringHelper->localize($g->getLabel()),
'choice_label' => fn (Gender $g) => $this->translatableStringHelper->localize($g->getLabel()),
'multiple' => true,
'expanded' => true,
]);
@@ -92,7 +86,7 @@ class GenderFilter implements
if ('null' === $g) {
$genders[] = $this->translator->trans('Not given');
} else {
$genders[] = $this->translatableStringHelper($g->getLabel());
$genders[] = $this->translatableStringHelper->localize($g->getLabel());
}
}

2
src/Bundle/ChillPersonBundle/Form/Type/PickGenderType.php
View File

@@ -13,12 +13,10 @@ namespace Chill\PersonBundle\Form\Type;
use Chill\MainBundle\Entity\Gender;
use Chill\MainBundle\Templating\TranslatableStringHelper;
use Chill\PersonBundle\Entity\Person;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\QueryBuilder;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\OptionsResolver\OptionsResolver;
/**

7
src/Bundle/ChillPersonBundle/migrations/Version20240926100337.php
View File

@@ -2,6 +2,13 @@
declare(strict_types=1);
/*
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Chill\Migrations\Person;
use Doctrine\DBAL\Schema\Schema;