Changeset 3532

Timestamp:

10/05/2008 10:45:22 AM (2 months ago)

Author:

Shadowhand

Message:

Fixing recursion in Kohana::debug_var(), fixes #833. This still does not help with displaying private/protected properties, so the bug will remain open.

Files:

• trunk/system/classes/kohana.php (modified) (3 diffs)

trunk/system/classes/kohana.php

@@ -1496 +1496 @@
          * any variable.
          *
-         * @param   mixed   variable to dump
+         * @param   mixed    variable to dump
+         * @param   boolean  internal recursion
          * @return  string
          */
-        public static function debug_var($var)
-        {
+        public static function debug_var($var, $recursion = FALSE)
+        {
+                static $objects;
+
+                if ($recursion === FALSE)
+                {
+                        $objects = array();
+                }
+
                 switch (gettype($var))
                 {
                         case 'object':
+                                // Unique hash of the object
+                                $hash = spl_object_hash($var);
+
                                 $object = new ReflectionObject($var);
                                 $more = FALSE;
                                 $out = 'object '.$object->getName().' { ';
-                                foreach ($object->getProperties() as $property)
-                                {
-                                        if ($property->isPublic())
+
+                                if ($recursion === TRUE AND in_array($hash, $objects))
+                                {
+                                        $out .= '*RECURSION*';
+                                }
+                                else
+                                {
+                                        // Add the hash to the objects, to detect later recursion
+                                        $objects[] = $hash;
+
+                                        foreach ($object->getProperties() as $property)
                                         {
-                                                $out .= ($more === TRUE ? ', ' : '').$property->getName().' => '.self::debug_var($property->getValue($var));
+                                                $out .= ($more === TRUE ? ', ' : '').$property->getName().' => ';
+                                                if ($property->isPublic())
+                                                {
+                                                        $out .= self::debug_var($property->getValue($var), TRUE);
+                                                }
+                                                elseif ($property->isPrivate())
+                                                {
+                                                        $out .= '*PRIVATE*';
+                                                }
+                                                else
+                                                {
+                                                        $out .= '*PROTECTED*';
+                                                }
                                                 $more = TRUE;
                                         }
@@ -1523 +1554 @@
                                         if ( ! is_int($key))
                                         {
-                                                $key = self::debug_var($key).' => ';
+                                                $key = self::debug_var($key, TRUE).' => ';
                                         }
                                         else
@@ -1529 +1560 @@
                                                 $key = '';
                                         }
-                                        $out .= ($more ? ', ' : '').$key.self::debug_var($val);
+                                        $out .= ($more ? ', ' : '').$key.self::debug_var($val, TRUE);
                                         $more = TRUE;
                                 }
                                 return $out.')';
-
                         case 'string':
                                 return "'$var'";
-
                         case 'float':
                                 return number_format($var, 6).'…';
-
                         case 'boolean':
                                 return $var === TRUE ? 'TRUE' : 'FALSE';
-
                         default:
                                 return (string) $var;