minor #18059 [WebProfilerBundle] fix context log pre wrap (HeahDude)

fabpot · fabpot · commit 464a4920def7 · 2016-03-10T18:07:32.000+01:00
This PR was squashed before being merged into the 3.1-dev branch (closes #18059). Discussion ---------- [WebProfilerBundle] fix context log pre wrap | Q | A | ------------- | --- | Branch | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | - Commits ------- 6b23861 [WebProfilerBundle] fix context log pre wrap
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
@@ -827,6 +827,7 @@ table.logs .metadata .context {
 table.logs .metadata .context pre {
     margin: 5px 0;
     padding: 5px 10px;
+    white-space: pre-wrap;
 }
 
 table.logs .sf-call-stack {
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php b/src/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php
@@ -58,7 +58,13 @@ public function exportValue($value, $depth = 1, $deep = false)
                 return sprintf("[\n%s%s\n%s]", $indent, implode(sprintf(", \n%s", $indent), $a), str_repeat('  ', $depth - 1));
             }
 
-            return sprintf('[%s]', implode(', ', $a));
+            $s = sprintf('[%s]', implode(', ', $a));
+
+            if (80 > strlen($s)) {
+                return $s;
+            }
+
+            return sprintf("[\n%s%s\n]", $indent, implode(sprintf(",\n%s", $indent), $a));
         }
 
         if (is_resource($value)) {

Original file line number	Diff line number	Diff line change
`@@ -827,6 +827,7 @@ table.logs .metadata .context {`
`827`	`827`	`table.logs .metadata .context pre {`
`828`	`828`	`margin: 5px 0;`
`829`	`829`	`padding: 5px 10px;`
	`830`	`+ white-space: pre-wrap;`
`830`	`831`	`}`
`831`	`832`
`832`	`833`	`table.logs .sf-call-stack {`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,13 @@ public function exportValue($value, $depth = 1, $deep = false)`
`58`	`58`	`return sprintf("[\n%s%s\n%s]", $indent, implode(sprintf(", \n%s", $indent), $a), str_repeat(' ', $depth - 1));`
`59`	`59`	`}`
`60`	`60`
`61`		`- return sprintf('[%s]', implode(', ', $a));`
	`61`	`+ $s = sprintf('[%s]', implode(', ', $a));`
	`62`	`+`
	`63`	`+ if (80 > strlen($s)) {`
	`64`	`+ return $s;`
	`65`	`+ }`
	`66`	`+`
	`67`	`+ return sprintf("[\n%s%s\n]", $indent, implode(sprintf(",\n%s", $indent), $a));`
`62`	`68`	`}`
`63`	`69`
`64`	`70`	`if (is_resource($value)) {`