From 717dcc648deb40ad4774c56cd7e6ea26d13de991 Mon Sep 17 00:00:00 2001
From: Anthony Lofthouse <radar3301@gmail.com>
Date: Tue, 13 Sep 2022 12:13:05 -0600
Subject: [PATCH 1/7] [Form] [ChoiceType] Add placeholder_disabled option

---
 .../Bridge/Twig/Resources/views/Form/form_div_layout.html.twig  | 2 +-
 src/Symfony/Component/Form/CHANGELOG.md                         | 1 +
 src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php   | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
index 61f64e33fa751..0235b58ab1542 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -61,7 +61,7 @@
     {%- endif -%}
     <select {{ block('widget_attributes') }}{% if multiple %} multiple="multiple"{% endif %}>
         {%- if placeholder is not none -%}
-            <option value=""{% if required and value is empty %} selected="selected"{% endif %}>{{ placeholder != '' ? (translation_domain is same as(false) ? placeholder : placeholder|trans({}, translation_domain)) }}</option>
+            <option value=""{% if required and value is empty %} selected="selected"{% endif %}{% if placeholder_disabled is same as(true) %} disabled="disabled"{% endif %}>{{ placeholder != '' ? (translation_domain is same as(false) ? placeholder : placeholder|trans({}, translation_domain)) }}</option>
         {%- endif -%}
         {%- if preferred_choices|length > 0 -%}
             {% set options = preferred_choices %}
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index 2475b005bed83..1559ff4a948c9 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * Deprecate calling `Button/Form::setParent()`, `ButtonBuilder/FormConfigBuilder::setDataMapper()`, `TransformationFailedException::setInvalidMessage()` without arguments
  * Change the signature of `FormConfigBuilderInterface::setDataMapper()` to `setDataMapper(?DataMapperInterface)`
  * Change the signature of `FormInterface::setParent()` to `setParent(?self)`
+ * Add a `placeholder_disabled` option to `ChoiceType` (resolves #22318, #38958)
 
 6.1
 ---
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 2dde39e8af9ef..c57eadb8fde0d 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -352,6 +352,7 @@ public function configureOptions(OptionsResolver $resolver)
             'group_by' => null,
             'empty_data' => $emptyData,
             'placeholder' => $placeholderDefault,
+            'placeholder_disabled' => false,
             'error_bubbling' => false,
             'compound' => $compound,
             // The view data is always a string or an array of strings,
@@ -377,6 +378,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('choice_translation_parameters', ['null', 'array', 'callable', ChoiceTranslationParameters::class]);
         $resolver->setAllowedTypes('preferred_choices', ['array', \Traversable::class, 'callable', 'string', PropertyPath::class, PreferredChoice::class]);
         $resolver->setAllowedTypes('group_by', ['null', 'callable', 'string', PropertyPath::class, GroupBy::class]);
+        $resolver->setAllowedTypes('placeholder_disabled', ['bool']);
     }
 
     public function getBlockPrefix(): string

From dc61ecab6f02e0043b7dd87f506c47c167817663 Mon Sep 17 00:00:00 2001
From: Anthony Lofthouse <radar3301@gmail.com>
Date: Tue, 13 Sep 2022 12:34:04 -0600
Subject: [PATCH 2/7] [Form] [ChoiceType] Add placeholder_disabled to view.

---
 src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index c57eadb8fde0d..91f1f6816b85a 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -262,6 +262,8 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         if (null !== $options['placeholder'] && !$view->vars['placeholder_in_choices']) {
             $view->vars['placeholder'] = $options['placeholder'];
         }
