[Form] [TwigBridge] Bootstrap layout whitespace control

src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig

@@ -4,7 +4,7 @@
 
 {% block form_widget_simple -%}
     {% if type is not defined or 'file' != type %}
-        {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) %}
+        {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) -%}
     {% endif %}
     {{- parent() -}}
 {%- endblock form_widget_simple %}
@@ -42,48 +42,48 @@
 {% block datetime_widget -%}
     {% if widget == 'single_text' %}
         {{- block('form_widget_simple') -}}
-    {% else %}
-        {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) %}
+    {% else -%}
+        {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%}
         <div {{ block('widget_container_attributes') }}>
-            {{ form_errors(form.date) }}
-            {{ form_errors(form.time) }}
-            {{ form_widget(form.date, { datetime: true } ) }}&nbsp;
-            {{ form_widget(form.time, { datetime: true } ) }}
+            {{- form_errors(form.date) -}}
+            {{- form_errors(form.time) -}}
+            {{- form_widget(form.date, { datetime: true } ) -}}
+            {{- form_widget(form.time, { datetime: true } ) -}}
         </div>
-    {% endif %}
+    {%- endif %}
 {%- endblock datetime_widget %}
 
 {% block date_widget -%}
     {% if widget == 'single_text' %}
         {{- block('form_widget_simple') -}}
-    {% else %}
-        {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) %}
-        {% if datetime is not defined or not datetime %}
+    {% else -%}
+        {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%}
+        {% if datetime is not defined or not datetime -%}
             <div {{ block('widget_container_attributes') -}}>
-        {% endif %}
-            {{ date_pattern|replace({
+        {%- endif %}
+            {{- date_pattern|replace({
                 '{{ year }}': form_widget(form.year),
                 '{{ month }}': form_widget(form.month),
                 '{{ day }}': form_widget(form.day),
-            })|raw }}
-        {% if datetime is not defined or not datetime %}
+            })|raw -}}
+        {% if datetime is not defined or not datetime -%}
             </div>
-        {% endif %}
+        {%- endif -%}
     {% endif %}
 {%- endblock date_widget %}
 
 {% block time_widget -%}
     {% if widget == 'single_text' %}
         {{- block('form_widget_simple') -}}
-    {% else %}
-        {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) %}
-        {% if datetime is not defined or false == datetime %}
+    {% else -%}
+        {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%}
+        {% if datetime is not defined or false == datetime -%}
             <div {{ block('widget_container_attributes') -}}>
-        {% endif %}
-        {{ form_widget(form.hour) }}:{{ form_widget(form.minute) }}{% if with_seconds %}:{{ form_widget(form.second) }}{% endif %}
-        {% if datetime is not defined or false == datetime %}
+        {%- endif -%}
+        {{- form_widget(form.hour) }}:{{ form_widget(form.minute) }}{% if with_seconds %}:{{ form_widget(form.second) }}{% endif %}
+        {% if datetime is not defined or false == datetime -%}
             </div>
-        {% endif %}
+        {%- endif -%}
     {% endif %}
 {%- endblock time_widget %}
 
@@ -93,57 +93,57 @@
 {%- endblock %}
 
 {% block choice_widget_expanded -%}
-    {% if '-inline' in label_attr.class|default('') %}
+    {% if '-inline' in label_attr.class|default('') -%}
         <div class="control-group">
-            {% for child in form %}
-                {{ form_widget(child, {
+            {%- for child in form %}
+                {{- form_widget(child, {
                     parent_label_class: label_attr.class|default(''),
-                }) }}
-            {% endfor %}
+                }) -}}
+            {% endfor -%}
         </div>
-    {% else %}
+    {%- else -%}
         <div {{ block('widget_container_attributes') }}>
-            {% for child in form %}
-                {{ form_widget(child, {
+            {%- for child in form %}
+                {{- form_widget(child, {
                     parent_label_class: label_attr.class|default(''),
-                }) }}
-            {% endfor %}
+                }) -}}
+            {% endfor -%}
         </div>
-    {% endif %}
+    {%- endif %}
 {%- endblock choice_widget_expanded %}
 
 {% block checkbox_widget -%}
