From d851b229c31cc0a05db649ae5844d4237a2fadba Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@gmail.com>
Date: Sun, 5 Oct 2014 22:04:12 +0200
Subject: [PATCH 1/3] [TwigBridge] fix `DumpExtension` tests

Make test compatible with the changes from #12125.
---
 .../Twig/Tests/Extension/DumpExtensionTest.php     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
index 35d51d3a4cd39..16361e3e5debc 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
@@ -86,20 +86,20 @@ public function getDumpArgs()
     {
         return array(
             array(array(), array(), '', false),
-            array(array(), array(), "<pre id=sf-dump><span class=sf-dump-0>[]\n</span></pre><script>Sfjs.dump.instrument()</script>\n"),
+            array(array(), array(), "<pre class=sf-dump>[]\n</pre><script>Sfjs.dump.instrument()</script>\n"),
             array(
                 array(),
                 array(123, 456),
-                "<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-num>123</span>\n</span></pre><script>Sfjs.dump.instrument()</script>\n"
-                ."<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-num>456</span>\n</span></pre><script>Sfjs.dump.instrument()</script>\n",
+                "<pre class=sf-dump><span class=sf-dump-num>123</span>\n</pre><script>Sfjs.dump.instrument()</script>\n"
+                ."<pre class=sf-dump><span class=sf-dump-num>456</span>\n</pre><script>Sfjs.dump.instrument()</script>\n",
             ),
             array(
                 array('foo' => 'bar'),
                 array(),
-                "<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-note>array:1</span> [<span name=sf-dump-child>\n"
-                ."  <span class=sf-dump-1>\"<span class=sf-dump-meta>foo</span>\" => \"<span class=sf-dump-str>bar</span>\"\n"
-                ."</span></span>]\n"
-                ."</span></pre><script>Sfjs.dump.instrument()</script>\n",
+                "<pre class=sf-dump><span class=sf-dump-note>array:1</span> [<span name=sf-dump-child>\n"
+                ."  \"<span class=sf-dump-meta>foo</span>\" => \"<span class=sf-dump-str>bar</span>\"\n"
+                ."</span>]\n"
+                ."</pre><script>Sfjs.dump.instrument()</script>\n",
             ),
         );
     }

From 5195130ddaa8294f3a69bdccd226c383809b4340 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@gmail.com>
Date: Sun, 5 Oct 2014 22:47:01 +0200
Subject: [PATCH 2/3] [SecurityBundle] add missing dev dependency

The `SetAclCommandTest` indirectly requires the Symfony Console
component.
---
 src/Symfony/Bundle/SecurityBundle/composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
index 73559a1288af5..ba0de66572d40 100644
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -22,6 +22,7 @@
     },
     "require-dev": {
         "symfony/browser-kit": "~2.3",
+        "symfony/console": "~2.3",
         "symfony/form": "~2.3",
         "symfony/framework-bundle": "~2.2,<2.6.0",
         "symfony/twig-bundle": "~2.2",

From f983175edad7d614549cb245febc65388066ec99 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@gmail.com>
Date: Sun, 5 Oct 2014 22:59:55 +0200
Subject: [PATCH 3/3] [FrameworkBundle] update required Form dev version

---
 src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 0ef82e0935b7b..d3bcf945ecf92 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -36,7 +36,7 @@
         "symfony/console": "~2.0",
         "symfony/finder": "~2.0",
         "symfony/security": "~2.4",
-        "symfony/form": "2.5.*",
+        "symfony/form": "~2.6@dev",
         "symfony/class-loader": "~2.1",
         "symfony/expression-language": "~2.4",
         "symfony/process": "~2.0",