[HttpKernel] updated HttpKernel::varToString()

fabpot · fabpot · commit 8b168a142b07 · 2011-06-20T10:27:01.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -181,7 +181,7 @@ private function handleException(\Exception $e, $request, $type)
     private function varToString($var)
     {
         if (is_object($var)) {
-            return sprintf('[object](%s)', get_class($var));
+            return sprintf('Object(%s)', get_class($var));
         }
 
         if (is_array($var)) {
@@ -190,17 +190,25 @@ private function varToString($var)
                 $a[] = sprintf('%s => %s', $k, $this->varToString($v));
             }
 
-            return sprintf("[array](%s)", implode(', ', $a));
+            return sprintf("Array(%s)", implode(', ', $a));
         }
 
         if (is_resource($var)) {
-            return '[resource]';
+            return sprintf('Resource(%s)', get_resource_type($var));
         }
 
         if (null === $var) {
             return 'null';
         }
 
-        return str_replace("\n", '', var_export((string) $var, true));
+        if (false === $var) {
+            return 'false';
+        }
+
+        if (true === $var) {
+            return 'true';
+        }
+
+        return (string) $var;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ private function handleException(\Exception $e, $request, $type)`
`181`	`181`	`private function varToString($var)`
`182`	`182`	`{`
`183`	`183`	`if (is_object($var)) {`
`184`		`- return sprintf('[object](%s)', get_class($var));`
	`184`	`+ return sprintf('Object(%s)', get_class($var));`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`if (is_array($var)) {`
`@@ -190,17 +190,25 @@ private function varToString($var)`
`190`	`190`	`$a[] = sprintf('%s => %s', $k, $this->varToString($v));`
`191`	`191`	`}`
`192`	`192`
`193`		`- return sprintf("[array](%s)", implode(', ', $a));`
	`193`	`+ return sprintf("Array(%s)", implode(', ', $a));`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`if (is_resource($var)) {`
`197`		`- return '[resource]';`
	`197`	`+ return sprintf('Resource(%s)', get_resource_type($var));`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`if (null === $var) {`
`201`	`201`	`return 'null';`
`202`	`202`	`}`
`203`	`203`
`204`		`- return str_replace("\n", '', var_export((string) $var, true));`
	`204`	`+ if (false === $var) {`
	`205`	`+ return 'false';`
	`206`	`+ }`
	`207`	`+`
	`208`	`+ if (true === $var) {`
	`209`	`+ return 'true';`
	`210`	`+ }`
	`211`	`+`
	`212`	`+ return (string) $var;`
`205`	`213`	`}`
`206`	`214`	`}`