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(), "
[]\n
\n"),
+ array(array(), array(), "[]\n\n"), array( array(), array(123, 456), - "
123\n
\n"
- ."456\n
\n",
+ "123\n
\n"
+ ."456\n
\n",
),
array(
array('foo' => 'bar'),
array(),
- "array:1 [\n"
- ." \"bar\"\n"
- ." \" => \"]\n"
- ."
\n",
+ "array:1 [\n" + ." \"bar\"\n" + ."]\n" + ." \" => \"\n", ), ); } 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", 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",