-    {% set parent_label_class = parent_label_class|default('') %}
+    {% set parent_label_class = parent_label_class|default('') -%}
     {% if 'checkbox-inline' in parent_label_class %}
-        {{ form_label(form, null, { widget: parent() }) }}
-    {% else %}
+        {{- form_label(form, null, { widget: parent() }) -}}
+    {% else -%}
         <div class="checkbox">
-            {{ form_label(form, null, { widget: parent() }) }}
+            {{- form_label(form, null, { widget: parent() }) -}}
         </div>
-    {% endif %}
+    {%- endif %}
 {%- endblock checkbox_widget %}
 
 {% block radio_widget -%}
-    {% set parent_label_class = parent_label_class|default('') %}
+    {%- set parent_label_class = parent_label_class|default('') -%}
     {% if 'radio-inline' in parent_label_class %}
-        {{ form_label(form, null, { widget: parent() }) }}
-    {% else %}
+        {{- form_label(form, null, { widget: parent() }) -}}
+    {% else -%}
         <div class="radio">
-            {{ form_label(form, null, { widget: parent() }) }}
+            {{- form_label(form, null, { widget: parent() }) -}}
         </div>
-    {% endif %}
+    {%- endif %}
 {%- endblock radio_widget %}
 
 {# Labels #}
 
 {% block form_label -%}
-    {% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' control-label')|trim}) %}
+    {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' control-label')|trim}) -%}
     {{- parent() -}}
 {%- endblock form_label %}
 
