Merge branch 'master' into upgrade-sf5

src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php

@@ -27,7 +27,7 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
 
     public function __construct(
         protected PersonRepository $personRepository,
-        array $centers = null
+        ?array $centers = null
     ) {
         if (null !== $centers) {
             $this->centers = $centers;

src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php

@@ -26,7 +26,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class ClosingMotiveType extends AbstractType
 {
-    public function __construct(private readonly TranslatorInterface $translator) {}
+    public function __construct(private readonly TranslatorInterface $translator)
+    {
+    }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {

src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php

@@ -22,7 +22,9 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class HouseholdCompositionType extends AbstractType
 {
-    public function __construct(private readonly HouseholdCompositionTypeRepository $householdCompositionTypeRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
+    public function __construct(private readonly HouseholdCompositionTypeRepository $householdCompositionTypeRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper)
+    {
+    }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {

src/Bundle/ChillPersonBundle/Form/PersonResourceType.php

@@ -29,7 +29,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class PersonResourceType extends AbstractType
 {
-    public function __construct(private readonly ResourceKindRender $resourceKindRender, private readonly PersonRenderInterface $personRender, private readonly ThirdPartyRender $thirdPartyRender, private readonly TranslatorInterface $translator) {}
+    public function __construct(private readonly ResourceKindRender $resourceKindRender, private readonly PersonRenderInterface $personRender, private readonly ThirdPartyRender $thirdPartyRender, private readonly TranslatorInterface $translator)
+    {
+    }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {

src/Bundle/ChillPersonBundle/Form/PersonType.php

@@ -154,7 +154,7 @@ class PersonType extends AbstractType
             'allow_delete' => true,
             'by_reference' => false,
             'label' => false,
-            'delete_empty' => static fn (PersonPhone $pp = null) => null === $pp || $pp->isEmpty(),
+            'delete_empty' => static fn (?PersonPhone $pp = null) => null === $pp || $pp->isEmpty(),
             'error_bubbling' => false,
             'empty_collection_explain' => 'No additional phone numbers',
         ]);

src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php

@@ -23,7 +23,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class SocialIssueType extends AbstractType
 {
-    public function __construct(protected TranslatableStringHelperInterface $translatableStringHelper) {}
+    public function __construct(protected TranslatableStringHelperInterface $translatableStringHelper)
+    {
+    }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {

src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php

@@ -21,7 +21,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PersonAltNameType extends AbstractType
 {
-    public function __construct(private readonly ConfigPersonAltNamesHelper $configHelper, private readonly TranslatableStringHelper $translatableStringHelper) {}
+    public function __construct(private readonly ConfigPersonAltNamesHelper $configHelper, private readonly TranslatableStringHelper $translatableStringHelper)
+    {
+    }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {

src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php

@@ -24,7 +24,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PersonPhoneType extends AbstractType
 {
-    public function __construct(private readonly PhonenumberHelper $phonenumberHelper, private readonly EntityManagerInterface $em) {}
+    public function __construct(private readonly PhonenumberHelper $phonenumberHelper, private readonly EntityManagerInterface $em)
+    {
+    }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {

src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php

@@ -26,7 +26,9 @@ use Symfony\Component\Serializer\SerializerInterface;
  */
 class PickPersonDynamicType extends AbstractType
 {
-    public function __construct(private readonly DenormalizerInterface $denormalizer, private readonly SerializerInterface $serializer, private readonly NormalizerInterface $normalizer) {}
+    public function __construct(private readonly DenormalizerInterface $denormalizer, private readonly SerializerInterface $serializer, private readonly NormalizerInterface $normalizer)
+    {
+    }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -39,6 +41,8 @@ class PickPersonDynamicType extends AbstractType
         $view->vars['types'] = ['person'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
         $view->vars['suggested'] = [];
+        $view->vars['as_id'] = true === $options['as_id'] ? '1' : '0';
+        $view->vars['submit_on_adding_new_entity'] = true === $options['submit_on_adding_new_entity'] ? '1' : '0';
 
         foreach ($options['suggested'] as $person) {
             $view->vars['suggested'][] = $this->normalizer->normalize($person, 'json', ['groups' => 'read']);
@@ -51,7 +55,11 @@ class PickPersonDynamicType extends AbstractType
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
             ->setDefault('compound', false)
-            ->setDefault('suggested', []);
+            ->setDefault('suggested', [])
+            ->setDefault('as_id', false)
+            ->setAllowedTypes('as_id', ['bool'])
+            ->setDefault('submit_on_adding_new_entity', false)
+            ->setAllowedTypes('submit_on_adding_new_entity', ['bool']);
     }
 
     public function getBlockPrefix()

src/Bundle/ChillPersonBundle/Form/Type/PickSocialActionType.php

@@ -20,7 +20,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PickSocialActionType extends AbstractType
 {
-    public function __construct(private readonly SocialActionRender $actionRender, private readonly SocialActionRepository $actionRepository) {}
+    public function __construct(private readonly SocialActionRender $actionRender, private readonly SocialActionRepository $actionRepository)
+    {
+    }
 
     public function configureOptions(OptionsResolver $resolver)
     {

src/Bundle/ChillPersonBundle/Form/Type/PickSocialIssueType.php

@@ -20,7 +20,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PickSocialIssueType extends AbstractType
 {
-    public function __construct(private readonly SocialIssueRender $issueRender, private readonly SocialIssueRepository $issueRepository) {}
+    public function __construct(private readonly SocialIssueRender $issueRender, private readonly SocialIssueRepository $issueRepository)
+    {
+    }
 
     public function configureOptions(OptionsResolver $resolver)
     {

src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php

@@ -25,7 +25,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
  */
 class Select2MaritalStatusType extends AbstractType
 {
-    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly EntityManagerInterface $em) {}
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly EntityManagerInterface $em)
+    {
+    }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {