From 376ce5991705e3b7918371224a110c23fbccc8aa Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 1 Oct 2024 10:35:38 +0200 Subject: [PATCH] Fix typing errors in customfieldbundle --- .../CustomFields/CustomFieldLongChoice.php | 4 ++-- .../ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php index 54d63b978..3a0adbdcc 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php @@ -42,8 +42,8 @@ class CustomFieldLongChoice extends AbstractCustomField $translatableStringHelper = $this->translatableStringHelper; $builder->add($customField->getSlug(), Select2ChoiceType::class, [ 'choices' => $entries, - 'choice_label' => static fn (Option $option) => $translatableStringHelper->localize($option->getText()), - 'choice_value' => static fn (Option $key): ?int => null === $key ? null : $key->getId(), + 'choice_label' => static fn (?Option $option) => $translatableStringHelper->localize($option->getText()), + 'choice_value' => static fn (?Option $key): ?int => $key?->getId(), 'multiple' => false, 'expanded' => false, 'required' => $customField->isRequired(), diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php index 55f09597c..21aa746aa 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php +++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php @@ -46,11 +46,8 @@ class CustomFieldsGroup #[ORM\GeneratedValue(strategy: 'AUTO')] private ?int $id = null; - /** - * @var array - */ #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)] - private $name; + private array|string $name; #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)] private array $options = [];