Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
bug #19904 [Form] Fixed collapsed ChoiceType options attributes (Heah…
…Dude)

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
  • Loading branch information
fabpot committed Sep 14, 2016
2 parents 354e8fd + 7806e2a commit 26e2846
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
@@ -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): ?>
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
Expand Up @@ -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]
'
Expand Down

0 comments on commit 26e2846

Please sign in to comment.