-{% block choice_label %}
+{% block choice_label -%}
     {# remove the checkbox-inline and radio-inline class, it's only useful for embed labels #}
-    {% set label_attr = label_attr|merge({class: label_attr.class|default('')|replace({'checkbox-inline': '', 'radio-inline': ''})|trim}) %}
+    {%- set label_attr = label_attr|merge({class: label_attr.class|default('')|replace({'checkbox-inline': '', 'radio-inline': ''})|trim}) -%}
     {{- block('form_label') -}}
 {% endblock %}
 
@@ -168,8 +168,8 @@
             {% set label = name|humanize %}
         {% endif %}
         <label{% for attrname, attrvalue in label_attr %} {{ attrname }}="{{ attrvalue }}"{% endfor %}>
-                {{ widget|raw }}
-                {{ label is not sameas(false) ? label|trans({}, translation_domain) }}
+            {{- widget|raw -}}
+            {{- label is not sameas(false) ? label|trans({}, translation_domain) -}}
         </label>
     {% endif %}
 {% endblock checkbox_radio_label %}
@@ -178,9 +178,9 @@
 
 {% block form_row -%}
     <div class="form-group{% if (not compound or force_error|default(false)) and not valid %} has-error{% endif %}">
-        {{ form_label(form) }}
-        {{ form_widget(form) }}
-        {{ form_errors(form) }}
+        {{- form_label(form) -}}
+        {{- form_widget(form) -}}
+        {{- form_errors(form) -}}
     </div>
 {%- endblock form_row %}
 
@@ -192,35 +192,35 @@
 
 {% block choice_row -%}
     {% set force_error = true %}
-    {{ block('form_row') }}
+    {{- block('form_row') }}
 {%- endblock choice_row %}
 
 {% block date_row -%}
     {% set force_error = true %}
-    {{ block('form_row') }}
+    {{- block('form_row') }}
 {%- endblock date_row %}
 
 {% block time_row -%}
     {% set force_error = true %}
-    {{ block('form_row') }}
+    {{- block('form_row') }}
 {%- endblock time_row %}
 
 {% block datetime_row -%}
     {% set force_error = true %}
-    {{ block('form_row') }}
+    {{- block('form_row') }}
 {%- endblock datetime_row %}
 
 {% block checkbox_row -%}
     <div class="form-group{% if not valid %} has-error{% endif %}">
-        {{ form_widget(form) }}
-        {{ form_errors(form) }}
+        {{- form_widget(form) -}}
+        {{- form_errors(form) -}}
     </div>
 {%- endblock checkbox_row %}
 
 {% block radio_row -%}
     <div class="form-group{% if not valid %} has-error{% endif %}">
-        {{ form_widget(form) }}
-        {{ form_errors(form) }}
+        {{- form_widget(form) -}}
+        {{- form_errors(form) -}}
     </div>
 {%- endblock radio_row %}
 
@@ -231,7 +231,7 @@
     {% if form.parent %}<span class="help-block">{% else %}<div class="alert alert-danger">{% endif %}
     <ul class="list-unstyled">
         {%- for error in errors -%}
-            <li><span class="glyphicon glyphicon-exclamation-sign"></span> {{ error.message }}</li>
+            <li><span class="glyphicon glyphicon-exclamation-sign"></span>{{ error.message }}</li>
         {%- endfor -%}
     </ul>
     {% if form.parent %}</span>{% else %}</div>{% endif %}

src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php

@@ -0,0 +1,114 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Tests\Extension;
+
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Form\TwigRenderer;
+use Symfony\Bridge\Twig\Form\TwigRendererEngine;
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\Tests\AbstractBootstrap3LayoutTest;
+
+class FormExtensionBootstrap3LayoutTest extends AbstractBootstrap3LayoutTest
+{
+    /**
+     * @var FormExtension
+     */
+    protected $extension;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $rendererEngine = new TwigRendererEngine(array(
+            'bootstrap_3_layout.html.twig',
+            'custom_widgets.html.twig',
+        ));
+        $renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'));
+
+        $this->extension = new FormExtension($renderer);
+
+        $loader = new StubFilesystemLoader(array(
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__.'/Fixtures/templates/form',
+        ));
+
+        $environment = new \Twig_Environment($loader, array('strict_variables' => true));
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addExtension($this->extension);
+
+        $this->extension->initRuntime($environment);
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        $this->extension = null;
+    }
+
+    protected function renderForm(FormView $view, array $vars = array())
+    {
+        return (string) $this->extension->renderer->renderBlock($view, 'form', $vars);
+    }
+
+    protected function renderEnctype(FormView $view)
+    {
+        return (string) $this->extension->renderer->searchAndRenderBlock($view, 'enctype');
+    }
+
+    protected function renderLabel(FormView $view, $label = null, array $vars = array())
+    {
+        if ($label !== null) {
+            $vars += array('label' => $label);
+        }
+
+        return (string) $this->extension->renderer->searchAndRenderBlock($view, 'label', $vars);
+    }
+
+    protected function renderErrors(FormView $view)
+    {
+        return (string) $this->extension->renderer->searchAndRenderBlock($view, 'errors');
+    }
+
+    protected function renderWidget(FormView $view, array $vars = array())
+    {
+        return (string) $this->extension->renderer->searchAndRenderBlock($view, 'widget', $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = array())
+    {
+        return (string) $this->extension->renderer->searchAndRenderBlock($view, 'row', $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = array())
+    {
+        return (string) $this->extension->renderer->searchAndRenderBlock($view, 'rest', $vars);
+    }
+
+    protected function renderStart(FormView $view, array $vars = array())
+    {
+        return (string) $this->extension->renderer->renderBlock($view, 'form_start', $vars);
+    }
+
+    protected function renderEnd(FormView $view, array $vars = array())
+    {
+        return (string) $this->extension->renderer->renderBlock($view, 'form_end', $vars);
+    }
+
+    protected function setTheme(FormView $view, array $themes)
+    {
+        $this->extension->renderer->setTheme($view, $themes);
+    }
+}

src/Symfony/Component/Form/Tests/AbstractLayoutTest.php

@@ -92,9 +92,15 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
             'attr' => array('class' => 'my&class'),
         ), $vars));
 
-        $xpath = trim($xpath).'
-    [@id="my&id"]
+        if (!isset($vars['id'])) {
+            $xpath = trim($xpath).'
+    [@id="my&id"]';
+        }
+
+        if (!isset($vars['attr']['class'])) {
+            $xpath .= '
     [@class="my&class"]';
+        }
 
         $this->assertMatchesXpath($html, $xpath);
     }