fixup! Add ChillBundle normalization methods rector rule

This commit is contained in:
Julien Fastré 2025-03-12 21:57:54 +01:00
parent cac7d33a44
commit 4f6a7116a4
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
3 changed files with 53 additions and 2 deletions

View File

@ -74,6 +74,21 @@ class CSVFormatter implements FormatterInterface
} }
} }
public function getNormalizationVersion(): int
{
return 1;
}
public function normalizeFormData(array $formData): array
{
return [];
}
public function denormalizeFormData(array $formData, int $fromVersion): array
{
return [];
}
public function getFormDefaultData(array $aggregatorAliases): array public function getFormDefaultData(array $aggregatorAliases): array
{ {
return []; return [];

View File

@ -15,6 +15,7 @@ use Chill\MainBundle\Export\FilterInterface;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use Chill\ThirdPartyBundle\Entity\ThirdParty; use Chill\ThirdPartyBundle\Entity\ThirdParty;
use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType; use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType;
use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender; use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
@ -22,10 +23,12 @@ use Symfony\Component\Form\FormBuilderInterface;
final readonly class HandlingThirdPartyFilter implements FilterInterface final readonly class HandlingThirdPartyFilter implements FilterInterface
{ {
use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
private const PREFIX = 'acpw_handling_3party_filter'; private const PREFIX = 'acpw_handling_3party_filter';
public function __construct( public function __construct(
private ThirdPartyRender $thirdPartyRender, private ThirdPartyRender $thirdPartyRender,
private ThirdPartyRepository $thirdPartyRepository,
) {} ) {}
public function getTitle() public function getTitle()
@ -41,6 +44,21 @@ final readonly class HandlingThirdPartyFilter implements FilterInterface
]); ]);
} }
public function getNormalizationVersion(): int
{
return 1;
}
public function normalizeFormData(array $formData): array
{
return ['handling_3parties' => $this->normalizeDoctrineEntity($formData['handling_3parties'])];
}
public function denormalizeFormData(array $formData, int $fromVersion): array
{
return ['handling_3parties' => $this->denormalizeDoctrineEntity($formData['handling_3parties'], $this->thirdPartyRepository)];
}
public function getFormDefaultData(): array public function getFormDefaultData(): array
{ {
return ['handling_3parties' => []]; return ['handling_3parties' => []];

View File

@ -15,6 +15,7 @@ use Chill\MainBundle\Entity\Country;
use Chill\MainBundle\Export\ExportElementValidatedInterface; use Chill\MainBundle\Export\ExportElementValidatedInterface;
use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Export\FilterInterface;
use Chill\MainBundle\Form\Type\Select2CountryType; use Chill\MainBundle\Form\Type\Select2CountryType;
use Chill\MainBundle\Repository\CountryRepository;
use Chill\MainBundle\Templating\TranslatableStringHelper; use Chill\MainBundle\Templating\TranslatableStringHelper;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use Doctrine\ORM\Query\Expr; use Doctrine\ORM\Query\Expr;
@ -22,11 +23,13 @@ use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Validator\Context\ExecutionContextInterface; use Symfony\Component\Validator\Context\ExecutionContextInterface;
class NationalityFilter implements final readonly class NationalityFilter implements
ExportElementValidatedInterface, ExportElementValidatedInterface,
FilterInterface FilterInterface
{ {
public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {} use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
public function __construct(private TranslatableStringHelper $translatableStringHelper, private CountryRepository $countryRepository) {}
public function addRole(): ?string public function addRole(): ?string
{ {
@ -60,6 +63,21 @@ class NationalityFilter implements
]); ]);
} }
public function getNormalizationVersion(): int
{
return 1;
}
public function normalizeFormData(array $formData): array
{
return ['nationalities' => $this->normalizeDoctrineEntity($formData['nationalities'])];
}
public function denormalizeFormData(array $formData, int $fromVersion): array
{
return ['nationalities' => $this->denormalizeDoctrineEntity($formData['nationalities'], $this->countryRepository)];
}
public function getFormDefaultData(): array public function getFormDefaultData(): array
{ {
return []; return [];