bug #19904 [Form] Fixed collapsed ChoiceType options attributes (HeahDude)

fabpot · fabpot · commit 26e2846c8a37 · 2016-09-13T17:22:22.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [Form] Fixed collapsed ChoiceType options attributes | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #19898 | License | MIT | Doc PR | ~ Commits ------- 7806e2a Fixed collapsed ChoiceType options attributes
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_attributes.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_attributes.html.php
@@ -1,4 +1,3 @@
-id="<?php echo $view->escape($id) ?>" name="<?php echo $view->escape($full_name) ?>"
 <?php if ($disabled): ?>disabled="disabled" <?php endif ?>
 <?php foreach ($choice_attr as $k => $v): ?>
 <?php if ($v === true): ?>
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -612,8 +612,8 @@ public function testSingleChoiceAttributesWithMainAttributes()
     [@class="bar&baz"]
     [not(@required)]
     [
-        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
-        /following-sibling::option[@value="&b"][not(@class)][not(@selected)][.="[trans]Choice&B[/trans]"]
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"][not(@id)][not(@name)]
+        /following-sibling::option[@value="&b"][not(@class)][not(@selected)][.="[trans]Choice&B[/trans]"][not(@id)][not(@name)]
     ]
     [count(./option)=2]
 '

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-id="<?php echo $view->escape($id) ?>" name="<?php echo $view->escape($full_name) ?>"`
`2`	`1`	`<?php if ($disabled): ?>disabled="disabled" <?php endif ?>`
`3`	`2`	`<?php foreach ($choice_attr as $k => $v): ?>`
`4`	`3`	`<?php if ($v === true): ?>`
Original file line number	Diff line number	Diff line change
`@@ -612,8 +612,8 @@ public function testSingleChoiceAttributesWithMainAttributes()`
`612`	`612`	`[@class="bar&baz"]`
`613`	`613`	`[not(@required)]`
`614`	`614`	`[`
`615`		`- ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]`
`616`		`- /following-sibling::option[@value="&b"][not(@class)][not(@selected)][.="[trans]Choice&B[/trans]"]`
	`615`	`+ ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"][not(@id)][not(@name)]`
	`616`	`+ /following-sibling::option[@value="&b"][not(@class)][not(@selected)][.="[trans]Choice&B[/trans]"][not(@id)][not(@name)]`
`617`	`617`	`]`
`618`	`618`	`[count(./option)=2]`
`619`	`619`	`'`