minor #12142 [TwigBridge] fix DumpExtension tests (xabbuh)

fabpot · fabpot · commit 966c586ff19a · 2014-10-06T13:17:57.000+02:00
This PR was squashed before being merged into the 2.6-dev branch (closes #12142). Discussion ---------- [TwigBridge] fix `DumpExtension` tests | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Make test compatible with the changes from #12125. Commits ------- e3332ad [TwigBridge] fix tests
diff --git 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",
             ),
         );
     }
diff --git 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",
diff --git 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",
