Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 966c586

Browse filesBrowse files
committed
minor #12142 [TwigBridge] fix DumpExtension tests (xabbuh)
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
2 parents a7d52fd + e3332ad commit 966c586
Copy full SHA for 966c586

File tree

3 files changed

+9
-8
lines changed
Filter options

3 files changed

+9
-8
lines changed

‎src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,20 @@ public function getDumpArgs()
8686
{
8787
return array(
8888
array(array(), array(), '', false),
89-
array(array(), array(), "<pre id=sf-dump><span class=sf-dump-0>[]\n</span></pre><script>Sfjs.dump.instrument()</script>\n"),
89+
array(array(), array(), "<pre class=sf-dump>[]\n</pre><script>Sfjs.dump.instrument()</script>\n"),
9090
array(
9191
array(),
9292
array(123, 456),
93-
"<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"
94-
."<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",
93+
"<pre class=sf-dump><span class=sf-dump-num>123</span>\n</pre><script>Sfjs.dump.instrument()</script>\n"
94+
."<pre class=sf-dump><span class=sf-dump-num>456</span>\n</pre><script>Sfjs.dump.instrument()</script>\n",
9595
),
9696
array(
9797
array('foo' => 'bar'),
9898
array(),
99-
"<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-note>array:1</span> [<span name=sf-dump-child>\n"
100-
." <span class=sf-dump-1>\"<span class=sf-dump-meta>foo</span>\" => \"<span class=sf-dump-str>bar</span>\"\n"
101-
."</span></span>]\n"
102-
."</span></pre><script>Sfjs.dump.instrument()</script>\n",
99+
"<pre class=sf-dump><span class=sf-dump-note>array:1</span> [<span name=sf-dump-child>\n"
100+
." \"<span class=sf-dump-meta>foo</span>\" => \"<span class=sf-dump-str>bar</span>\"\n"
101+
."</span>]\n"
102+
."</pre><script>Sfjs.dump.instrument()</script>\n",
103103
),
104104
);
105105
}

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"symfony/console": "~2.0",
3737
"symfony/finder": "~2.0",
3838
"symfony/security": "~2.4",
39-
"symfony/form": "2.5.*",
39+
"symfony/form": "~2.6@dev",
4040
"symfony/class-loader": "~2.1",
4141
"symfony/expression-language": "~2.4",
4242
"symfony/process": "~2.0",

‎src/Symfony/Bundle/SecurityBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/composer.json
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
},
2323
"require-dev": {
2424
"symfony/browser-kit": "~2.3",
25+
"symfony/console": "~2.3",
2526
"symfony/form": "~2.3",
2627
"symfony/framework-bundle": "~2.2,<2.6.0",
2728
"symfony/twig-bundle": "~2.2",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.