From 5833d215b08ce19597a1b817399df2b9e767d6c4 Mon Sep 17 00:00:00 2001
From: Jakub Zalas <jakub@zalas.pl>
Date: Wed, 15 May 2013 21:39:15 +0100
Subject: [PATCH 1/2] [Bridge][Twig] Fixed the test.

Test was broken by 6d5bc7ad0f00b8ec5975a48478e59fb63e626682 (PR #8043).
---
 src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php
index 5c91195169951..7d6ad0b6744b6 100644
--- a/src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php
@@ -135,8 +135,7 @@ public function testButtonRow()
 '/tr
     [
         ./td
-            [.=""]
-        /following-sibling::td
+            [@colspan="2"]
             [./button[@type="button"][@name="name"]]
     ]
     [count(//label)=0]

From 366527ccc467d5cd7917f6181875e873af4df086 Mon Sep 17 00:00:00 2001
From: Jakub Zalas <jakub@zalas.pl>
Date: Wed, 15 May 2013 21:51:35 +0100
Subject: [PATCH 2/2] [FrameworkBundle] Replaced an empty td with a colspan
 attribute.

This makes it consistent with the twig layout.
---
 .../Resources/views/FormTable/button_row.html.php              | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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
index ef4d22b975081..cc93c7b9e3c75 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/button_row.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/button_row.html.php
@@ -1,6 +1,5 @@
 <tr>
-    <td></td>
-    <td>
+    <td colspan="2">
         <?php echo $view['form']->widget($form) ?>
     </td>
 </tr>