' - . (@is_file($e->sourceName) // @ - may trigger error - ? 'File: ' . Helpers::editorLink($e->sourceName, $e->sourceLine) - : '' . htmlspecialchars($e->sourceName . ($e->sourceLine ? ':' . $e->sourceLine : '')) . '') - . '
') - . BlueScreen::highlightFile($e->sourceCode, $e->sourceLine, php: false), - ]; - } - - return null; - } - - - public static function renderLatteUnknownMacro(?\Throwable $e): ?array - { - if ( - $e instanceof Latte\CompileException - && $e->sourceName - && @is_file($e->sourceName) // @ - may trigger error - && (preg_match('#Unknown macro (\{\w+)\}, did you mean (\{\w+)\}\?#A', $e->getMessage(), $m) - || preg_match('#Unknown attribute (n:\w+), did you mean (n:\w+)\?#A', $e->getMessage(), $m)) - ) { - return [ - 'link' => Helpers::editorUri($e->sourceName, $e->sourceLine, 'fix', $m[1], $m[2]), - 'label' => 'fix it', - ]; - } - - return null; - } - - - /** @return array{file: string, line: int, label: string, active: bool} */ - public static function mapLatteSourceCode(string $file, int $line): ?array - { - if (!strpos($file, '.latte--')) { - return null; - } - - $lines = file($file); - if ( - !preg_match('#^/(?:\*\*|/) source: (\S+\.latte)#m', implode('', array_slice($lines, 0, 10)), $m) - || !@is_file($m[1]) // @ - may trigger error - ) { - return null; - } - - $file = $m[1]; - $line = $line && preg_match('#/\* line (\d+) \*/#', $lines[$line - 1], $m) ? (int) $m[1] : 0; - return ['file' => $file, 'line' => $line, 'label' => 'Latte', 'active' => true]; - } - - public static function renderMemberAccessException(?\Throwable $e): ?array { if (!$e instanceof Nette\MemberAccessException && !$e instanceof \LogicException) { diff --git a/src/Bridges/Nette/TracyExtension.php b/src/Bridges/Nette/TracyExtension.php index 3f0c6ac2b..e1ba09527 100644 --- a/src/Bridges/Nette/TracyExtension.php +++ b/src/Bridges/Nette/TracyExtension.php @@ -13,6 +13,7 @@ use Nette\DI\Definitions\Statement; use Nette\Schema\Expect; use Tracy; +use function is_array, is_string; /** @@ -130,7 +131,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class): void if ($this->debugMode) { foreach ($this->config->bar as $item) { if (is_string($item) && substr($item, 0, 1) === '@') { - $item = new Statement(['@' . $builder::THIS_CONTAINER, 'getService'], [substr($item, 1)]); + $item = new Statement(['@' . $builder::ThisContainer, 'getService'], [substr($item, 1)]); } elseif (is_string($item)) { $item = new Statement($item); } diff --git a/src/Bridges/Psr/PsrToTracyLoggerAdapter.php b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php index 5d8b0430b..8bf66781a 100644 --- a/src/Bridges/Psr/PsrToTracyLoggerAdapter.php +++ b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php @@ -11,6 +11,7 @@ use Psr; use Tracy; +use function is_string; /** diff --git a/src/Tracy/Bar/Bar.php b/src/Tracy/Bar/Bar.php index 00d85b5c4..ddc3a47a8 100644 --- a/src/Tracy/Bar/Bar.php +++ b/src/Tracy/Bar/Bar.php @@ -9,6 +9,8 @@ namespace Tracy; +use function count; + /** * Debug Bar. diff --git a/src/Tracy/Bar/assets/bar.js b/src/Tracy/Bar/assets/bar.js index 403757350..56f237958 100644 --- a/src/Tracy/Bar/assets/bar.js +++ b/src/Tracy/Bar/assets/bar.js @@ -157,9 +157,9 @@ class Panel { let meta = this.elem.parentElement.lastElementChild; doc.body.innerHTML = 'We're sorry! The server encountered an internal error and - was unable to complete your request. Please try again later.
+We're sorry! The server encountered an internal error and + was unable to complete your request. Please try again later.
-error 500 |
Tracy is unable to log error.
error 500 |
Tracy is unable to log error.
Exception #123
+ +File: %a%Debugger.exception.in-generator.html.phpt:%d%
++%d%: +%d%: +%d%: Debugger::$productionMode = false; +%d%: setHtmlMode(); +%d%: +%d%: Debugger::enable(); +%d%: +%d%: +%d%: $generator = (function (): iterable { +%d%: yield 5; +%d%: throw new Exception('The my exception', 123); +%d%: })(); +%d%: $fn = function ($generator) { +%d%: foreach ($generator as $value) { +%d%: } +
+ +%d%: setHtmlMode(); +%d%: +%d%: Debugger::enable(); +%d%: +%d%: +%d%: $generator = (function (): iterable { +%d%: yield 5; +%d%: throw new Exception('The my exception', 123); +%d%: })(); +%d%: $fn = function ($generator) { +%d%: foreach ($generator as $value) { +%d%: } +%d%: }; +%d%: +%d%: $fn($generator); +
+ +%d%: +%d%: $generator = (function (): iterable { +%d%: yield 5; +%d%: throw new Exception('The my exception', 123); +%d%: })(); +%d%: $fn = function ($generator) { +%d%: foreach ($generator as $value) { +%d%: } +%d%: }; +%d%: +%d%: $fn($generator); +
| #0 | + |
|---|