Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit f467317

Browse filesBrowse files
webmozartwebmozart
committed
[Form] Renamed view variable "name" to "full_name"
The variable "name" now contains the local, short name (equivalent to $form->getName()).
1 parent b39a21f commit f467317
Copy full SHA for f467317
Expand file treeCollapse file tree

21 files changed

+31
-24
lines changed

‎UPDATE.md

Copy file name to clipboardExpand all lines: UPDATE.md
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ beta1 to beta2
167167
* Form: Renamed option value "text" of "widget" option of the "date" type was
168168
renamed to "single-text". "text" indicates to use separate text boxes now
169169
(like for the "time" type).
170+
171+
* Form: Renamed view variable "name" to "full_name". The variable "name" now
172+
contains the local, short name (equivalent to $form->getName()).
170173

171174
PR12 to beta1
172175
-------------

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_widget.html.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_widget.html.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<input type="checkbox"
22
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($name) ?>"
3+
name="<?php echo $view->escape($full_name) ?>"
44
<?php if ($value): ?>value="<?php echo $view->escape($value) ?>"<?php endif ?>
55
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
66
<?php if ($required): ?>required="required"<?php endif ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<?php else: ?>
99
<select
1010
<?php echo $view['form']->attributes() ?>
11-
name="<?php echo $view->escape($name) ?>"
11+
name="<?php echo $view->escape($full_name) ?>"
1212
<?php if ($read_only): ?> disabled="disabled"<?php endif ?>
1313
<?php if ($multiple): ?> multiple="multiple"<?php endif ?>
1414
>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php if ($widget == 'single-text'): ?>
22
<input type="text"
33
<?php echo $view['form']->attributes() ?>
4-
name="<?php echo $view->escape($name) ?>"
4+
name="<?php echo $view->escape($full_name) ?>"
55
value="<?php echo $view->escape($value) ?>"
66
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
77
<?php if ($required): ?>required="required"<?php endif ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<input type="email"
22
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($name) ?>"
3+
name="<?php echo $view->escape($full_name) ?>"
44
value="<?php echo $view->escape($value) ?>"
55
<?php if ($max_length): ?>maxlength="<?php echo $view->escape($max_length) ?>"<?php endif ?>
66
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_widget.html.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_widget.html.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<input
22
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($name) ?>"
3+
name="<?php echo $view->escape($full_name) ?>"
44
value="<?php echo $view->escape($value) ?>"
55
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
66
<?php if ($required): ?>required="required"<?php endif ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<input type="hidden"
22
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($name) ?>"
3+
name="<?php echo $view->escape($full_name) ?>"
44
value="<?php echo $view->escape($value) ?>"
55
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
66
/>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<input type="number"
22
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($name) ?>"
3+
name="<?php echo $view->escape($full_name) ?>"
44
value="<?php echo $view->escape($value) ?>"
55
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
66
<?php if ($required): ?>required="required"<?php endif ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<input type="text"
22
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($name) ?>"
3+
name="<?php echo $view->escape($full_name) ?>"
44
value="<?php echo $view->escape($value) ?>"
55
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
66
<?php if ($required): ?>required="required"<?php endif ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<input type="password"
22
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($name) ?>"
3+
name="<?php echo $view->escape($full_name) ?>"
44
value="<?php echo $view->escape($value) ?>"
55
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
66
<?php if ($required): ?>required="required"<?php endif ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_widget.html.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_widget.html.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<input type="radio"
22
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($name) ?>"
3+
name="<?php echo $view->escape($full_name) ?>"
44
value="<?php echo $view->escape($value) ?>"
55
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
66
<?php if ($required): ?>required="required"<?php endif ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/text_widget.html.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/text_widget.html.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<input type="text"
22
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($name) ?>"
3+
name="<?php echo $view->escape($full_name) ?>"
44
value="<?php echo $view->escape($value) ?>"
55
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
66
<?php if ($required): ?>required="required"<?php endif ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_widget.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<textarea
22
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($name) ?>"
3+
name="<?php echo $view->escape($full_name) ?>"
44
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
55
<?php if ($required): ?>required="required"<?php endif ?>
66
><?php echo $view->escape($value) ?></textarea>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<input type="url"
22
<?php echo $view['form']->attributes() ?>
3-
name="<?php echo $view->escape($name) ?>"
3+
name="<?php echo $view->escape($full_name) ?>"
44
value="<?php echo $view->escape($value) ?>"
55
<?php if ($read_only): ?>disabled="disabled"<?php endif ?>
66
<?php if ($required): ?>required="required"<?php endif ?>

‎src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
{% block attributes %}
4545
{% spaceless %}
46-
id="{{ id }}" name="{{ name }}"{% if read_only %} disabled="disabled"{% endif %}{% if required %} required="required"{% endif %}{% if max_length %} maxlength="{{ max_length }}"{% endif %}
46+
id="{{ id }}" name="{{ full_name }}"{% if read_only %} disabled="disabled"{% endif %}{% if required %} required="required"{% endif %}{% if max_length %} maxlength="{{ max_length }}"{% endif %}
4747
{% for attrname,attrvalue in attr %}{{attrname}}="{{attrvalue}}" {% endfor %}
4848
{% endspaceless %}
4949
{% endblock attributes %}

‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function buildView(FormView $view, FormInterface $form)
106106
// Add "[]" to the name in case a select tag with multiple options is
107107
// displayed. Otherwise only one of the selected options is sent in the
108108
// POST request.
109-
$view->set('name', $view->get('name').'[]');
109+
$view->set('full_name', $view->get('full_name').'[]');
110110
}
111111
}
112112

‎src/Symfony/Component/Form/Extension/Core/Type/FieldType.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/Type/FieldType.php
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function buildView(FormView $view, FormInterface $form)
5858
{
5959
if ($view->hasParent()) {
6060
$parentId = $view->getParent()->get('id');
61-
$parentName = $view->getParent()->get('name');
61+
$parentName = $view->getParent()->get('full_name');
6262
$id = sprintf('%s_%s', $parentId, $form->getName());
6363
$name = sprintf('%s[%s]', $parentName, $form->getName());
6464
} else {
@@ -69,7 +69,8 @@ public function buildView(FormView $view, FormInterface $form)
6969
$view
7070
->set('form', $view)
7171
->set('id', $id)
72-
->set('name', $name)
72+
->set('name', $form->getName())
73+
->set('full_name', $name)
7374
->set('errors', $form->getErrors())
7475
->set('value', $form->getClientData())
7576
->set('read_only', $form->isReadOnly())

‎src/Symfony/Component/Form/Extension/Core/Type/RadioType.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/Type/RadioType.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function buildView(FormView $view, FormInterface $form)
3535
;
3636

3737
if ($view->hasParent()) {
38-
$view->set('name', $view->getParent()->get('name'));
38+
$view->set('full_name', $view->getParent()->get('full_name'));
3939
}
4040
}
4141

‎tests/Symfony/Tests/Component/Form/Extension/Core/Type/ChoiceTypeTest.php

Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/Form/Extension/Core/Type/ChoiceTypeTest.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ public function testPassPreferredChoicesToView()
312312
$this->assertSame(array('b' => 'B', 'd' => 'D'), $view->get('preferred_choices'));
313313
}
314314

315-
public function testAdjustNameForMultipleNonExpanded()
315+
public function testAdjustFullNameForMultipleNonExpanded()
316316
{
317317
$form = $this->factory->createNamed('choice', 'name', null, array(
318318
'multiple' => true,
@@ -321,6 +321,6 @@ public function testAdjustNameForMultipleNonExpanded()
321321
));
322322
$view = $form->createView();
323323

324-
$this->assertSame('name[]', $view->get('name'));
324+
$this->assertSame('name[]', $view->get('full_name'));
325325
}
326326
}

‎tests/Symfony/Tests/Component/Form/Extension/Core/Type/FieldTypeTest.php

Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/Form/Extension/Core/Type/FieldTypeTest.php
+5-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ public function testPassIdAndNameToView()
117117

118118
$this->assertEquals('name', $view->get('id'));
119119
$this->assertEquals('name', $view->get('name'));
120+
$this->assertEquals('name', $view->get('full_name'));
120121
}
121122

122123
public function testPassIdAndNameToViewWithParent()
@@ -126,7 +127,8 @@ public function testPassIdAndNameToViewWithParent()
126127
$view = $parent->createView();
127128

128129
$this->assertEquals('parent_child', $view['child']->get('id'));
129-
$this->assertEquals('parent[child]', $view['child']->get('name'));
130+
$this->assertEquals('child', $view['child']->get('name'));
131+
$this->assertEquals('parent[child]', $view['child']->get('full_name'));
130132
}
131133

132134
public function testPassIdAndNameToViewWithGrandParent()
@@ -137,7 +139,8 @@ public function testPassIdAndNameToViewWithGrandParent()
137139
$view = $parent->createView();
138140

139141
$this->assertEquals('parent_child_grand_child', $view['child']['grand_child']->get('id'));
140-
$this->assertEquals('parent[child][grand_child]', $view['child']['grand_child']->get('name'));
142+
$this->assertEquals('grand_child', $view['child']['grand_child']->get('name'));
143+
$this->assertEquals('parent[child][grand_child]', $view['child']['grand_child']->get('full_name'));
141144
}
142145

143146
public function testPassMaxLengthToView()

‎tests/Symfony/Tests/Component/Form/Extension/Core/Type/RadioTypeTest.php

Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/Form/Extension/Core/Type/RadioTypeTest.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ public function testPassValueToView()
2121
$this->assertEquals('foobar', $view->get('value'));
2222
}
2323

24-
public function testPassParentNameToView()
24+
public function testPassParentFullNameToView()
2525
{
2626
$parent = $this->factory->createNamed('field', 'parent');
2727
$parent->add($this->factory->createNamed('radio', 'child'));
2828
$view = $parent->createView();
2929

30-
$this->assertEquals('parent', $view['child']->get('name'));
30+
$this->assertEquals('parent', $view['child']->get('full_name'));
3131
}
3232

3333
public function testCheckedIfDataTrue()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.