compatibility with PHP 8.0

Author: dg

.travis.yml

@@ -4,6 +4,7 @@ php:
     - 7.2
     - 7.3
     - 7.4
+    - 8.0snapshot
 
 env:
     - PHP_BIN=php

readme.md

@@ -41,8 +41,8 @@ composer require tracy/tracy
 Alternatively, you can download the whole package or [tracy.phar](https://github.com/nette/tester/releases) file.
 
 | Tracy | PHP | compatible with browsers
-|-----------|---------------|----------
-| Tracy 2.6 | PHP 7.1 – 7.4 | Chrome 49+, Firefox 45+, MS Edge 14+, Safari 10+ and iOS Safari 10.2+
+|-----------|-----------------|----------
+| Tracy 2.6 | PHP 7.1 – 8.0   | Chrome 49+, Firefox 45+, MS Edge 14+, Safari 10+ and iOS Safari 10.2+
 | Tracy 2.5 | PHP 5.4.4 – 7.3 | Chrome 49+, Firefox 45+, MS Edge 12+, Safari 10+ and iOS Safari 10.2+
 | Tracy 2.4 | PHP 5.4.4 – 7.2 | Chrome 29+, Firefox 28+, IE 11+ (except AJAX), MS Edge 12+, Safari 9+ and iOS Safari 9.2+
 

src/Tracy/Helpers.php

@@ -166,7 +166,7 @@ public static function getSource(): string
 				. $_SERVER['REQUEST_URI'];
 		} else {
 			return 'CLI (PID: ' . getmypid() . ')'
-				. ': ' . implode(' ', array_map([self::class, 'escapeArg'], $_SERVER['argv']));
+				. (isset($_SERVER['argv']) ? ': ' . implode(' ', array_map([self::class, 'escapeArg'], $_SERVER['argv'])) : '');
 		}
 	}
 
@@ -188,7 +188,7 @@ public static function improveException(\Throwable $e): void
 			$message .= ", did you mean $hint()?";
 			$replace = ["$m[2](", "$hint("];
 
-		} elseif (preg_match('#^Undefined variable: (\w+)#', $message, $m) && !empty($e->context)) {
+		} elseif (preg_match('#^Undefined variable:? \$?(\w+)#', $message, $m) && !empty($e->context)) {
 			$hint = self::getSuggestion(array_keys($e->context), $m[1]);
 			$message = "Undefined variable $$m[1], did you mean $$hint?";
 			$replace = ["$$m[1]", "$$hint"];
@@ -200,7 +200,7 @@ public static function improveException(\Throwable $e): void
 			$message .= ", did you mean $$hint?";
 			$replace = ["->$m[2]", "->$hint"];
 
-		} elseif (preg_match('#^Access to undeclared static property: ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
+		} elseif (preg_match('#^Access to undeclared static property:? ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
 			$rc = new \ReflectionClass($m[1]);
 			$items = array_intersect($rc->getProperties(\ReflectionProperty::IS_PUBLIC), $rc->getProperties(\ReflectionProperty::IS_STATIC));
 			$hint = self::getSuggestion($items, $m[2]);
@@ -223,7 +223,7 @@ public static function improveException(\Throwable $e): void
 	/** @internal */
 	public static function improveError(string $message, array $context = []): string
 	{
-		if (preg_match('#^Undefined variable: (\w+)#', $message, $m) && $context) {
+		if (preg_match('#^Undefined variable:? \$?(\w+)#', $message, $m) && $context) {
 			$hint = self::getSuggestion(array_keys($context), $m[1]);
 			return $hint ? "Undefined variable $$m[1], did you mean $$hint?" : $message;
 

tests/Tracy/Debugger.autoloading.phpt

@@ -3,6 +3,7 @@
 /**
  * Test: Tracy\Debugger autoloading.
  * @outputMatch %A%: Declaration of B::test(%a?%) should be compatible %a% A::test() in %A%
+ * @phpVersion < 8
  */
 
 declare(strict_types=1);

tests/Tracy/Debugger.exception.html.phpt

@@ -44,5 +44,5 @@ function third($arg1)
 
 
 define('MY_CONST', 123);
-echo @$undefined;
+@hex2bin('a'); // E_WARNING
 first(10, 'any string');

tests/Tracy/Debugger.logSeverity.E_NOTICE.development.phpt

@@ -17,7 +17,7 @@ require __DIR__ . '/../bootstrap.php';
 Debugger::enable(Debugger::DEVELOPMENT, getTempDir());
 Debugger::$logSeverity = E_NOTICE;
 
-$variable = $missingVariable;
+$variable = &pi();
 
 Assert::count(0, glob(getTempDir() . '/exception*.html'));
 Assert::count(0, glob(getTempDir() . '/error.log'));

tests/Tracy/Debugger.logSeverity.E_NOTICE.phpt

@@ -17,9 +17,9 @@ require __DIR__ . '/../bootstrap.php';
 Debugger::enable(Debugger::PRODUCTION, getTempDir());
 Debugger::$logSeverity = E_NOTICE;
 
-$variable = $missingVariable;
+$variable = &pi();
 
-Assert::same('Undefined variable: missingVariable', error_get_last()['message']);
+Assert::same('Only variables should be assigned by reference', error_get_last()['message']);
 
 Assert::count(1, glob(getTempDir() . '/exception*.html'));
 Assert::count(1, glob(getTempDir() . '/error.log'));

tests/Tracy/Debugger.logging.warnings.phpt

@@ -24,7 +24,7 @@ Debugger::enable(Debugger::PRODUCTION, $logDirectory, 'admin@example.com');
 
 
 // throw error
-$a++;
+hex2bin('a'); // E_WARNING
 
-Assert::match('%a%PHP Notice: Undefined variable: a in %a%', file_get_contents($logDirectory . '/error.log'));
+Assert::match('%a%PHP Warning: hex2bin(): Hexadecimal input string must have an even length in %a%', file_get_contents($logDirectory . '/error.log'));
 Assert::true(is_file($logDirectory . '/email-sent'));

tests/Tracy/Debugger.scream.phpt

@@ -19,7 +19,6 @@ header('Content-Type: text/plain; charset=utf-8');
 
 Debugger::enable();
 
-@mktime(); // E_DEPRECATED
-@$x++; // E_NOTICE
-@min(1); // E_WARNING
+@$x = &pi(); // E_NOTICE
+@hex2bin('a'); // E_WARNING
 @require __DIR__ . '/fixtures/E_COMPILE_WARNING.php'; // E_COMPILE_WARNING (not working)

tests/Tracy/Debugger.shut-up.warnings.phpt

@@ -18,7 +18,6 @@ header('Content-Type: text/plain; charset=utf-8');
 
 Debugger::enable();
 
-@mktime(); // E_DEPRECATED
-@$x++; // E_NOTICE
-@min(1); // E_WARNING
+@$x = &pi(); // E_NOTICE
+@hex2bin('a'); // E_WARNING
 @require __DIR__ . '/fixtures/E_COMPILE_WARNING.php'; // E_COMPILE_WARNING