From 7a1fac20b5b3097b0df2849a8f3683ca7f025689 Mon Sep 17 00:00:00 2001
From: zmikael <zmikael@msn.com>
Date: Tue, 5 May 2015 11:05:35 +0200
Subject: [PATCH 1/2] Adding a space between the icon and the error message

---
 .../Twig/Resources/views/Form/bootstrap_3_layout.html.twig      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
index 01fe46dd06..c1f4d1e700 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
@@ -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 %}

From d0f63429b03761f00ac021d446af66e854d04b0f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 15 May 2015 15:29:32 +0200
Subject: [PATCH 2/2] [Form] Test for space in
 AbstractBootstrap3LayoutTest::testErrors

---
 src/Symfony/Bridge/Twig/composer.json                         | 2 +-
 .../Component/Form/Tests/AbstractBootstrap3LayoutTest.php     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index 55bc80b1e6..c5b64edbeb 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -22,7 +22,7 @@
     "require-dev": {
         "symfony/phpunit-bridge": "~2.7",
         "symfony/finder": "~2.3",
-        "symfony/form": "~2.6,>=2.6.6",
+        "symfony/form": "~2.6,>=2.6.8",
         "symfony/http-kernel": "~2.3",
         "symfony/intl": "~2.3",
         "symfony/routing": "~2.2",
diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
index b5354e0bd2..d927089dc2 100644
--- a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
@@ -118,12 +118,12 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
             [@class="list-unstyled"]
             [
                 ./li
-                    [.="[trans]Error 1[/trans]"]
+                    [.=" [trans]Error 1[/trans]"]
                     [
                         ./span[@class="glyphicon glyphicon-exclamation-sign"]
                     ]
                 /following-sibling::li
-                    [.="[trans]Error 2[/trans]"]
+                    [.=" [trans]Error 2[/trans]"]
                     [
                         ./span[@class="glyphicon glyphicon-exclamation-sign"]
                     ]