symfony · fabpot · Apr 17, 2013 · Dec 31, 2012 · Jan 2, 2013 · Jan 3, 2013
diff --git a/UPGRADE-2.3.md b/UPGRADE-2.3.md
@@ -0,0 +1,37 @@
+UPGRADE FROM 2.2 to 2.3
+=======================
+
+### Form
+
+ * Although this was not officially supported nor documented, it was possible to
+   set the option "validation_groups" to false, resulting in the group "Default"
+   being validated. Now, if you set "validation_groups" to false, the validation
+   of a form will be skipped (except for a few integrity checks on the form).
+
+   If you want to validate a form in group "Default", you should either
+   explicitly set "validation_groups" to "Default" or alternatively set it to
+   null.
+
+   Before:
+
+   ```
+   // equivalent notations for validating in group "Default"
+   "validation_groups" => null
+   "validation_groups" => "Default"
+   "validation_groups" => false
+
+   // notation for skipping validation
+   "validation_groups" => array()
+   ```
+
+   After:
+
+   ```
+   // equivalent notations for validating in group "Default"
+   "validation_groups" => null
+   "validation_groups" => "Default"
+
+   // equivalent notations for skipping validation
+   "validation_groups" => false
+   "validation_groups" => array()
+   ```
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -218,6 +218,29 @@
 {% endspaceless %}
 {% endblock email_widget %}
 
