[Form] Renamed view variable "name" to "full_name"

The variable "name" now contains the local, short name (equivalent to $form->getName()).

UPDATE.md

@@ -167,6 +167,9 @@ beta1 to beta2
 * Form: Renamed option value "text" of "widget" option of the "date" type was 
   renamed to "single-text". "text" indicates to use separate text boxes now
   (like for the "time" type).
+  
+* Form: Renamed view variable "name" to "full_name". The variable "name" now
+  contains the local, short name (equivalent to $form->getName()).
 
 PR12 to beta1
 -------------

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

@@ -1,6 +1,6 @@
 <input type="checkbox"
     <?php echo $view['form']->attributes() ?>
-    name="<?php echo $view->escape($name) ?>"
+    name="<?php echo $view->escape($full_name) ?>"
     <?php if ($value): ?>value="<?php echo $view->escape($value) ?>"<?php endif ?>
     <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
     <?php if ($required): ?>required="required"<?php endif ?>

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

@@ -8,7 +8,7 @@
 <?php else: ?>
     <select
         <?php echo $view['form']->attributes() ?>
-        name="<?php echo $view->escape($name) ?>"
+        name="<?php echo $view->escape($full_name) ?>"
         <?php if ($read_only): ?> disabled="disabled"<?php endif ?>
         <?php if ($multiple): ?> multiple="multiple"<?php endif ?>
     >

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

@@ -1,7 +1,7 @@
 <?php if ($widget == 'single-text'): ?>
     <input type="text"
         <?php echo $view['form']->attributes() ?>
-        name="<?php echo $view->escape($name) ?>"
+        name="<?php echo $view->escape($full_name) ?>"
         value="<?php echo $view->escape($value) ?>"
         <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
         <?php if ($required): ?>required="required"<?php endif ?>

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

@@ -1,6 +1,6 @@
 <input type="email"
     <?php echo $view['form']->attributes() ?>
-    name="<?php echo $view->escape($name) ?>"
+    name="<?php echo $view->escape($full_name) ?>"
     value="<?php echo $view->escape($value) ?>"
     <?php if ($max_length): ?>maxlength="<?php echo $view->escape($max_length) ?>"<?php endif ?>
     <?php if ($read_only): ?>disabled="disabled"<?php endif ?>

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

@@ -1,6 +1,6 @@
 <input
     <?php echo $view['form']->attributes() ?>
-    name="<?php echo $view->escape($name) ?>"
+    name="<?php echo $view->escape($full_name) ?>"
     value="<?php echo $view->escape($value) ?>"
     <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
     <?php if ($required): ?>required="required"<?php endif ?>

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

@@ -1,6 +1,6 @@
 <input type="hidden"
     <?php echo $view['form']->attributes() ?>
-    name="<?php echo $view->escape($name) ?>"
+    name="<?php echo $view->escape($full_name) ?>"
     value="<?php echo $view->escape($value) ?>"
     <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
 />

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

@@ -1,6 +1,6 @@
 <input type="number"
     <?php echo $view['form']->attributes() ?>
-    name="<?php echo $view->escape($name) ?>"
+    name="<?php echo $view->escape($full_name) ?>"
     value="<?php echo $view->escape($value) ?>"
     <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
     <?php if ($required): ?>required="required"<?php endif ?>

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

@@ -1,6 +1,6 @@
 <input type="text"
     <?php echo $view['form']->attributes() ?>
-    name="<?php echo $view->escape($name) ?>"
+    name="<?php echo $view->escape($full_name) ?>"
     value="<?php echo $view->escape($value) ?>"
     <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
     <?php if ($required): ?>required="required"<?php endif ?>

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

@@ -1,6 +1,6 @@
 <input type="password"
     <?php echo $view['form']->attributes() ?>
-    name="<?php echo $view->escape($name) ?>"
+    name="<?php echo $view->escape($full_name) ?>"
     value="<?php echo $view->escape($value) ?>"
     <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
     <?php if ($required): ?>required="required"<?php endif ?>

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

@@ -1,6 +1,6 @@
 <input type="radio"
     <?php echo $view['form']->attributes() ?>
-    name="<?php echo $view->escape($name) ?>"
+    name="<?php echo $view->escape($full_name) ?>"
     value="<?php echo $view->escape($value) ?>"
     <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
     <?php if ($required): ?>required="required"<?php endif ?>

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

@@ -1,6 +1,6 @@
 <input type="text"
     <?php echo $view['form']->attributes() ?>
-    name="<?php echo $view->escape($name) ?>"
+    name="<?php echo $view->escape($full_name) ?>"
     value="<?php echo $view->escape($value) ?>"
     <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
     <?php if ($required): ?>required="required"<?php endif ?>

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

@@ -1,6 +1,6 @@
 <textarea
     <?php echo $view['form']->attributes() ?>
-    name="<?php echo $view->escape($name) ?>"
+    name="<?php echo $view->escape($full_name) ?>"
     <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
     <?php if ($required): ?>required="required"<?php endif ?>
 ><?php echo $view->escape($value) ?></textarea>

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

