Merge pull request #9 from satomif/php54

Php54
bearsaturday · Apr 6, 2018 · 98b391e · 98b391e
2 parents b196a4a + 321ddcd
commit 98b391e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/Panda.php b/Panda.php
@@ -811,7 +811,7 @@ public static function error($heading, $subheading = "", $info = "", array $opti
             $output .= '<h2>' . $subheading . '</h2>';
             $output .= '<p class="panda-cmd">';
             if ($options['trace']) {
-                $output .= '<a target="_panda_trace_' . $traceId . '" href="' . "http://{$_SERVER['SERVER_NAME']}" . self::$_config[self::CONFIG_PANDA_PATH] . '__panda/trace/?id=' . $traceId . '">trace</a> | ';
+                $output .= '<a target="_panda_trace_' . $traceId . '" href="' . self::$_config[self::CONFIG_PANDA_PATH] . '__panda/trace/?id=' . $traceId . '">trace</a> | ';
             }
             $output .= '<a href=# onclick="var t = document.getElementById(\'panda-';
             $output .= $num . '\'); t.parentNode.removeChild(t);return false;">close</a>';
@@ -949,13 +949,15 @@ private static function __addReflectInfo($trace)
                 if (isset($row['object'])) {
                     $refLog[$i]['export'] = ReflectionObject::export($row['object'], true);
                 }
-                $ref = new ReflectionMethod($row['class'], $row['function']);
-                $refLog[$i]['file'] = $ref->getFileName();
-                $refLog[$i]['doc'] = $ref->getDocComment();
-                $refLog[$i]['start'] = $ref->getStartLine();
-                $refLog[$i]['end'] = $ref->getEndLine();
+                if (method_exists($row['class'], $row['function'])) {
+                    $ref = new ReflectionMethod($row['class'], $row['function']);
+                    $refLog[$i]['file'] = $ref->getFileName();
+                    $refLog[$i]['doc'] = $ref->getDocComment();
+                    $refLog[$i]['start'] = $ref->getStartLine();
+                    $refLog[$i]['end'] = $ref->getEndLine();
+                    $i++;
+                }
             }
-            $i++;
         }
         return $refLog;
     }

diff --git a/data/htdocs/__panda/edit/index.php b/data/htdocs/__panda/edit/index.php
@@ -1,4 +1,5 @@
 <?php
+require_once 'vendor/autoload.php';
 require 'Panda.php';
 
 $file = isset($_GET['file']) ?  $_GET['file'] : false;

diff --git a/data/htdocs/__panda/trace/index.php b/data/htdocs/__panda/trace/index.php
@@ -1,4 +1,5 @@
 <?php
+require_once 'vendor/autoload.php';
 require_once 'Panda/vendors/debuglib.php';
 require_once 'Panda.php';
 /**