fix merge

nicolas-grekas · nicolas-grekas · commit c2e256065774 · 2020-06-30T20:21:22.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
@@ -101,7 +101,7 @@ public function getDumpArgs()
             [
                 ['foo' => 'bar'],
                 [],
-                "<pre class=sf-dump id=sf-dump data-indent-pad=\"  \"><span class=sf-dump-note>array:1</span> [<samp data-depth=1 class=sf-dump-expanded>\n"
+                "<pre class=sf-dump id=sf-dump data-indent-pad=\"  \"><span class=sf-dump-note>array:1</span> [<samp>\n"
                 ."  \"<span class=sf-dump-key>foo</span>\" => \"<span class=sf-dump-str title=\"3 characters\">bar</span>\"\n"
                 ."</samp>]\n"
                 ."</pre><script>Sfdump(\"sf-dump\")</script>\n",

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public function getDumpArgs()`
`101`	`101`	`[`
`102`	`102`	`['foo' => 'bar'],`
`103`	`103`	`[],`
`104`		`- "<pre class=sf-dump id=sf-dump data-indent-pad=\" \"><span class=sf-dump-note>array:1</span> [<samp data-depth=1 class=sf-dump-expanded>\n"`
	`104`	`+ "<pre class=sf-dump id=sf-dump data-indent-pad=\" \"><span class=sf-dump-note>array:1</span> [<samp>\n"`
`105`	`105`	`." \"<span class=sf-dump-key>foo</span>\" => \"<span class=sf-dump-str title=\"3 characters\">bar</span>\"\n"`
`106`	`106`	`."</samp>]\n"`
`107`	`107`	`."</pre><script>Sfdump(\"sf-dump\")</script>\n",`