From 7806e2a05da3228480b34b2aa867b36235f0c9e3 Mon Sep 17 00:00:00 2001
From: HeahDude <heah@heahprod.com>
Date: Sun, 11 Sep 2016 01:56:49 +0200
Subject: [PATCH] Fixed collapsed ChoiceType options attributes

---
 .../Resources/views/Form/choice_attributes.html.php           | 1 -
 src/Symfony/Component/Form/Tests/AbstractLayoutTest.php       | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

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
index 8d2d6d7fd63c..18f8368dc806 100644
--- 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
index 01b3d3757a59..6441c07f6bf3 100644
--- 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]
 '