Fix some PHP notices in TD.php

adrianbj · adrianbj · commit c5c9bf47aa3a · 2018-05-25T15:24:44.000-07:00
diff --git a/TracyDebugger.module b/TracyDebugger.module
@@ -32,7 +32,7 @@ class TracyDebugger extends WireData implements Module, ConfigurableModule {
             'summary' => __('Tracy debugger from Nette with several PW specific custom tools.', __FILE__),
             'author' => 'Adrian Jones',
             'href' => 'https://processwire.com/talk/topic/12208-tracy-debugger/',
-            'version' => '4.10.20',
+            'version' => '4.10.21',
             'autoload' => true,
             'singular' => true,
             'requires'  => 'ProcessWire>=2.7.2, PHP>=5.4.4',
diff --git a/includes/TD.php b/includes/TD.php
@@ -55,7 +55,7 @@ public static function barDumpBig($var, $title = NULL) {
             $options = $title;
             $title = NULL;
         }
-        if(is_array($options) && !static::has_string_keys($options)) {
+        if(isset($options) && is_array($options) && !static::has_string_keys($options)) {
             $options['maxDepth'] = $options[0];
             if(isset($options[1])) $options['maxLength'] = $options[1];
         }
@@ -76,7 +76,7 @@ public static function barDump($var, $title = NULL, array $options = NULL) {
             $options = $title;
             $title = NULL;
         }
-        if(is_array($options) && !static::has_string_keys($options)) {
+        if(isset($options) && is_array($options) && !static::has_string_keys($options)) {
             $options['maxDepth'] = $options[0];
             if(isset($options[1])) $options['maxLength'] = $options[1];
         }
@@ -114,7 +114,7 @@ public static function dump($var, $title = NULL, array $options = NULL, $return
             $options = $title;
             $title = NULL;
         }
-        if(is_array($options) && !static::has_string_keys($options)) {
+        if(isset($options) && is_array($options) && !static::has_string_keys($options)) {
             $options['maxDepth'] = $options[0];
             if(isset($options[1])) $options['maxLength'] = $options[1];
         }
diff --git a/tracy-master/src/Tracy/Debugger.php b/tracy-master/src/Tracy/Debugger.php
@@ -15,7 +15,7 @@
  */
 class Debugger
 {
-	const VERSION = '2.5-dev';
+	const VERSION = '2.5.0';
 
 	/** server modes for Debugger::enable() */
 	const
diff --git a/tracy-master/src/Tracy/Dumper.php b/tracy-master/src/Tracy/Dumper.php
@@ -8,7 +8,6 @@
 namespace Tracy;
 
 
-
 /**
  * Dumps a variable.
  */
@@ -238,7 +237,7 @@ private static function dumpObject(&$var, $options, $level)
 		$editorAttributes = '';
 		if ($options[self::LOCATION] & self::LOCATION_CLASS) {
 			$rc = $var instanceof \Closure ? new \ReflectionFunction($var) : new \ReflectionClass($var);
-			$editor = Helpers::editorUri($rc->getFileName(), $rc->getStartLine());
+			$editor = $rc->getFileName() ? Helpers::editorUri($rc->getFileName(), $rc->getStartLine()) : null;
 			if ($editor) {
 				$editorAttributes = Helpers::formatHtml(
 					' title="Declared in file % on line %" data-tracy-href="%"',
diff --git a/tracy-master/src/Tracy/FireLogger.php b/tracy-master/src/Tracy/FireLogger.php
@@ -8,7 +8,6 @@
 namespace Tracy;
 
 
-
 /**
  * FireLogger console logger.
  *

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public static function barDumpBig($var, $title = NULL) {`
`55`	`55`	`$options = $title;`
`56`	`56`	`$title = NULL;`
`57`	`57`	`}`
`58`		`- if(is_array($options) && !static::has_string_keys($options)) {`
	`58`	`+ if(isset($options) && is_array($options) && !static::has_string_keys($options)) {`
`59`	`59`	`$options['maxDepth'] = $options[0];`
`60`	`60`	`if(isset($options[1])) $options['maxLength'] = $options[1];`
`61`	`61`	`}`
`@@ -76,7 +76,7 @@ public static function barDump($var, $title = NULL, array $options = NULL) {`
`76`	`76`	`$options = $title;`
`77`	`77`	`$title = NULL;`
`78`	`78`	`}`
`79`		`- if(is_array($options) && !static::has_string_keys($options)) {`
	`79`	`+ if(isset($options) && is_array($options) && !static::has_string_keys($options)) {`
`80`	`80`	`$options['maxDepth'] = $options[0];`
`81`	`81`	`if(isset($options[1])) $options['maxLength'] = $options[1];`
`82`	`82`	`}`
`@@ -114,7 +114,7 @@ public static function dump($var, $title = NULL, array $options = NULL, $return`
`114`	`114`	`$options = $title;`
`115`	`115`	`$title = NULL;`
`116`	`116`	`}`
`117`		`- if(is_array($options) && !static::has_string_keys($options)) {`
	`117`	`+ if(isset($options) && is_array($options) && !static::has_string_keys($options)) {`
`118`	`118`	`$options['maxDepth'] = $options[0];`
`119`	`119`	`if(isset($options[1])) $options['maxLength'] = $options[1];`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`	`class Debugger`
`17`	`17`	`{`
`18`		`- const VERSION = '2.5-dev';`
	`18`	`+ const VERSION = '2.5.0';`
`19`	`19`
`20`	`20`	`/** server modes for Debugger::enable() */`
`21`	`21`	`const`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`namespace Tracy;`
`9`	`9`
`10`	`10`
`11`		`-`
`12`	`11`	`/**`
`13`	`12`	`* FireLogger console logger.`
`14`	`13`	`*`