[TwigBridge] Provide a default non-empty label on empty options to va…

…lidate HTML5
symfony · Nov 4, 2022 · 53d7b5d · 53d7b5d
1 parent 08ecb2f
commit 53d7b5d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
@@ -644,7 +644,7 @@ public function testSingleChoiceWithPreferredAndBlankSeparator()
     [not(@required)]
     [
         ./option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
-        /following-sibling::option[@disabled="disabled"][not(@selected)][.=""]
+        /following-sibling::option[@disabled="disabled"][not(@selected)][.="" or .="--"]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
         /following-sibling::option[@value="&b"][.="[trans]Choice&B[/trans]"]
     ]

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php
@@ -628,7 +628,7 @@ public function testSingleChoiceWithPreferredAndBlankSeparator()
     [not(@required)]
     [
         ./option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
-        /following-sibling::option[@disabled="disabled"][not(@selected)][.=""]
+        /following-sibling::option[@disabled="disabled"][not(@selected)][.="" or .="--"]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
         /following-sibling::option[@value="&b"][.="[trans]Choice&B[/trans]"]
     ]

diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -802,7 +802,7 @@ public function testSingleChoiceWithPreferredAndBlankSeparator()
     [not(@required)]
     [
         ./option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
-        /following-sibling::option[@disabled="disabled"][not(@selected)][.=""]
+        /following-sibling::option[@disabled="disabled"][not(@selected)][.="" or .="--"]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
         /following-sibling::option[@value="&b"][.="[trans]Choice&B[/trans]"]
     ]