+		
+		$view->vars['placeholder_disabled'] = $options['placeholder_disabled'];
 
         if ($options['multiple'] && !$options['expanded']) {
             // Add "[]" to the name in case a select tag with multiple options is

From ce9c1f3bdd8ffc14f9394ca04666bdbc98882b67 Mon Sep 17 00:00:00 2001
From: Anthony Lofthouse <radar3301@gmail.com>
Date: Tue, 13 Sep 2022 12:36:40 -0600
Subject: [PATCH 3/7] Fix coding standards.

---
 src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 91f1f6816b85a..182674ff15872 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -262,8 +262,8 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         if (null !== $options['placeholder'] && !$view->vars['placeholder_in_choices']) {
             $view->vars['placeholder'] = $options['placeholder'];
         }
-		
-		$view->vars['placeholder_disabled'] = $options['placeholder_disabled'];
+
+        $view->vars['placeholder_disabled'] = $options['placeholder_disabled'];
 
         if ($options['multiple'] && !$options['expanded']) {
             // Add "[]" to the name in case a select tag with multiple options is

From 35d697fc64ba87ddc40b08f875d28fe5bc421153 Mon Sep 17 00:00:00 2001
From: Anthony Lofthouse <radar3301@gmail.com>
Date: Tue, 13 Sep 2022 12:52:17 -0600
Subject: [PATCH 4/7] Fix failing tests.

---
 .../Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json     | 1 +
 .../Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json
index c9f453c8d6cc6..6b790244ffac8 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json
@@ -16,6 +16,7 @@
             "group_by",
             "multiple",
             "placeholder",
+            "placeholder_disabled",
             "preferred_choices"
         ],
         "overridden": {
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
index c4c4e901804af..34db3338095c8 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
@@ -18,6 +18,7 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (Block prefix: "choice")
   group_by                                             data                                                  
   multiple                                             disabled                                              
   placeholder                                          form_attr                                             
+  placeholder_disabled                                 getter                                                
   preferred_choices                                    getter                                                
                                                        help                                                  
                                                        help_attr                                             

From 3eea15a0c3d0f2ea83679c70bbc35777b075df7b Mon Sep 17 00:00:00 2001
From: Anthony Lofthouse <radar3301@gmail.com>
Date: Tue, 13 Sep 2022 13:07:43 -0600
Subject: [PATCH 5/7] Fix failing test.

---
 .../Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
index 34db3338095c8..81760ae761475 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
@@ -19,8 +19,7 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (Block prefix: "choice")
   multiple                                             disabled                                              
   placeholder                                          form_attr                                             
   placeholder_disabled                                 getter                                                
-  preferred_choices                                    getter                                                
-                                                       help                                                  
+  preferred_choices                                    help                                                  
                                                        help_attr                                             
                                                        help_html                                             
                                                        help_translation_parameters                           

From d2553427817f7ff73b1767b52be3b6b07869356f Mon Sep 17 00:00:00 2001
From: radar3301 <radar3301@gmail.com>
Date: Mon, 19 Sep 2022 10:56:32 -0600
Subject: [PATCH 6/7] Update CHANGELOG.md

---
 src/Symfony/Component/Form/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index 1559ff4a948c9..c240441e3974e 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -9,7 +9,7 @@ CHANGELOG
  * Deprecate calling `Button/Form::setParent()`, `ButtonBuilder/FormConfigBuilder::setDataMapper()`, `TransformationFailedException::setInvalidMessage()` without arguments
  * Change the signature of `FormConfigBuilderInterface::setDataMapper()` to `setDataMapper(?DataMapperInterface)`
  * Change the signature of `FormInterface::setParent()` to `setParent(?self)`
- * Add a `placeholder_disabled` option to `ChoiceType` (resolves #22318, #38958)
+ * Add a `placeholder_disabled` option to `ChoiceType`
 
 6.1
 ---

From f89470ddde786786909872a047f11b6c6b501615 Mon Sep 17 00:00:00 2001
From: radar3301 <radar3301@gmail.com>
Date: Mon, 10 Oct 2022 15:31:27 -0600
Subject: [PATCH 7/7] placeholder_disabled|default(false)

Default placeholder_disabled variable in twig template to false
---
 .../Bridge/Twig/Resources/views/Form/form_div_layout.html.twig  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
index 0235b58ab1542..76423a58a2c1f 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -61,7 +61,7 @@
     {%- endif -%}
     <select {{ block('widget_attributes') }}{% if multiple %} multiple="multiple"{% endif %}>
         {%- if placeholder is not none -%}
-            <option value=""{% if required and value is empty %} selected="selected"{% endif %}{% if placeholder_disabled is same as(true) %} disabled="disabled"{% endif %}>{{ placeholder != '' ? (translation_domain is same as(false) ? placeholder : placeholder|trans({}, translation_domain)) }}</option>
+            <option value=""{% if required and value is empty %} selected="selected"{% endif %}{% if placeholder_disabled|default(false) is same as(true) %} disabled="disabled"{% endif %}>{{ placeholder != '' ? (translation_domain is same as(false) ? placeholder : placeholder|trans({}, translation_domain)) }}</option>
         {%- endif -%}
         {%- if preferred_choices|length > 0 -%}
             {% set options = preferred_choices %}