Improves the readability of the collected arrays in the profiler.

Quentin Schuler · fabpot · commit 3f297eaa188a · 2014-02-28T13:12:58.000+01:00
diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
@@ -25,7 +25,7 @@ class FormDataExtractorTest_SimpleValueExporter extends ValueExporter
     /**
      * {@inheritdoc}
      */
-    public function exportValue($value)
+    public function exportValue($value, $depth = 0)
     {
         return is_object($value) ? sprintf('object(%s)', get_class($value)) : var_export($value, true);
     }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php b/src/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php
@@ -20,22 +20,29 @@ class ValueExporter
      * Converts a PHP value to a string.
      *
      * @param mixed $value The PHP value
+     * @param integer $depth The depth of the value to export
      *
      * @return string The string representation of the given value
      */
-    public function exportValue($value)
+    public function exportValue($value, $depth = 0)
     {
         if (is_object($value)) {
             return sprintf('Object(%s)', get_class($value));
         }
 
         if (is_array($value)) {
+            if (empty($value)) {
+                return '[]';
+            }
+
+            $indent = str_repeat('  ', $depth);
+
             $a = array();
             foreach ($value as $k => $v) {
-                $a[] = sprintf('%s => %s', $k, $this->exportValue($v));
+                $a[] = sprintf('%s  %s => %s', $indent, $k, $this->exportValue($v, $depth + 1));
             }
 
-            return sprintf("Array(%s)", implode(', ', $a));
+            return sprintf("[\n%s%s\n%s]", $indent, implode(sprintf(", \n%s", $indent), $a), $indent);
         }
 
         if (is_resource($value)) {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class FormDataExtractorTest_SimpleValueExporter extends ValueExporter`
`25`	`25`	`/**`
`26`	`26`	`* {@inheritdoc}`
`27`	`27`	`*/`
`28`		`- public function exportValue($value)`
	`28`	`+ public function exportValue($value, $depth = 0)`
`29`	`29`	`{`
`30`	`30`	`return is_object($value) ? sprintf('object(%s)', get_class($value)) : var_export($value, true);`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,22 +20,29 @@ class ValueExporter`
`20`	`20`	`* Converts a PHP value to a string.`
`21`	`21`	`*`
`22`	`22`	`* @param mixed $value The PHP value`
	`23`	`+ * @param integer $depth The depth of the value to export`
`23`	`24`	`*`
`24`	`25`	`* @return string The string representation of the given value`
`25`	`26`	`*/`
`26`		`- public function exportValue($value)`
	`27`	`+ public function exportValue($value, $depth = 0)`
`27`	`28`	`{`
`28`	`29`	`if (is_object($value)) {`
`29`	`30`	`return sprintf('Object(%s)', get_class($value));`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`if (is_array($value)) {`
	`34`	`+ if (empty($value)) {`
	`35`	`+ return '[]';`
	`36`	`+ }`
	`37`	`+`
	`38`	`+ $indent = str_repeat(' ', $depth);`
	`39`	`+`
`33`	`40`	`$a = array();`
`34`	`41`	`foreach ($value as $k => $v) {`
`35`		`- $a[] = sprintf('%s => %s', $k, $this->exportValue($v));`
	`42`	`+ $a[] = sprintf('%s %s => %s', $indent, $k, $this->exportValue($v, $depth + 1));`
`36`	`43`	`}`
`37`	`44`
`38`		`- return sprintf("Array(%s)", implode(', ', $a));`
	`45`	`+ return sprintf("[\n%s%s\n%s]", $indent, implode(sprintf(", \n%s", $indent), $a), $indent);`
`39`	`46`	`}`
`40`	`47`
`41`	`48`	`if (is_resource($value)) {`