@@ -1,6 +1,6 @@
 <input type="url"
     <?php echo $view['form']->attributes() ?>
-    name="<?php echo $view->escape($name) ?>"
+    name="<?php echo $view->escape($full_name) ?>"
     value="<?php echo $view->escape($value) ?>"
     <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
     <?php if ($required): ?>required="required"<?php endif ?>

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

@@ -43,7 +43,7 @@
 
 {% block attributes %}
 {% spaceless %}
-    id="{{ id }}" name="{{ name }}"{% if read_only %} disabled="disabled"{% endif %}{% if required %} required="required"{% endif %}{% if max_length %} maxlength="{{ max_length }}"{% endif %}
+    id="{{ id }}" name="{{ full_name }}"{% if read_only %} disabled="disabled"{% endif %}{% if required %} required="required"{% endif %}{% if max_length %} maxlength="{{ max_length }}"{% endif %}
     {% for attrname,attrvalue in attr %}{{attrname}}="{{attrvalue}}" {% endfor %}
 {% endspaceless %}
 {% endblock attributes %}

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

@@ -106,7 +106,7 @@ class ChoiceType extends AbstractType
             // Add "[]" to the name in case a select tag with multiple options is
             // displayed. Otherwise only one of the selected options is sent in the
             // POST request.
-            $view->set('name', $view->get('name').'[]');
+            $view->set('full_name', $view->get('full_name').'[]');
         }
     }
 

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

@@ -58,7 +58,7 @@ class FieldType extends AbstractType
     {
         if ($view->hasParent()) {
             $parentId = $view->getParent()->get('id');
-            $parentName = $view->getParent()->get('name');
+            $parentName = $view->getParent()->get('full_name');
             $id = sprintf('%s_%s', $parentId, $form->getName());
             $name = sprintf('%s[%s]', $parentName, $form->getName());
         } else {
@@ -69,7 +69,8 @@ class FieldType extends AbstractType
         $view
             ->set('form', $view)
             ->set('id', $id)
-            ->set('name', $name)
+            ->set('name', $form->getName())
+            ->set('full_name', $name)
             ->set('errors', $form->getErrors())
             ->set('value', $form->getClientData())
             ->set('read_only', $form->isReadOnly())

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

@@ -35,7 +35,7 @@ class RadioType extends AbstractType
         ;
 
         if ($view->hasParent()) {
-            $view->set('name', $view->getParent()->get('name'));
+            $view->set('full_name', $view->getParent()->get('full_name'));
         }
     }
 

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

@@ -312,7 +312,7 @@ class ChoiceTypeTest extends TypeTestCase
         $this->assertSame(array('b' => 'B', 'd' => 'D'), $view->get('preferred_choices'));
     }
 
-    public function testAdjustNameForMultipleNonExpanded()
+    public function testAdjustFullNameForMultipleNonExpanded()
     {
         $form = $this->factory->createNamed('choice', 'name', null, array(
             'multiple' => true,
@@ -321,6 +321,6 @@ class ChoiceTypeTest extends TypeTestCase
         ));
         $view = $form->createView();
 
-        $this->assertSame('name[]', $view->get('name'));
+        $this->assertSame('name[]', $view->get('full_name'));
     }
 }

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

@@ -117,6 +117,7 @@ class FieldTypeTest extends TypeTestCase
 
         $this->assertEquals('name', $view->get('id'));
         $this->assertEquals('name', $view->get('name'));
+        $this->assertEquals('name', $view->get('full_name'));
     }
 
     public function testPassIdAndNameToViewWithParent()
@@ -126,7 +127,8 @@ class FieldTypeTest extends TypeTestCase
         $view = $parent->createView();
 
         $this->assertEquals('parent_child', $view['child']->get('id'));
-        $this->assertEquals('parent[child]', $view['child']->get('name'));
+        $this->assertEquals('child', $view['child']->get('name'));
+        $this->assertEquals('parent[child]', $view['child']->get('full_name'));
     }
 
     public function testPassIdAndNameToViewWithGrandParent()
@@ -137,7 +139,8 @@ class FieldTypeTest extends TypeTestCase
         $view = $parent->createView();
 
         $this->assertEquals('parent_child_grand_child', $view['child']['grand_child']->get('id'));
-        $this->assertEquals('parent[child][grand_child]', $view['child']['grand_child']->get('name'));
+        $this->assertEquals('grand_child', $view['child']['grand_child']->get('name'));
+        $this->assertEquals('parent[child][grand_child]', $view['child']['grand_child']->get('full_name'));
     }
 
     public function testPassMaxLengthToView()

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

@@ -21,13 +21,13 @@ class RadioTypeTest extends TypeTestCase
         $this->assertEquals('foobar', $view->get('value'));
     }
 
-    public function testPassParentNameToView()
+    public function testPassParentFullNameToView()
     {
         $parent = $this->factory->createNamed('field', 'parent');
         $parent->add($this->factory->createNamed('radio', 'child'));
         $view = $parent->createView();
 
-        $this->assertEquals('parent', $view['child']->get('name'));
+        $this->assertEquals('parent', $view['child']->get('full_name'));
     }
 
     public function testCheckedIfDataTrue()