Kint_Parser_Trace: Allow filtering of trace frames

kint-php · Apr 22, 2017 · d6b2540 · d6b2540
1 parent afdd224
commit d6b2540
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 38 deletions.
diff --git a/build/kint-aante-light.php b/build/kint-aante-light.php
diff --git a/build/kint-solarized-dark.php b/build/kint-solarized-dark.php
diff --git a/build/kint-solarized.php b/build/kint-solarized.php
diff --git a/build/kint.php b/build/kint.php
diff --git a/src/Kint.php b/src/Kint.php
@@ -302,12 +302,22 @@ public static function dump($data = null)
         // Kint::dump(1) shorthand
         if ((!isset($params[0]['name']) || $params[0]['name'] == '1') && $num_args === 1 && $data === 1) {
             if (KINT_PHP525) {
-                $trace = debug_backtrace(true);
+                $data = debug_backtrace(true);
             } else {
-                $trace = debug_backtrace();
+                $data = debug_backtrace();
+            }
+
+            $trace = array();
+
+            // No need to normalize as we've already called it through getCalleeInfo at this point
+            foreach ($data as $index => $frame) {
+                if (Kint_Parser_Trace::frameIsListed($frame, self::$aliases)) {
+                    $trace = array();
+                }
+
+                $trace[] = $frame;
             }
 
-            $trace = Kint_Parser_Trace::trimTrace($trace);
             $lastframe = array_shift($trace);
             $tracename = $lastframe['function'].'(1)';
             if (isset($lastframe['class'], $lastframe['type'])) {
@@ -427,17 +437,19 @@ public static function getIdeLink($file, $line)
      */
     private static function getCalleeInfo($trace, $num_params)
     {
+        Kint_Parser_Trace::normalizeAliases(self::$aliases);
         $miniTrace = array();
 
         foreach ($trace as $index => $frame) {
-            if ($frame['function'] === 'spl_autoload_call' && !isset($frame['object']) && !isset($frame['class'])) {
-                continue;
+            if (Kint_Parser_Trace::frameIsListed($frame, self::$aliases)) {
+                $miniTrace = array();
             }
 
-            $miniTrace[] = $frame;
+            if (!Kint_Parser_Trace::frameIsListed($frame, array('spl_autoload_call'))) {
+                $miniTrace[] = $frame;
+            }
         }
 
-        $miniTrace = Kint_Parser_Trace::trimTrace($miniTrace);
         $callee = reset($miniTrace);
         $caller = next($miniTrace);
         if (!$callee) {

diff --git a/src/Parser/Trace.php b/src/Parser/Trace.php
@@ -2,6 +2,8 @@
 
 class Kint_Parser_Trace extends Kint_Parser_Plugin
 {
+    public static $blacklist = array('spl_autoload_call');
+
     public function getTypes()
     {
         return array('array');
@@ -29,6 +31,8 @@ public function parse(&$var, Kint_Object &$o, $trigger)
 
         $old_trace = $rep->contents;
 
+        self::normalizeAliases(self::$blacklist);
+
         $rep->contents = array();
 
         foreach ($old_trace as $frame) {
@@ -39,7 +43,7 @@ public function parse(&$var, Kint_Object &$o, $trigger)
                 continue;
             }
 
-            if ($trace[$index]['function'] === 'spl_autoload_call' && !isset($trace[$index]['object']) && !isset($trace[$index]['class'])) {
+            if (self::frameIsListed($trace[$index], self::$blacklist)) {
                 continue;
             }
 
@@ -82,49 +86,30 @@ public static function isTrace(array $trace)
         return $file_found;
     }
 
-    public static function trimTrace(array $trace)
+    public static function frameIsListed(array $frame, array $matches)
     {
-        $trimmed_trace = array();
-
-        foreach ($trace as $index => $frame) {
-            if (self::frameIsInternal($frame)) {
-                $trimmed_trace = array();
-            }
-
-            $trimmed_trace[] = $frame;
-        }
-
-        return $trimmed_trace;
-    }
-
-    private static function frameIsInternal(array $frame)
-    {
-        self::normalizeAliases(Kint::$aliases);
-
-        if (isset($frame['object'])) {
-            $called = array($frame['object'], strtolower($frame['function']));
-        } elseif (isset($frame['class'])) {
+        if (isset($frame['class'])) {
             $called = array(strtolower($frame['class']), strtolower($frame['function']));
         } else {
             $called = strtolower($frame['function']);
         }
 
-        return in_array($called, Kint::$aliases, true);
+        return in_array($called, $matches, true);
     }
 
-    private static function normalizeAliases(array &$aliases)
+    public static function normalizeAliases(array &$aliases)
     {
         foreach ($aliases as $index => &$alias) {
-            if (!is_callable($alias)) {
-                unset($aliases[$index]);
-            } elseif (is_array($alias) && count($alias) === 2) {
+            if (is_array($alias) && count($alias) === 2) {
                 $alias = array_values($alias);
                 $alias[1] = strtolower($alias[1]);
                 if (is_string($alias[0])) {
                     $alias[0] = strtolower($alias[0]);
                 }
             } elseif (is_string($alias)) {
                 $alias = strtolower($alias);
+            } else {
+                unset($aliases[$index]);
             }
         }