From 8b168a142b07992e8261d66bfb0e732fc5824ee1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 20 Jun 2011 10:27:01 +0200 Subject: [PATCH] [HttpKernel] updated HttpKernel::varToString() --- src/Symfony/Component/HttpKernel/HttpKernel.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php index dc8330cfcd7e..57999fc08296 100644 --- 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; } }