From d94ba96ae30c5f9ad2cf3dd2ec337bdbc04b24e2 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Tue, 21 Apr 2015 19:20:50 +1000 Subject: [PATCH] Better exception handling to dump() --- modules/cms/twig/DebugExtension.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/cms/twig/DebugExtension.php b/modules/cms/twig/DebugExtension.php index bd538fa8f..c49f1ca27 100644 --- a/modules/cms/twig/DebugExtension.php +++ b/modules/cms/twig/DebugExtension.php @@ -113,9 +113,12 @@ class DebugExtension extends Twig_Extension elseif (is_array($var)) { $caption = static::ARRAY_CAPTION; } - else { + elseif (is_object($var)) { $caption = [static::OBJECT_CAPTION, get_class($var)]; } + else { + $caption = [static::OBJECT_CAPTION, gettype($var)]; + } $result .= $this->dump($var, $caption); } @@ -443,6 +446,9 @@ class DebugExtension extends Twig_Extension $vars = []; foreach ($info->getProperties() as $property) { + if ($property->isStatic()) { + continue; // Only non-static + } if (!$property->isPublic()) { continue; // Only public }