+{% block button_widget %}
+{% spaceless %}
+    {% if label is empty %}
+        {% set label = name|humanize %}
+    {% endif %}
+    <button type="{{ type|default('button') }}" {{ block('button_attributes') }}>{{ label|trans({}, translation_domain) }}</button>
+{% endspaceless %}
+{% endblock button_widget %}
+
+{% block submit_widget %}
+{% spaceless %}
+    {% set type = type|default('submit') %}
+    {{ block('button_widget') }}
+{% endspaceless %}
+{% endblock submit_widget %}
+
+{% block reset_widget %}
+{% spaceless %}
+    {% set type = type|default('reset') %}
+    {{ block('button_widget') }}
+{% endspaceless %}
+{% endblock reset_widget %}
+
 {# Labels #}
 
 {% block form_label %}
@@ -237,6 +260,8 @@
 {% endspaceless %}
 {% endblock form_label %}
 
+{% block button_label %}{% endblock %}
+
 {# Rows #}
 
 {% block repeated_row %}
@@ -259,6 +284,14 @@
 {% endspaceless %}
 {% endblock form_row %}
 
+{% block button_row %}
+{% spaceless %}
+    <div>
+        {{ form_widget(form) }}
+    </div>
+{% endspaceless %}
+{% endblock button_row %}
+
 {% block hidden_row %}
     {{ form_widget(form) }}
 {% endblock hidden_row %}
@@ -317,14 +350,9 @@
 {% endspaceless %}
 {% endblock widget_container_attributes %}
 
-{# Deprecated in Symfony 2.1, to be removed in 2.3 #}
-
-{% block generic_label %}{{ block('form_label') }}{% endblock %}
-{% block widget_choice_options %}{{ block('choice_widget_options') }}{% endblock %}
-{% block field_widget %}{{ block('form_widget_simple') }}{% endblock %}
-{% block field_label %}{{ block('form_label') }}{% endblock %}
-{% block field_row %}{{ block('form_row') }}{% endblock %}
-{% block field_enctype %}{{ block('form_enctype') }}{% endblock %}
-{% block field_errors %}{{ block('form_errors') }}{% endblock %}
-{% block field_rest %}{{ block('form_rest') }}{% endblock %}
-{% block field_rows %}{{ block('form_rows') }}{% endblock %}
+{% block button_attributes %}
+{% spaceless %}
+    id="{{ id }}" name="{{ full_name }}"{% if disabled %} disabled="disabled"{% endif %}
+    {% for attrname, attrvalue in attr %}{{ attrname }}="{{ attrvalue }}" {% endfor %}
+{% endspaceless %}
+{% endblock button_attributes %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig
@@ -14,6 +14,17 @@
 {% endspaceless %}
 {% endblock form_row %}
 
+{% block button_row %}
+{% spaceless %}
+    <tr>
+        <td></td>
+        <td colspan="2">
+            {{ form_widget(form) }}
+        </td>
+    </tr>
+{% endspaceless %}
+{% endblock button_row %}
+
 {% block hidden_row %}
 {% spaceless %}
     <tr style="display: none">

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
@@ -140,6 +140,15 @@
         <service id="form.type.url" class="Symfony\Component\Form\Extension\Core\Type\UrlType">
             <tag name="form.type" alias="url" />
         </service>
+        <service id="form.type.button" class="Symfony\Component\Form\Extension\Core\Type\ButtonType">
+            <tag name="form.type" alias="button" />
+        </service>
+        <service id="form.type.submit" class="Symfony\Component\Form\Extension\Core\Type\SubmitType">
+            <tag name="form.type" alias="submit" />
+        </service>
+        <service id="form.type.reset" class="Symfony\Component\Form\Extension\Core\Type\ResetType">
+            <tag name="form.type" alias="reset" />
+        </service>
 
         <!-- FormTypeHttpFoundationExtension -->
         <service id="form.type_extension.form.http_foundation" class="Symfony\Component\Form\Extension\HttpFoundation\Type\FormTypeHttpFoundationExtension">
@@ -154,5 +163,8 @@
         <service id="form.type_extension.repeated.validator" class="Symfony\Component\Form\Extension\Validator\Type\RepeatedTypeValidatorExtension">
             <tag name="form.type_extension" alias="repeated" />
         </service>
+        <service id="form.type_extension.submit.validator" class="Symfony\Component\Form\Extension\Validator\Type\SubmitTypeValidatorExtension">
+            <tag name="form.type_extension" alias="submit" />
+        </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_attributes.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_attributes.html.php
@@ -0,0 +1,6 @@
+id="<?php echo $view->escape($id) ?>"
+name="<?php echo $view->escape($full_name) ?>"
+<?php if ($disabled): ?>disabled="disabled" <?php endif ?>
+<?php foreach ($attr as $k => $v): ?>
+    <?php printf('%s="%s" ', $view->escape($k), $view->escape($v)) ?>
+<?php endforeach; ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_label.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_label.html.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_row.html.php
@@ -0,0 +1,3 @@
+<div>
+    <?php echo $view['form']->widget($form) ?>
+</div>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php
@@ -0,0 +1,4 @@
+<?php if (!$label) { $label = $view['form']->humanize($name); } ?>
+<button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>>
+    <?php $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?>
+</button>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_enctype.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_enctype.html.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_errors.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_errors.html.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_label.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_label.html.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.html.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rows.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rows.html.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_widget.html.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/reset_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/reset_widget.html.php
@@ -0,0 +1 @@
+<?php echo $view['form']->block($form, 'button_widget',  array('type' => isset($type) ? $type : 'reset')) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/submit_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/submit_widget.html.php
@@ -0,0 +1 @@
+<?php echo $view['form']->block($form, 'button_widget',  array('type' => isset($type) ? $type : 'submit')) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/button_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/button_row.html.php
@@ -0,0 +1,6 @@
+<tr>
+    <td></td>
+    <td>
+        <?php echo $view['form']->widget($form) ?>
+    </td>
+</tr>
diff --git a/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php
@@ -25,7 +25,7 @@ public function testNormalizeThrowsExceptionWhenFalseIsNotAllowed()
     }
 
     /**
-     * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedException        \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
      * @expectedExceptionMessage Unrecognized options "foo" under "root"
      */
     public function testExceptionThrownOnUnrecognizedChild()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<?php echo $view['form']->block($form, 'button_widget', array('type' => isset($type) ? $type : 'reset')) ?>