From 060461b90c7c06e3f6a6481a92d5124fb1f949bd Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Thu, 13 Oct 2022 01:13:20 +0200
Subject: [PATCH 01/30] removed PHP 7 stuff

---
 src/Tracy/BlueScreen/BlueScreen.php   |  2 +-
 src/Tracy/Debugger/Debugger.php       |  4 ----
 src/Tracy/Dumper/Describer.php        | 29 +++++----------------------
 src/Tracy/Dumper/Exposer.php          |  3 +--
 tests/Tracy/Dumper.toHtml().phpt      | 19 ++++++++----------
 tests/Tracy/Dumper.toText().phpt      | 17 +++++++---------
 tests/Tracy/fixtures/DumpClass.74.php | 21 -------------------
 tests/Tracy/fixtures/DumpClass.php    | 18 +++++++++++++++++
 8 files changed, 40 insertions(+), 73 deletions(-)
 delete mode 100644 tests/Tracy/fixtures/DumpClass.74.php

diff --git a/src/Tracy/BlueScreen/BlueScreen.php b/src/Tracy/BlueScreen/BlueScreen.php
index f2ff25a4c..fd889d042 100644
--- a/src/Tracy/BlueScreen/BlueScreen.php
+++ b/src/Tracy/BlueScreen/BlueScreen.php
@@ -66,7 +66,7 @@ public function __construct()
 			? [$m[1] . '/tracy', $m[1] . '/nette', $m[1] . '/latte']
 			: [dirname(__DIR__)];
 		$this->fileGenerators[] = [self::class, 'generateNewPhpFileContents'];
-		$this->fibers = PHP_VERSION_ID < 80000 ? new \SplObjectStorage : new \WeakMap;
+		$this->fibers = new \WeakMap;
 	}
 
 
diff --git a/src/Tracy/Debugger/Debugger.php b/src/Tracy/Debugger/Debugger.php
index 7088fb5be..136f7aa7d 100644
--- a/src/Tracy/Debugger/Debugger.php
+++ b/src/Tracy/Debugger/Debugger.php
@@ -361,10 +361,6 @@ public static function errorHandler(
 			self::errorHandler($error['type'], $error['message'], $error['file'], $error['line']);
 		}
 
-		if ($context) {
-			$context = (array) (object) $context; // workaround for PHP bug #80234
-		}
-
 		if ($severity === E_RECOVERABLE_ERROR || $severity === E_USER_ERROR) {
 			if (Helpers::findTrace(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), '*::__toString')) { // workaround for PHP < 7.4
 				$previous = isset($context['e']) && $context['e'] instanceof \Throwable
diff --git a/src/Tracy/Dumper/Describer.php b/src/Tracy/Dumper/Describer.php
index d974bfec2..a1545a8fd 100644
--- a/src/Tracy/Dumper/Describer.php
+++ b/src/Tracy/Dumper/Describer.php
@@ -321,35 +321,16 @@ private static function hideValue($val): string
 
 	public function getReferenceId($arr, $key): ?int
 	{
-		if (PHP_VERSION_ID >= 70400) {
-			if ((!$rr = \ReflectionReference::fromArrayElement($arr, $key))) {
-				return null;
-			}
-
-			$tmp = &$this->references[$rr->getId()];
-			if ($tmp === null) {
-				return $tmp = count($this->references);
-			}
-
-			return $tmp;
-		}
-
-		$uniq = new \stdClass;
-		$copy = $arr;
-		$orig = $copy[$key];
-		$copy[$key] = $uniq;
-		if ($arr[$key] !== $uniq) {
+		if ((!$rr = \ReflectionReference::fromArrayElement($arr, $key))) {
 			return null;
 		}
 
-		$res = array_search($uniq, $this->references, true);
-		$copy[$key] = $orig;
-		if ($res === false) {
-			$this->references[] = &$arr[$key];
-			return count($this->references);
+		$tmp = &$this->references[$rr->getId()];
+		if ($tmp === null) {
+			return $tmp = count($this->references);
 		}
 
-		return $res + 1;
+		return $tmp;
 	}
 
 
diff --git a/src/Tracy/Dumper/Exposer.php b/src/Tracy/Dumper/Exposer.php
index 3b51ae32e..4ae0558e1 100644
--- a/src/Tracy/Dumper/Exposer.php
+++ b/src/Tracy/Dumper/Exposer.php
@@ -19,8 +19,7 @@ final class Exposer
 {
 	public static function exposeObject(object $obj, Value $value, Describer $describer): void
 	{
-		$tmp = (array) $obj;
-		$values = $tmp; // bug #79477, PHP < 7.4.6
+		$values = (array) $obj;
 		$props = self::getProperties(get_class($obj));
 
 		foreach (array_diff_key($values, $props) as $k => $v) {
diff --git a/tests/Tracy/Dumper.toHtml().phpt b/tests/Tracy/Dumper.toHtml().phpt
index 28b377cf8..284e19cf6 100644
--- a/tests/Tracy/Dumper.toHtml().phpt
+++ b/tests/Tracy/Dumper.toHtml().phpt
@@ -140,10 +140,8 @@ XX
 	, Dumper::toHtml($obj));
 
 
-if (PHP_VERSION_ID >= 70400) {
-	require __DIR__ . '/fixtures/DumpClass.74.php';
-
-	Assert::match(<<<'XX'
+// PHP 7.4 features
+Assert::match(<<<'XX'
 <pre class="tracy-dump tracy-light"
 ><span class="tracy-toggle"><span class="tracy-dump-object">Test74</span> <span class="tracy-dump-hash">#%d%</span></span>
 <div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-dump-number">1</span>
@@ -151,15 +149,15 @@ if (PHP_VERSION_ID >= 70400) {
 <span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-virtual">unset</span>
 </div></pre>
 XX
-		, Dumper::toHtml(new Test74));
+, Dumper::toHtml(new Test74));
 
 
-	$obj = new Child74;
-	$obj->new = 7;
-	unset($obj->unset1, $obj->unset2);
+$obj = new Child74;
+$obj->new = 7;
+unset($obj->unset1, $obj->unset2);
 
 
-	Assert::match(<<<'XX'
+Assert::match(<<<'XX'
 <pre class="tracy-dump tracy-light"
 ><span class="tracy-toggle"><span class="tracy-dump-object">Child74</span> <span class="tracy-dump-hash">#%d%</span></span>
 <div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">new</span>: <span class="tracy-dump-number">7</span>
@@ -171,5 +169,4 @@ XX
 <span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test74">y</span>: <span class="tracy-dump-virtual">unset</span>
 </div></pre>
 XX
-		, Dumper::toHtml($obj));
-}
+, Dumper::toHtml($obj));
diff --git a/tests/Tracy/Dumper.toText().phpt b/tests/Tracy/Dumper.toText().phpt
index c003f56f0..2502acc39 100644
--- a/tests/Tracy/Dumper.toText().phpt
+++ b/tests/Tracy/Dumper.toText().phpt
@@ -134,24 +134,22 @@ XX
 	, Dumper::toText($obj));
 
 
-if (PHP_VERSION_ID >= 70400) {
-	require __DIR__ . '/fixtures/DumpClass.74.php';
-
-	Assert::match(<<<'XX'
+// PHP 7.4 features
+Assert::match(<<<'XX'
 Test74 #%d%
    x: 1
    y: unset
    z: unset
 XX
-		, Dumper::toText(new Test74));
+, Dumper::toText(new Test74));
 
 
-	$obj = new Child74;
-	$obj->new = 7;
-	unset($obj->unset1, $obj->unset2);
+$obj = new Child74;
+$obj->new = 7;
+unset($obj->unset1, $obj->unset2);
 
 
-	Assert::match(<<<'XX'
+Assert::match(<<<'XX'
 Child74 #%d%
    new: 7
    x: 2
@@ -162,4 +160,3 @@ Child74 #%d%
    y: unset
 XX
 		, Dumper::toText($obj));
-}
diff --git a/tests/Tracy/fixtures/DumpClass.74.php b/tests/Tracy/fixtures/DumpClass.74.php
deleted file mode 100644
index 5c7c1e995..000000000
--- a/tests/Tracy/fixtures/DumpClass.74.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-#[\AllowDynamicProperties]
-class Test74
-{
-	public int $x = 1;
-	private int $y;
-	protected int $z;
-}
-
-class Child74 extends Test74
-{
-	public int $x = 2;
-	private int $y;
-	protected int $z;
-
-	public $unset1;
-	public int $unset2 = 1;
-}
diff --git a/tests/Tracy/fixtures/DumpClass.php b/tests/Tracy/fixtures/DumpClass.php
index a2c63d3a8..9498945a6 100644
--- a/tests/Tracy/fixtures/DumpClass.php
+++ b/tests/Tracy/fixtures/DumpClass.php
@@ -28,3 +28,21 @@ class Child extends Test
 class GrandChild extends Child
 {
 }
+
+#[\AllowDynamicProperties]
+class Test74
+{
+	public int $x = 1;
+	private int $y;
+	protected int $z;
+}
+
+class Child74 extends Test74
+{
+	public int $x = 2;
+	private int $y;
+	protected int $z;
+
+	public $unset1;
+	public int $unset2 = 1;
+}

From b77a2f6fee30c135cb51d168544bc8b3c94f52f2 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Fri, 10 Dec 2021 05:40:54 +0100
Subject: [PATCH 02/30] removed support for Nette __toString workaround

---
 src/Tracy/Debugger/Debugger.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Tracy/Debugger/Debugger.php b/src/Tracy/Debugger/Debugger.php
index 136f7aa7d..d6fa3d8af 100644
--- a/src/Tracy/Debugger/Debugger.php
+++ b/src/Tracy/Debugger/Debugger.php
@@ -362,16 +362,6 @@ public static function errorHandler(
 		}
 
 		if ($severity === E_RECOVERABLE_ERROR || $severity === E_USER_ERROR) {
-			if (Helpers::findTrace(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), '*::__toString')) { // workaround for PHP < 7.4
-				$previous = isset($context['e']) && $context['e'] instanceof \Throwable
-					? $context['e']
-					: null;
-				$e = new ErrorException($message, 0, $severity, $file, $line, $previous);
-				@$e->context = $context; // dynamic properties are deprecated since PHP 8.2
-				self::exceptionHandler($e);
-				exit(255);
-			}
-
 			$e = new ErrorException($message, 0, $severity, $file, $line);
 			@$e->context = $context; // dynamic properties are deprecated since PHP 8.2
 			throw $e;

From 2b136ada18026eaae541d248dd1c852f148c4bf1 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Fri, 22 Apr 2022 17:11:23 +0200
Subject: [PATCH 03/30] removed support for $context in error handler

---
 .../assets/section-exception-variables.phtml  | 28 -------------------
 .../BlueScreen/assets/section-exception.phtml |  2 --
 src/Tracy/Debugger/Debugger.php               |  7 ++---
 src/Tracy/Debugger/DevelopmentStrategy.php    |  6 ++--
 src/Tracy/Debugger/ProductionStrategy.php     |  4 +--
 src/Tracy/Helpers.php                         | 15 ++--------
 tests/Tracy/Helpers.improveError.phpt         |  8 ------
 tests/Tracy/Helpers.improveException.phpt     | 12 --------
 .../expected/Debugger.E_ERROR.html.expect     |  1 -
 .../expected/Debugger.error-in-eval.expect    |  2 +-
 .../expected/Debugger.exception.html.expect   |  1 -
 .../expected/Debugger.strict.html.expect      |  2 +-
 12 files changed, 9 insertions(+), 79 deletions(-)
 delete mode 100644 src/Tracy/BlueScreen/assets/section-exception-variables.phtml

diff --git a/src/Tracy/BlueScreen/assets/section-exception-variables.phtml b/src/Tracy/BlueScreen/assets/section-exception-variables.phtml
deleted file mode 100644
index ef821c26d..000000000
--- a/src/Tracy/BlueScreen/assets/section-exception-variables.phtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tracy;
-
-/**
- * @var \Throwable $ex
- * @var callable $dump
- */
-
-if (!$ex instanceof \ErrorException || empty($ex->context) || !is_array($ex->context)) {
-	return;
-}
-?>
-<section class="tracy-section">
-	<h2 class="tracy-section-label"><a href="#" data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">Variables</a></h2>
-
-	<div class="tracy-section-panel tracy-collapsed">
-		<div class="tracy-pane">
-			<table class="tracy-sortable">
-<?php foreach ($ex->context as $k => $v): ?>
-				<tr><th><?= Helpers::escapeHtml($k) ?></th><td><?= $dump($v, $k) ?></td></tr>
-<?php endforeach ?>
-			</table>
-		</div>
-	</div>
-</section>
diff --git a/src/Tracy/BlueScreen/assets/section-exception.phtml b/src/Tracy/BlueScreen/assets/section-exception.phtml
index 74517d814..fba06273b 100644
--- a/src/Tracy/BlueScreen/assets/section-exception.phtml
+++ b/src/Tracy/BlueScreen/assets/section-exception.phtml
@@ -67,8 +67,6 @@ namespace Tracy;
 <?php require __DIR__ . '/section-stack-exception.phtml' ?>
 <?php endif ?>
 
-<?php require __DIR__ . '/section-exception-variables.phtml' ?>
-
 <?php require __DIR__ . '/section-exception-exception.phtml' ?>
 
 <?php require __DIR__ . '/section-exception-causedBy.phtml' ?>
diff --git a/src/Tracy/Debugger/Debugger.php b/src/Tracy/Debugger/Debugger.php
index d6fa3d8af..217735acf 100644
--- a/src/Tracy/Debugger/Debugger.php
+++ b/src/Tracy/Debugger/Debugger.php
@@ -352,7 +352,6 @@ public static function errorHandler(
 		string $message,
 		string $file,
 		int $line,
-		?array $context = null
 	): bool
 	{
 		$error = error_get_last();
@@ -362,15 +361,13 @@ public static function errorHandler(
 		}
 
 		if ($severity === E_RECOVERABLE_ERROR || $severity === E_USER_ERROR) {
-			$e = new ErrorException($message, 0, $severity, $file, $line);
-			@$e->context = $context; // dynamic properties are deprecated since PHP 8.2
-			throw $e;
+			throw new ErrorException($message, 0, $severity, $file, $line);
 
 		} elseif (
 			($severity & error_reporting())
 			|| (is_int(self::$scream) ? $severity & self::$scream : self::$scream)
 		) {
-			self::getStrategy()->handleError($severity, $message, $file, $line, $context);
+			self::getStrategy()->handleError($severity, $message, $file, $line);
 		}
 
 		return false; // calls normal error handler to fill-in error_get_last()
diff --git a/src/Tracy/Debugger/DevelopmentStrategy.php b/src/Tracy/Debugger/DevelopmentStrategy.php
index 27e778639..370a9652d 100644
--- a/src/Tracy/Debugger/DevelopmentStrategy.php
+++ b/src/Tracy/Debugger/DevelopmentStrategy.php
@@ -84,7 +84,6 @@ public function handleError(
 		string $message,
 		string $file,
 		int $line,
-		array $context = null
 	): void
 	{
 		if (function_exists('ini_set')) {
@@ -96,13 +95,12 @@ public function handleError(
 			&& !isset($_GET['_tracy_skip_error'])
 		) {
 			$e = new ErrorException($message, 0, $severity, $file, $line);
-			@$e->context = $context; // dynamic properties are deprecated since PHP 8.2
-			@$e->skippable = true;
+			@$e->skippable = true; // dynamic properties are deprecated since PHP 8.2
 			Debugger::exceptionHandler($e);
 			exit(255);
 		}
 
-		$message = 'PHP ' . Helpers::errorTypeToString($severity) . ': ' . Helpers::improveError($message, (array) $context);
+		$message = 'PHP ' . Helpers::errorTypeToString($severity) . ': ' . Helpers::improveError($message);
 		$count = &$this->bar->getPanel('Tracy:errors')->data["$file|$line|$message"];
 
 		if (!$count++) { // not repeated error
diff --git a/src/Tracy/Debugger/ProductionStrategy.php b/src/Tracy/Debugger/ProductionStrategy.php
index 289c1972c..16f99e3a4 100644
--- a/src/Tracy/Debugger/ProductionStrategy.php
+++ b/src/Tracy/Debugger/ProductionStrategy.php
@@ -60,15 +60,13 @@ public function handleError(
 		string $message,
 		string $file,
 		int $line,
-		array $context = null
 	): void
 	{
 		if ($severity & Debugger::$logSeverity) {
 			$err = new ErrorException($message, 0, $severity, $file, $line);
-			@$err->context = $context; // dynamic properties are deprecated since PHP 8.2
 			Helpers::improveException($err);
 		} else {
-			$err = 'PHP ' . Helpers::errorTypeToString($severity) . ': ' . Helpers::improveError($message, (array) $context) . " in $file:$line";
+			$err = 'PHP ' . Helpers::errorTypeToString($severity) . ': ' . Helpers::improveError($message) . " in $file:$line";
 		}
 
 		try {
diff --git a/src/Tracy/Helpers.php b/src/Tracy/Helpers.php
index 46fa9d6d2..4ea49e7e1 100644
--- a/src/Tracy/Helpers.php
+++ b/src/Tracy/Helpers.php
@@ -210,11 +210,6 @@ 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)) {
-			$hint = self::getSuggestion(array_keys($e->context), $m[1]);
-			$message = "Undefined variable $$m[1], did you mean $$hint?";
-			$replace = ["$$m[1]", "$$hint"];
-
 		} elseif (preg_match('#^Undefined property: ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
 			$rc = new \ReflectionClass($m[1]);
 			$items = array_filter($rc->getProperties(\ReflectionProperty::IS_PUBLIC), function ($prop) { return !$prop->isStatic(); });
@@ -244,15 +239,9 @@ public static function improveException(\Throwable $e): void
 
 
 	/** @internal */
-	public static function improveError(string $message, array $context = []): string
+	public static function improveError(string $message): string
 	{
-		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;
-
-		} elseif (preg_match('#^Undefined property: ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
+		if (preg_match('#^Undefined property: ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
 			$rc = new \ReflectionClass($m[1]);
 			$items = array_filter($rc->getProperties(\ReflectionProperty::IS_PUBLIC), function ($prop) { return !$prop->isStatic(); });
 			$hint = self::getSuggestion($items, $m[2]);
diff --git a/tests/Tracy/Helpers.improveError.phpt b/tests/Tracy/Helpers.improveError.phpt
index 819be7998..064689e92 100644
--- a/tests/Tracy/Helpers.improveError.phpt
+++ b/tests/Tracy/Helpers.improveError.phpt
@@ -70,11 +70,3 @@ test('do not suggest anything when accessing anonymous class', function () {
 	$message = Helpers::improveError(error_get_last()['message']);
 	Assert::same('Undefined property: class@anonymous::$property', $message);
 });
-
-
-test('variables', function () use ($obj) {
-	$abcd = 1;
-	@$val = $abc;
-	$message = Helpers::improveError(error_get_last()['message'], get_defined_vars());
-	Assert::same('Undefined variable $abc, did you mean $abcd?', $message);
-});
diff --git a/tests/Tracy/Helpers.improveException.phpt b/tests/Tracy/Helpers.improveException.phpt
index 11b00ffa6..8ee2ba7e8 100644
--- a/tests/Tracy/Helpers.improveException.phpt
+++ b/tests/Tracy/Helpers.improveException.phpt
@@ -218,15 +218,3 @@ test('do not suggest anything when accessing anonymous class', function () {
 	Assert::same('Undefined property: class@anonymous::$property', $e->getMessage());
 	Assert::false(isset($e->tracyAction));
 });
-
-
-test('variables', function () use ($obj) {
-	$abcd = 1;
-	@$val = $abc;
-	$e = new ErrorException(error_get_last()['message'], 0, error_get_last()['type']);
-	@$e->context = get_defined_vars(); // deprecated since PHP 8.2
-	Helpers::improveException($e);
-	Assert::same('Undefined variable $abc, did you mean $abcd?', $e->getMessage());
-	Assert::match('editor://fix/?file=%a%Helpers.improveException.phpt&line=%d%&search=%24abc&replace=%24abcd', $e->tracyAction['link']);
-	Assert::same('fix it', $e->tracyAction['label']);
-});
diff --git a/tests/Tracy/expected/Debugger.E_ERROR.html.expect b/tests/Tracy/expected/Debugger.E_ERROR.html.expect
index 527830a48..0d7ca158f 100644
--- a/tests/Tracy/expected/Debugger.E_ERROR.html.expect
+++ b/tests/Tracy/expected/Debugger.E_ERROR.html.expect
@@ -161,7 +161,6 @@
 
 
 
-
 <section class="tracy-section">
 	<h2 class="tracy-section-label"><a href="#" data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">Environment</a></h2>
 
diff --git a/tests/Tracy/expected/Debugger.error-in-eval.expect b/tests/Tracy/expected/Debugger.error-in-eval.expect
index 7313f73f6..8ab62f0d6 100644
--- a/tests/Tracy/expected/Debugger.error-in-eval.expect
+++ b/tests/Tracy/expected/Debugger.error-in-eval.expect
@@ -96,7 +96,7 @@
 	</div>
 	</div>
 </section>
-%A%
+
 <section class="tracy-section">
 	<h2 class="tracy-section-label"><a href="#" data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">Exception</a></h2>
 	<div class="tracy-section-panel tracy-collapsed">
diff --git a/tests/Tracy/expected/Debugger.exception.html.expect b/tests/Tracy/expected/Debugger.exception.html.expect
index 362c57b07..de5d158ae 100644
--- a/tests/Tracy/expected/Debugger.exception.html.expect
+++ b/tests/Tracy/expected/Debugger.exception.html.expect
@@ -102,7 +102,6 @@
 
 
 
-
 <section class="tracy-section">
 	<h2 class="tracy-section-label"><a href="#" data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">Last muted error</a></h2>
 	<div class="tracy-section-panel tracy-collapsed">
diff --git a/tests/Tracy/expected/Debugger.strict.html.expect b/tests/Tracy/expected/Debugger.strict.html.expect
index a12e10209..ec235bac5 100644
--- a/tests/Tracy/expected/Debugger.strict.html.expect
+++ b/tests/Tracy/expected/Debugger.strict.html.expect
@@ -99,7 +99,7 @@
 	</div>
 	</div>
 </section>
-%A%
+
 <section class="tracy-section">
 	<h2 class="tracy-section-label"><a href="#" data-tracy-ref="^+" class="tracy-toggle tracy-collapsed">Exception</a></h2>
 	<div class="tracy-section-panel tracy-collapsed">

From ebe8fd4f77a28c15b2cef754873b628cec150b64 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Wed, 15 Dec 2021 05:05:33 +0100
Subject: [PATCH 04/30] removed FireLogger (BC break)

---
 examples/firelogger.php                       |  45 -----
 readme.md                                     |  29 ---
 src/Tracy/Debugger/Debugger.php               |  31 +--
 src/Tracy/Debugger/DevelopmentStrategy.php    |   8 +-
 src/Tracy/Logger/FireLogger.php               | 187 ------------------
 src/tracy.php                                 |   1 -
 tests/Tracy/Debugger.fireLog().basic.phpt     |  35 ----
 tests/Tracy/Debugger.fireLog().exception.phpt |  52 -----
 .../Tracy/Debugger.fireLog().production.phpt  |  25 ---
 9 files changed, 3 insertions(+), 410 deletions(-)
 delete mode 100644 examples/firelogger.php
 delete mode 100644 src/Tracy/Logger/FireLogger.php
 delete mode 100644 tests/Tracy/Debugger.fireLog().basic.phpt
 delete mode 100644 tests/Tracy/Debugger.fireLog().exception.phpt
 delete mode 100644 tests/Tracy/Debugger.fireLog().production.phpt

diff --git a/examples/firelogger.php b/examples/firelogger.php
deleted file mode 100644
index a6d885f98..000000000
--- a/examples/firelogger.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-require __DIR__ . '/../src/tracy.php';
-
-use Tracy\Debugger;
-
-$arr = [10, 20, ['key1' => 'val1', 'key2' => true]];
-
-// will show in FireLogger
-Debugger::fireLog('Hello World');
-Debugger::fireLog($arr);
-
-
-function first($arg1, $arg2)
-{
-	second(true, false);
-}
-
-
-function second($arg1, $arg2)
-{
-	third([1, 2, 3]);
-}
-
-
-function third($arg1)
-{
-	throw new Exception('The my exception', 123);
-}
-
-
-try {
-	first(10, 'any string');
-} catch (Throwable $e) {
-	Debugger::fireLog($e);
-}
-
-?>
-<!DOCTYPE html><link rel="stylesheet" href="assets/style.css">
-
-<h1>Tracy: FireLogger demo</h1>
-
-<p>How to <a href="https://tracy.nette.org/#toc-firelogger">enable FireLogger</a>?</p>
diff --git a/readme.md b/readme.md
index b883db257..84dfb1825 100644
--- a/readme.md
+++ b/readme.md
@@ -343,35 +343,6 @@ echo Debugger::timer(); // elapsed time in seconds
 ```
 
 
-FireLogger
-----------
-
-You cannot always send debugging information to the browser window. This applies to AJAX requests or generating XML files to output. In such cases, you can send the messages by a separate channel into FireLogger. Error, Notice and Warning levels are sent to FireLogger window automatically. It is also possible to log suppressed exceptions in running application when attention to them is important.
-
-How to do it?
-
-- install extension [FireLogger for Chrome](https://chrome.google.com/webstore/detail/firelogger-for-chrome/hmagilfopmdjkeomnjpchokglfdfjfeh)
-- turn on Chrome DevTools (using Ctrl-Shift-I key) and open Console
-
-Navigate to the [demo page](https://examples.nette.org/tracy/) and you will see messages sent from PHP.
-
-Because Tracy\Debugger communicates with FireLogger via HTTP headers, you must call the logging function before the PHP script sends anything to output. It is also possible to enable output buffering and delay the output.
-
-```php
-use Tracy\Debugger;
-
-Debugger::fireLog('Hello World'); // send string into FireLogger console
-
-Debugger::fireLog($_SERVER); // or even arrays and objects
-
-Debugger::fireLog(new Exception('Test Exception')); // or exceptions
-```
-
-The result looks like this:
-
-![FireLogger](https://nette.github.io/tracy/images/tracy-firelogger.png)
-
-
 Custom Logger
 -------------
 
diff --git a/src/Tracy/Debugger/Debugger.php b/src/Tracy/Debugger/Debugger.php
index 217735acf..18817f857 100644
--- a/src/Tracy/Debugger/Debugger.php
+++ b/src/Tracy/Debugger/Debugger.php
@@ -39,9 +39,6 @@ class Debugger
 	/** @var bool whether to display debug bar in development mode */
 	public static $showBar = true;
 
-	/** @var bool whether to send data to FireLogger in development mode */
-	public static $showFireLogger = true;
-
 	/** @var int size of reserved memory */
 	public static $reservedMemorySize = 500000;
 
@@ -102,7 +99,7 @@ class Debugger
 	/** @var string|array email(s) to which send error notifications */
 	public static $email;
 
-	/** for Debugger::log() and Debugger::fireLog() */
+	/** for Debugger::log() */
 	public const
 		DEBUG = ILogger::DEBUG,
 		INFO = ILogger::INFO,
@@ -151,9 +148,6 @@ class Debugger
 	/** @var ILogger */
 	private static $logger;
 
-	/** @var ILogger */
-	private static $fireLogger;
-
 	/** @var array{DevelopmentStrategy, ProductionStrategy} */
 	private static $strategy;
 
@@ -242,7 +236,6 @@ public static function enable($mode = null, ?string $logDirectory = null, $email
 			'Dumper/Exposer',
 			'Dumper/Renderer',
 			'Dumper/Value',
-			'Logger/FireLogger',
 			'Logger/Logger',
 			'Session/SessionStorage',
 			'Session/FileSession',
@@ -442,16 +435,6 @@ public static function getLogger(): ILogger
 	}
 
 
-	public static function getFireLogger(): ILogger
-	{
-		if (!self::$fireLogger) {
-			self::$fireLogger = new FireLogger;
-		}
-
-		return self::$fireLogger;
-	}
-
-
 	/** @return ProductionStrategy|DevelopmentStrategy @internal */
 	public static function getStrategy()
 	{
@@ -584,18 +567,6 @@ public static function log($message, string $level = ILogger::INFO)
 	}
 
 
-	/**
-	 * Sends message to FireLogger console.
-	 * @param  mixed  $message
-	 */
-	public static function fireLog($message): bool
-	{
-		return !self::$productionMode && self::$showFireLogger
-			? self::getFireLogger()->log($message)
-			: false;
-	}
-
-
 	/** @internal */
 	public static function addSourceMapper(callable $mapper): void
 	{
diff --git a/src/Tracy/Debugger/DevelopmentStrategy.php b/src/Tracy/Debugger/DevelopmentStrategy.php
index 370a9652d..d6a20beeb 100644
--- a/src/Tracy/Debugger/DevelopmentStrategy.php
+++ b/src/Tracy/Debugger/DevelopmentStrategy.php
@@ -49,7 +49,6 @@ public function handleException(\Throwable $exception, bool $firstTime): void
 			$this->blueScreen->render($exception);
 
 		} else {
-			Debugger::fireLog($exception);
 			$this->renderExceptionCli($exception);
 		}
 	}
@@ -103,11 +102,8 @@ public function handleError(
 		$message = 'PHP ' . Helpers::errorTypeToString($severity) . ': ' . Helpers::improveError($message);
 		$count = &$this->bar->getPanel('Tracy:errors')->data["$file|$line|$message"];
 
-		if (!$count++) { // not repeated error
-			Debugger::fireLog(new ErrorException($message, 0, $severity, $file, $line));
-			if (!Helpers::isHtmlMode() && !Helpers::isAjax()) {
-				echo "\n$message in $file on line $line\n";
-			}
+		if (!$count++ && !Helpers::isHtmlMode() && !Helpers::isAjax()) {
+			echo "\n$message in $file on line $line\n";
 		}
 
 		if (function_exists('ini_set')) {
diff --git a/src/Tracy/Logger/FireLogger.php b/src/Tracy/Logger/FireLogger.php
deleted file mode 100644
index afad35aeb..000000000
--- a/src/Tracy/Logger/FireLogger.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-/**
- * This file is part of the Tracy (https://tracy.nette.org)
- * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Tracy;
-
-
-/**
- * FireLogger console logger.
- *
- * @see http://firelogger.binaryage.com
- * @see https://chrome.google.com/webstore/detail/firelogger-for-chrome/hmagilfopmdjkeomnjpchokglfdfjfeh
- */
-class FireLogger implements ILogger
-{
-	/** @var int  */
-	public $maxDepth = 3;
-
-	/** @var int  */
-	public $maxLength = 150;
-
-	/** @var array  */
-	private $payload = ['logs' => []];
-
-
-	/**
-	 * Sends message to FireLogger console.
-	 * @param  mixed  $message
-	 */
-	public function log($message, $level = self::DEBUG): bool
-	{
-		if (!isset($_SERVER['HTTP_X_FIRELOGGER']) || headers_sent()) {
-			return false;
-		}
-
-		$item = [
-			'name' => 'PHP',
-			'level' => $level,
-			'order' => count($this->payload['logs']),
-			'time' => str_pad(number_format((microtime(true) - Debugger::$time) * 1000, 1, '.', ' '), 8, '0', STR_PAD_LEFT) . ' ms',
-			'template' => '',
-			'message' => '',
-			'style' => 'background:#767ab6',
-		];
-
-		$args = func_get_args();
-		if (isset($args[0]) && is_string($args[0])) {
-			$item['template'] = array_shift($args);
-		}
-
-		if (isset($args[0]) && $args[0] instanceof \Throwable) {
-			$e = array_shift($args);
-			$trace = $e->getTrace();
-			if (
-				isset($trace[0]['class'])
-				&& $trace[0]['class'] === Debugger::class
-				&& ($trace[0]['function'] === 'shutdownHandler' || $trace[0]['function'] === 'errorHandler')
-			) {
-				unset($trace[0]);
-			}
-
-			$file = str_replace(dirname($e->getFile(), 3), "\xE2\x80\xA6", $e->getFile());
-			$item['template'] = ($e instanceof \ErrorException ? '' : Helpers::getClass($e) . ': ')
-				. $e->getMessage() . ($e->getCode() ? ' #' . $e->getCode() : '') . ' in ' . $file . ':' . $e->getLine();
-			$item['pathname'] = $e->getFile();
-			$item['lineno'] = $e->getLine();
-
-		} else {
-			$trace = debug_backtrace();
-			if (
-				isset($trace[1]['class'])
-				&& $trace[1]['class'] === Debugger::class
-				&& ($trace[1]['function'] === 'fireLog')
-			) {
-				unset($trace[0]);
-			}
-
-			foreach ($trace as $frame) {
-				if (isset($frame['file']) && is_file($frame['file'])) {
-					$item['pathname'] = $frame['file'];
-					$item['lineno'] = $frame['line'];
-					break;
-				}
-			}
-		}
-
-		$item['exc_info'] = ['', '', []];
-		$item['exc_frames'] = [];
-
-		foreach ($trace as $frame) {
-			$frame += ['file' => null, 'line' => null, 'class' => null, 'type' => null, 'function' => null, 'object' => null, 'args' => null];
-			$item['exc_info'][2][] = [$frame['file'], $frame['line'], "$frame[class]$frame[type]$frame[function]", $frame['object']];
-			$item['exc_frames'][] = $frame['args'];
-		}
-
-		if (
-			isset($args[0])
-			&& in_array($args[0], [self::DEBUG, self::INFO, self::WARNING, self::ERROR, self::CRITICAL], true)
-		) {
-			$item['level'] = array_shift($args);
-		}
-
-		$item['args'] = $args;
-
-		$this->payload['logs'][] = $this->jsonDump($item, -1);
-		foreach (str_split(base64_encode(json_encode($this->payload, JSON_INVALID_UTF8_SUBSTITUTE)), 4990) as $k => $v) {
-			header("FireLogger-de11e-$k: $v");
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Dump implementation for JSON.
-	 * @param  mixed  $var
-	 * @return array|int|float|bool|string|null
-	 */
-	private function jsonDump(&$var, int $level = 0)
-	{
-		if (is_bool($var) || $var === null || is_int($var) || is_float($var)) {
-			return $var;
-
-		} elseif (is_string($var)) {
-			$var = Helpers::encodeString($var, $this->maxLength);
-			return htmlspecialchars_decode(strip_tags($var));
-
-		} elseif (is_array($var)) {
-			static $marker;
-			if ($marker === null) {
-				$marker = uniqid("\x00", true);
-			}
-
-			if (isset($var[$marker])) {
-				return "\xE2\x80\xA6RECURSION\xE2\x80\xA6";
-
-			} elseif ($level < $this->maxDepth || !$this->maxDepth) {
-				$var[$marker] = true;
-				$res = [];
-				foreach ($var as $k => &$v) {
-					if ($k !== $marker) {
-						$res[$this->jsonDump($k)] = $this->jsonDump($v, $level + 1);
-					}
-				}
-
-				unset($var[$marker]);
-				return $res;
-
-			} else {
-				return " \xE2\x80\xA6 ";
-			}
-		} elseif (is_object($var)) {
-			$arr = (array) $var;
-			static $list = [];
-			if (in_array($var, $list, true)) {
-				return "\xE2\x80\xA6RECURSION\xE2\x80\xA6";
-
-			} elseif ($level < $this->maxDepth || !$this->maxDepth) {
-				$list[] = $var;
-				$res = ["\x00" => '(object) ' . Helpers::getClass($var)];
-				foreach ($arr as $k => &$v) {
-					if (isset($k[0]) && $k[0] === "\x00") {
-						$k = substr($k, strrpos($k, "\x00") + 1);
-					}
-
-					$res[$this->jsonDump($k)] = $this->jsonDump($v, $level + 1);
-				}
-
-				array_pop($list);
-				return $res;
-
-			} else {
-				return " \xE2\x80\xA6 ";
-			}
-		} elseif (is_resource($var)) {
-			return 'resource ' . get_resource_type($var);
-
-		} else {
-			return 'unknown type';
-		}
-	}
-}
diff --git a/src/tracy.php b/src/tracy.php
index 73259adff..46b60189c 100644
--- a/src/tracy.php
+++ b/src/tracy.php
@@ -18,7 +18,6 @@
 require __DIR__ . '/Tracy/Dumper/Exposer.php';
 require __DIR__ . '/Tracy/Dumper/Renderer.php';
 require __DIR__ . '/Tracy/Logger/ILogger.php';
-require __DIR__ . '/Tracy/Logger/FireLogger.php';
 require __DIR__ . '/Tracy/Logger/Logger.php';
 require __DIR__ . '/Tracy/Debugger/Debugger.php';
 require __DIR__ . '/Tracy/Debugger/DeferredContent.php';
diff --git a/tests/Tracy/Debugger.fireLog().basic.phpt b/tests/Tracy/Debugger.fireLog().basic.phpt
deleted file mode 100644
index b802b6c65..000000000
--- a/tests/Tracy/Debugger.fireLog().basic.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Test: Tracy\Debugger::fireLog()
- */
-
-declare(strict_types=1);
-
-use Tester\Assert;
-use Tracy\Debugger;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (PHP_SAPI === 'cli') {
-	Tester\Environment::skip('FireLogger is not available in CLI mode');
-}
-
-
-// Setup environment
-$_SERVER['HTTP_X_FIRELOGGER'] = true;
-
-Debugger::$productionMode = false;
-
-
-$arr = [10, 20.2, true, false, null, 'hello', ['key1' => 'val1', 'key2' => true], (object) ['key1' => 'val1', 'key2' => true]];
-
-// will show in FireLogger
-Debugger::fireLog('Hello World'); // Tracy\Debugger::DEBUG
-Debugger::fireLog('Info message', Debugger::INFO);
-Debugger::fireLog('Warn message', Debugger::WARNING);
-Debugger::fireLog('Error message', Debugger::ERROR);
-Debugger::fireLog($arr);
-
-preg_match('#^FireLogger-de11e-0:(.+)#m', implode("\n", headers_list()), $matches);
-Assert::true(isset($matches[1]));
diff --git a/tests/Tracy/Debugger.fireLog().exception.phpt b/tests/Tracy/Debugger.fireLog().exception.phpt
deleted file mode 100644
index e9c1773e1..000000000
--- a/tests/Tracy/Debugger.fireLog().exception.phpt
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * Test: Tracy\Debugger::fireLog() and exception.
- */
-
-declare(strict_types=1);
-
-use Tester\Assert;
-use Tracy\Debugger;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (PHP_SAPI === 'cli') {
-	Tester\Environment::skip('FireLogger is not available in CLI mode');
-}
-
-
-// Setup environment
-$_SERVER['HTTP_X_FIRELOGGER'] = true;
-
-Debugger::$productionMode = false;
-
-
-function first($arg1, $arg2)
-{
-	second(true, false);
-}
-
-
-function second($arg1, $arg2)
-{
-	third([1, 2, 3]);
-}
-
-
-function third($arg1)
-{
-	throw new Exception('The my exception', 123);
-}
-
-
-try {
-	first(10, 'any string');
-
-} catch (Throwable $e) {
-	Debugger::fireLog($e);
-}
-
-preg_match('#^FireLogger-de11e-0:(.+)#m', implode("\n", headers_list()), $matches);
-Assert::true(isset($matches[1]));
-Assert::match('{"logs":[{"name":"PHP","level":"debug","order":0,"time":"%a% ms","template":"Exception: The my exception #123 in %a%\\%ds%Debugger.fireLog().exception.phpt:%d%","message":"","style":"background:#767ab6","pathname":"%a%\\%ds%Debugger.fireLog().exception.phpt","lineno":%d%,"exc_info":["","",[["%a%\\%ds%Debugger.fireLog().exception.phpt",%d%,"third",null],["%a%\\%ds%Debugger.fireLog().exception.phpt",%d%,"second",null],["%a%\\%ds%Debugger.fireLog().exception.phpt",%d%,"first",null]]],"exc_frames":[[[1,2,3]],[true,false],[10,"any string"]],"args":[]}]}', base64_decode($matches[1], true));
diff --git a/tests/Tracy/Debugger.fireLog().production.phpt b/tests/Tracy/Debugger.fireLog().production.phpt
deleted file mode 100644
index 9a8e455ff..000000000
--- a/tests/Tracy/Debugger.fireLog().production.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Test: Tracy\Debugger::fireLog() in production mode.
- */
-
-declare(strict_types=1);
-
-use Tester\Assert;
-use Tracy\Debugger;
-
-require __DIR__ . '/../bootstrap.php';
-
-
-// Setup environment
-$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 Gecko/2008070208 Firefox/3.0.1 FirePHP/0.1.0.3';
-
-Debugger::$productionMode = true;
-
-
-Debugger::fireLog('Sensitive log');
-
-flush();
-
-Assert::false(strpos(implode('', headers_list()), 'X-Wf-'));

From d83c812f27a202ddef6a33f289ba76693d1256a8 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Fri, 10 Dec 2021 06:34:13 +0100
Subject: [PATCH 05/30] updated tests

---
 tests/Tracy/Debugger.autoloading.phpt            | 2 +-
 tests/Tracy/fixtures/{E_STRICT.php => FATAL.php} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/Tracy/fixtures/{E_STRICT.php => FATAL.php} (100%)

diff --git a/tests/Tracy/Debugger.autoloading.phpt b/tests/Tracy/Debugger.autoloading.phpt
index cc1568118..c49d5a298 100644
--- a/tests/Tracy/Debugger.autoloading.phpt
+++ b/tests/Tracy/Debugger.autoloading.phpt
@@ -18,4 +18,4 @@ Debugger::enable();
 
 
 // in this case autoloading is not triggered
-include __DIR__ . '/fixtures/E_STRICT.php';
+include __DIR__ . '/fixtures/FATAL.php';
diff --git a/tests/Tracy/fixtures/E_STRICT.php b/tests/Tracy/fixtures/FATAL.php
similarity index 100%
rename from tests/Tracy/fixtures/E_STRICT.php
rename to tests/Tracy/fixtures/FATAL.php

From d149ed2e92f4e86a57dbdb9c2d581d6f65e5b0de Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Wed, 8 Mar 2023 02:01:23 +0100
Subject: [PATCH 06/30] coding style

---
 src/Bridges/Nette/Bridge.php                  |   6 +-
 src/Bridges/Nette/TracyExtension.php          |   6 +-
 src/Bridges/Psr/PsrToTracyLoggerAdapter.php   |   2 +-
 src/Tracy/Bar/Bar.php                         |   2 +-
 src/Tracy/BlueScreen/BlueScreen.php           |  48 ++--
 src/Tracy/Debugger/Debugger.php               |   6 +-
 src/Tracy/Debugger/DeferredContent.php        |   8 +-
 src/Tracy/Debugger/ProductionStrategy.php     |   4 +-
 src/Tracy/Dumper/Describer.php                |   8 +-
 src/Tracy/Dumper/Dumper.php                   |   6 +-
 src/Tracy/Dumper/Exposer.php                  |  20 +-
 src/Tracy/Dumper/Renderer.php                 |   6 +-
 src/Tracy/Helpers.php                         |  82 +++---
 src/Tracy/Logger/Logger.php                   |   4 +-
 src/Tracy/Session/FileSession.php             |   2 +-
 tests/Tracy/BlueScreen.getDumper().phpt       |   8 +-
 tests/Tracy/BlueScreen.renderActions().phpt   |  32 ++-
 tests/Tracy/BlueScreen.showEnvironment.phpt   |   6 +-
 tests/Tracy/Debugger.E_ERROR.console.phpt     |   2 +-
 .../Debugger.barDump().showLocation.phpt      |  23 +-
 tests/Tracy/Debugger.warnings.console.phpt    |  14 +-
 tests/Tracy/Debugger.warnings.html.phpt       |  35 ++-
 tests/Tracy/Dumper.debugInfo.phpt             |  53 ++--
 tests/Tracy/Dumper.dump().html.phpt           |  32 +--
 tests/Tracy/Dumper.keys.phpt                  |  74 +++---
 tests/Tracy/Dumper.keysToHide.phpt            |  30 +--
 tests/Tracy/Dumper.nesting-error.phpt         |  18 +-
 tests/Tracy/Dumper.objectExporters.phpt       | 158 ++++++------
 tests/Tracy/Dumper.scrubber.phpt              |  60 +++--
 tests/Tracy/Dumper.sensitiveValue.phpt        |  34 +--
 tests/Tracy/Dumper.toHtml().collapse.phpt     |  70 +++---
 tests/Tracy/Dumper.toHtml().depth.phpt        | 208 ++++++++-------
 tests/Tracy/Dumper.toHtml().key.phpt          |   4 +-
 tests/Tracy/Dumper.toHtml().lazy.auto.phpt    | 142 ++++++-----
 tests/Tracy/Dumper.toHtml().lazy.no.phpt      | 200 ++++++++-------
 tests/Tracy/Dumper.toHtml().lazy.phpt         | 136 ++++++----
 tests/Tracy/Dumper.toHtml().live.phpt         |  36 +--
 tests/Tracy/Dumper.toHtml().locale.phpt       |  18 +-
 tests/Tracy/Dumper.toHtml().location.phpt     |  80 +++---
 tests/Tracy/Dumper.toHtml().phpt              | 192 +++++++-------
 tests/Tracy/Dumper.toHtml().recursion.phpt    |  50 ++--
 tests/Tracy/Dumper.toHtml().references.phpt   |  40 +--
 tests/Tracy/Dumper.toHtml().see.phpt          | 140 ++++++-----
 tests/Tracy/Dumper.toHtml().snapshot.phpt     |  48 ++--
 tests/Tracy/Dumper.toHtml().specialChars.phpt |  56 +++--
 tests/Tracy/Dumper.toHtml().specials.phpt     | 170 +++++++------
 tests/Tracy/Dumper.toTerminal().phpt          |  76 +++---
 tests/Tracy/Dumper.toText().depth.phpt        | 170 +++++++------
 tests/Tracy/Dumper.toText().locale.phpt       |  14 +-
 tests/Tracy/Dumper.toText().nohash.phpt       |  64 ++---
 tests/Tracy/Dumper.toText().phpt              | 174 +++++++------
 tests/Tracy/Dumper.toText().recursion.phpt    |  42 ++--
 tests/Tracy/Dumper.toText().references.phpt   |  36 +--
 tests/Tracy/Dumper.toText().see.phpt          | 108 ++++----
 tests/Tracy/Dumper.toText().specialChars.phpt |  52 ++--
 tests/Tracy/Dumper.toText().specials.dom.phpt | 238 +++++++++---------
 tests/Tracy/Dumper.toText().specials.ds.phpt  |  28 ++-
 .../Tracy/Dumper.toText().specials.enum.phpt  |  18 +-
 .../Tracy/Dumper.toText().specials.fiber.phpt |  14 +-
 .../Dumper.toText().specials.generator.phpt   |  28 ++-
 tests/Tracy/Dumper.toText().specials.phpt     | 120 +++++----
 tests/Tracy/dump().html.phpt                  |  36 +--
 62 files changed, 1916 insertions(+), 1681 deletions(-)

diff --git a/src/Bridges/Nette/Bridge.php b/src/Bridges/Nette/Bridge.php
index 15c49f500..1819ab024 100644
--- a/src/Bridges/Nette/Bridge.php
+++ b/src/Bridges/Nette/Bridge.php
@@ -27,11 +27,9 @@ public static function initialize(): void
 		if (!class_exists(Latte\Bridges\Tracy\BlueScreenPanel::class)) {
 			$blueScreen->addPanel([self::class, 'renderLatteError']);
 			$blueScreen->addAction([self::class, 'renderLatteUnknownMacro']);
-			$blueScreen->addFileGenerator(function (string $file) {
-				return substr($file, -6) === '.latte'
+			$blueScreen->addFileGenerator(fn(string $file) => substr($file, -6) === '.latte'
 					? "{block content}\n\$END\$"
-					: null;
-			});
+					: null);
 			Tracy\Debugger::addSourceMapper([self::class, 'mapLatteSourceCode']);
 		}
 
diff --git a/src/Bridges/Nette/TracyExtension.php b/src/Bridges/Nette/TracyExtension.php
index 1ac434444..c2e39ebe5 100644
--- a/src/Bridges/Nette/TracyExtension.php
+++ b/src/Bridges/Nette/TracyExtension.php
@@ -116,7 +116,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 				];
 				$initialize->addBody($builder->formatPhp(
 					($tbl[$key] ?? 'Tracy\Debugger::$' . $key . ' = ?') . ';',
-					Nette\DI\Helpers::filterArguments([$value])
+					Nette\DI\Helpers::filterArguments([$value]),
 				));
 			}
 		}
@@ -137,7 +137,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 
 				$initialize->addBody($builder->formatPhp(
 					'$this->getService(?)->addPanel(?);',
-					Nette\DI\Helpers::filterArguments([$this->prefix('bar'), $item])
+					Nette\DI\Helpers::filterArguments([$this->prefix('bar'), $item]),
 				));
 			}
 
@@ -154,7 +154,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 		foreach ($this->config->blueScreen as $item) {
 			$initialize->addBody($builder->formatPhp(
 				'$this->getService(?)->addPanel(?);',
-				Nette\DI\Helpers::filterArguments([$this->prefix('blueScreen'), $item])
+				Nette\DI\Helpers::filterArguments([$this->prefix('blueScreen'), $item]),
 			));
 		}
 
diff --git a/src/Bridges/Psr/PsrToTracyLoggerAdapter.php b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
index b28526bee..28fac20eb 100644
--- a/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
+++ b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
@@ -56,7 +56,7 @@ public function log($value, $level = self::INFO)
 		$this->psrLogger->log(
 			self::LevelMap[$level] ?? Psr\Log\LogLevel::ERROR,
 			$message,
-			$context
+			$context,
 		);
 	}
 }
diff --git a/src/Tracy/Bar/Bar.php b/src/Tracy/Bar/Bar.php
index fd68c4049..6778e3fec 100644
--- a/src/Tracy/Bar/Bar.php
+++ b/src/Tracy/Bar/Bar.php
@@ -31,7 +31,7 @@ public function addPanel(IBarPanel $panel, ?string $id = null): self
 		if ($id === null) {
 			$c = 0;
 			do {
-				$id = get_class($panel) . ($c++ ? "-$c" : '');
+				$id = $panel::class . ($c++ ? "-$c" : '');
 			} while (isset($this->panels[$id]));
 		}
 
diff --git a/src/Tracy/BlueScreen/BlueScreen.php b/src/Tracy/BlueScreen/BlueScreen.php
index fd889d042..8ddfeefb3 100644
--- a/src/Tracy/BlueScreen/BlueScreen.php
+++ b/src/Tracy/BlueScreen/BlueScreen.php
@@ -134,9 +134,7 @@ public function render(\Throwable $exception): void
 	/** @internal */
 	public function renderToAjax(\Throwable $exception, DeferredContent $defer): void
 	{
-		$defer->addSetup('Tracy.BlueScreen.loadAjax', Helpers::capture(function () use ($exception) {
-			$this->renderTemplate($exception, __DIR__ . '/assets/content.phtml');
-		}));
+		$defer->addSetup('Tracy.BlueScreen.loadAjax', Helpers::capture(fn() => $this->renderTemplate($exception, __DIR__ . '/assets/content.phtml')));
 	}
 
 
@@ -177,8 +175,8 @@ private function renderTemplate(\Throwable $exception, string $template, $toScre
 		if (function_exists('apache_request_headers')) {
 			$httpHeaders = apache_request_headers();
 		} else {
-			$httpHeaders = array_filter($_SERVER, function ($k) { return strncmp($k, 'HTTP_', 5) === 0; }, ARRAY_FILTER_USE_KEY);
-			$httpHeaders = array_combine(array_map(function ($k) { return strtolower(strtr(substr($k, 5), '_', '-')); }, array_keys($httpHeaders)), $httpHeaders);
+			$httpHeaders = array_filter($_SERVER, fn($k) => strncmp($k, 'HTTP_', 5) === 0, ARRAY_FILTER_USE_KEY);
+			$httpHeaders = array_combine(array_map(fn($k) => strtolower(strtr(substr($k, 5), '_', '-')), array_keys($httpHeaders)), $httpHeaders);
 		}
 
 		$snapshot = &$this->snapshot;
@@ -319,7 +317,7 @@ public static function highlightFile(
 		int $line,
 		int $lines = 15,
 		bool $php = true,
-		int $column = 0
+		int $column = 0,
 	): ?string
 	{
 		$source = @file_get_contents($file); // @ file may not exist
@@ -398,14 +396,14 @@ public static function highlightLine(string $html, int $line, int $lines = 15, i
 						'#((?:&.*?;|[^&]){' . ($column - 1) . '})(&.*?;|.)#u',
 						'\1<span class="tracy-column-highlight">\2</span>',
 						$s . ' ',
-						1
+						1,
 					);
 				}
 				$out .= sprintf(
 					"<span class='tracy-line-highlight'>%{$numWidth}s:    %s\n</span>%s",
 					$n,
 					$s,
-					implode('', $tags[0])
+					implode('', $tags[0]),
 				);
 			} else {
 				$out .= sprintf("<span class='tracy-line'>%{$numWidth}s:</span>    %s\n", $n, $s);
@@ -451,7 +449,7 @@ function ($m) use ($colors, &$stack): string {
 
 				return "\e[0m\e[" . end($stack) . 'm';
 			},
-			$s
+			$s,
 		);
 		$s = htmlspecialchars_decode(strip_tags($s), ENT_QUOTES | ENT_HTML5);
 		return $s;
@@ -479,17 +477,15 @@ public function isCollapsed(string $file): bool
 	/** @internal */
 	public function getDumper(): \Closure
 	{
-		return function ($v, $k = null): string {
-			return Dumper::toHtml($v, [
-				Dumper::DEPTH => $this->maxDepth,
-				Dumper::TRUNCATE => $this->maxLength,
-				Dumper::ITEMS => $this->maxItems,
-				Dumper::SNAPSHOT => &$this->snapshot,
-				Dumper::LOCATION => Dumper::LOCATION_CLASS,
-				Dumper::SCRUBBER => $this->scrubber,
-				Dumper::KEYS_TO_HIDE => $this->keysToHide,
-			], $k);
-		};
+		return fn($v, $k = null): string => Dumper::toHtml($v, [
+			Dumper::DEPTH => $this->maxDepth,
+			Dumper::TRUNCATE => $this->maxLength,
+			Dumper::ITEMS => $this->maxItems,
+			Dumper::SNAPSHOT => &$this->snapshot,
+			Dumper::LOCATION => Dumper::LOCATION_CLASS,
+			Dumper::SCRUBBER => $this->scrubber,
+			Dumper::KEYS_TO_HIDE => $this->keysToHide,
+		], $k);
 	}
 
 
@@ -501,7 +497,7 @@ public function formatMessage(\Throwable $exception): string
 		$msg = preg_replace(
 			'#\'\S(?:[^\']|\\\\\')*\S\'|"\S(?:[^"]|\\\\")*\S"#',
 			'<i>$0</i>',
-			$msg
+			$msg,
 		);
 
 		// clickable class & methods
@@ -520,18 +516,16 @@ function ($m) {
 
 				return '<a href="' . Helpers::escapeHtml(Helpers::editorUri($r->getFileName(), $r->getStartLine())) . '" class="tracy-editor">' . $m[0] . '</a>';
 			},
-			$msg
+			$msg,
 		);
 
 		// clickable file name
 		$msg = preg_replace_callback(
 			'#([\w\\\\/.:-]+\.(?:php|phpt|phtml|latte|neon))(?|:(\d+)| on line (\d+))?#',
-			function ($m) {
-				return @is_file($m[1])
+			fn($m) => @is_file($m[1])
 				? '<a href="' . Helpers::escapeHtml(Helpers::editorUri($m[1], isset($m[2]) ? (int) $m[2] : null)) . '" class="tracy-editor">' . $m[0] . '</a>'
-				: $m[0];
-			},
-			$msg
+				: $m[0],
+			$msg,
 		);
 
 		return $msg;
diff --git a/src/Tracy/Debugger/Debugger.php b/src/Tracy/Debugger/Debugger.php
index 18817f857..495f981fc 100644
--- a/src/Tracy/Debugger/Debugger.php
+++ b/src/Tracy/Debugger/Debugger.php
@@ -40,7 +40,7 @@ class Debugger
 	public static $showBar = true;
 
 	/** @var int size of reserved memory */
-	public static $reservedMemorySize = 500000;
+	public static $reservedMemorySize = 500_000;
 
 	/** @var bool */
 	private static $enabled = false;
@@ -494,9 +494,7 @@ public static function dump($var, bool $return = false)
 			];
 			return Helpers::isCli()
 				? Dumper::toText($var)
-				: Helpers::capture(function () use ($var, $options) {
-					Dumper::dump($var, $options);
-				});
+				: Helpers::capture(fn() => Dumper::dump($var, $options));
 
 		} elseif (!self::$productionMode) {
 			$html = Helpers::isHtmlMode();
diff --git a/src/Tracy/Debugger/DeferredContent.php b/src/Tracy/Debugger/DeferredContent.php
index fafc8be82..038578eb7 100644
--- a/src/Tracy/Debugger/DeferredContent.php
+++ b/src/Tracy/Debugger/DeferredContent.php
@@ -66,7 +66,7 @@ public function sendAssets(): bool
 		if (headers_sent($file, $line) || ob_get_length()) {
 			throw new \LogicException(
 				__METHOD__ . '() called after some output has been sent. '
-				. ($file ? "Output started at $file:$line." : 'Try Tracy\OutputDebugger to find where output started.')
+				. ($file ? "Output started at $file:$line." : 'Try Tracy\OutputDebugger to find where output started.'),
 			);
 		}
 
@@ -126,7 +126,7 @@ private function buildJsCss(): string
 			__DIR__ . '/../BlueScreen/assets/bluescreen.css',
 		], Debugger::$customCssFiles));
 
-		$js1 = array_map(function ($file) { return '(function() {' . file_get_contents($file) . '})();'; }, [
+		$js1 = array_map(fn($file) => '(function() {' . file_get_contents($file) . '})();', [
 			__DIR__ . '/../Bar/assets/bar.js',
 			__DIR__ . '/../assets/toggle.js',
 			__DIR__ . '/../assets/table-sort.js',
@@ -153,9 +153,7 @@ public function clean(): void
 	{
 		foreach ($this->sessionStorage->getData() as &$items) {
 			$items = array_slice((array) $items, -10, null, true);
-			$items = array_filter($items, function ($item) {
-				return isset($item['time']) && $item['time'] > time() - 60;
-			});
+			$items = array_filter($items, fn($item) => isset($item['time']) && $item['time'] > time() - 60);
 		}
 	}
 }
diff --git a/src/Tracy/Debugger/ProductionStrategy.php b/src/Tracy/Debugger/ProductionStrategy.php
index 16f99e3a4..93ddfa2f2 100644
--- a/src/Tracy/Debugger/ProductionStrategy.php
+++ b/src/Tracy/Debugger/ProductionStrategy.php
@@ -40,9 +40,7 @@ public function handleException(\Throwable $exception, bool $firstTime): void
 				header('Content-Type: text/html; charset=UTF-8');
 			}
 
-			(function ($logged) use ($exception) {
-				require Debugger::$errorTemplate ?: __DIR__ . '/assets/error.500.phtml';
-			})(empty($e));
+			(fn($logged) => require Debugger::$errorTemplate ?: __DIR__ . '/assets/error.500.phtml')(empty($e));
 
 		} elseif (Helpers::isCli()) {
 			// @ triggers E_NOTICE when strerr is closed since PHP 7.4
diff --git a/src/Tracy/Dumper/Describer.php b/src/Tracy/Dumper/Describer.php
index a1545a8fd..c370befd1 100644
--- a/src/Tracy/Dumper/Describer.php
+++ b/src/Tracy/Dumper/Describer.php
@@ -60,9 +60,7 @@ final class Describer
 
 	public function describe($var): \stdClass
 	{
-		uksort($this->objectExposers, function ($a, $b): int {
-			return $b === '' || (class_exists($a, false) && is_subclass_of($a, $b)) ? -1 : 1;
-		});
+		uksort($this->objectExposers, fn($a, $b): int => $b === '' || (class_exists($a, false) && is_subclass_of($a, $b)) ? -1 : 1);
 
 		try {
 			return (object) [
@@ -265,14 +263,14 @@ public function addPropertyTo(
 		$v,
 		$type = Value::PropertyVirtual,
 		?int $refId = null,
-		?string $class = null
+		?string $class = null,
 	) {
 		if ($value->depth && $this->maxItems && count($value->items ?? []) >= $this->maxItems) {
 			$value->length = ($value->length ?? count($value->items)) + 1;
 			return;
 		}
 
-		$class = $class ?? $value->value;
+		$class ??= $value->value;
 		$value->items[] = [
 			$this->describeKey($k),
 			$type !== Value::PropertyVirtual && $this->isSensitive($k, $v, $class)
diff --git a/src/Tracy/Dumper/Dumper.php b/src/Tracy/Dumper/Dumper.php
index ebc089a7d..d28b0f44c 100644
--- a/src/Tracy/Dumper/Dumper.php
+++ b/src/Tracy/Dumper/Dumper.php
@@ -107,7 +107,7 @@ public static function dump($var, array $options = [])
 			fwrite(STDOUT, $dumper->asTerminal($var, $useColors ? self::$terminalColors : []));
 
 		} elseif (Helpers::isHtmlMode()) {
-			$options[self::LOCATION] = $options[self::LOCATION] ?? true;
+			$options[self::LOCATION] ??= true;
 			self::renderAssets();
 			echo self::toHtml($var, $options);
 
@@ -195,8 +195,8 @@ private function __construct(array $options = [])
 		}
 
 		if (isset($tmp)) {
-			$tmp[0] = $tmp[0] ?? [];
-			$tmp[1] = $tmp[1] ?? [];
+			$tmp[0] ??= [];
+			$tmp[1] ??= [];
 			$describer->snapshot = &$tmp[0];
 			$describer->references = &$tmp[1];
 		}
diff --git a/src/Tracy/Dumper/Exposer.php b/src/Tracy/Dumper/Exposer.php
index 4ae0558e1..1d415ec15 100644
--- a/src/Tracy/Dumper/Exposer.php
+++ b/src/Tracy/Dumper/Exposer.php
@@ -20,7 +20,7 @@ final class Exposer
 	public static function exposeObject(object $obj, Value $value, Describer $describer): void
 	{
 		$values = (array) $obj;
-		$props = self::getProperties(get_class($obj));
+		$props = self::getProperties($obj::class);
 
 		foreach (array_diff_key($values, $props) as $k => $v) {
 			$describer->addPropertyTo(
@@ -28,7 +28,7 @@ public static function exposeObject(object $obj, Value $value, Describer $descri
 				(string) $k,
 				$v,
 				Value::PropertyDynamic,
-				$describer->getReferenceId($values, $k)
+				$describer->getReferenceId($values, $k),
 			);
 		}
 
@@ -40,7 +40,7 @@ public static function exposeObject(object $obj, Value $value, Describer $descri
 					$values[$k],
 					$type,
 					$describer->getReferenceId($values, $k),
-					$class
+					$class,
 				);
 			} else {
 				$value->items[] = [
@@ -114,7 +114,7 @@ public static function exposeClosure(\Closure $obj, Value $value, Describer $des
 
 	public static function exposeEnum(\UnitEnum $enum, Value $value, Describer $describer): void
 	{
-		$value->value = get_class($enum) . '::' . $enum->name;
+		$value->value = $enum::class . '::' . $enum->name;
 		if ($enum instanceof \BackedEnum) {
 			$describer->addPropertyTo($value, 'value', $enum->value);
 			$value->collapsed = true;
@@ -159,7 +159,7 @@ public static function exposeGenerator(\Generator $gen, Value $value, Describer
 			$describer->addPropertyTo($value, 'file', $r->getExecutingFile() . ':' . $r->getExecutingLine());
 			$describer->addPropertyTo($value, 'this', $r->getThis());
 		} catch (\ReflectionException $e) {
-			$value->value = get_class($gen) . ' (terminated)';
+			$value->value = $gen::class . ' (terminated)';
 		}
 	}
 
@@ -167,9 +167,9 @@ public static function exposeGenerator(\Generator $gen, Value $value, Describer
 	public static function exposeFiber(\Fiber $fiber, Value $value, Describer $describer): void
 	{
 		if ($fiber->isTerminated()) {
-			$value->value = get_class($fiber) . ' (terminated)';
+			$value->value = $fiber::class . ' (terminated)';
 		} elseif (!$fiber->isStarted()) {
-			$value->value = get_class($fiber) . ' (not started)';
+			$value->value = $fiber::class . ' (not started)';
 		} else {
 			$r = new \ReflectionFiber($fiber);
 			$describer->addPropertyTo($value, 'file', $r->getExecutingFile() . ':' . $r->getExecutingLine());
@@ -198,7 +198,7 @@ public static function exposeSplObjectStorage(\SplObjectStorage $obj): array
 	public static function exposePhpIncompleteClass(
 		\__PHP_Incomplete_Class $obj,
 		Value $value,
-		Describer $describer
+		Describer $describer,
 	): void
 	{
 		$values = (array) $obj;
@@ -227,7 +227,7 @@ public static function exposePhpIncompleteClass(
 	public static function exposeDsCollection(
 		Ds\Collection $obj,
 		Value $value,
-		Describer $describer
+		Describer $describer,
 	): void
 	{
 		foreach ($obj as $k => $v) {
@@ -239,7 +239,7 @@ public static function exposeDsCollection(
 	public static function exposeDsMap(
 		Ds\Map $obj,
 		Value $value,
-		Describer $describer
+		Describer $describer,
 	): void
 	{
 		$i = 0;
diff --git a/src/Tracy/Dumper/Renderer.php b/src/Tracy/Dumper/Renderer.php
index 9ea566144..e8c78f5f1 100644
--- a/src/Tracy/Dumper/Renderer.php
+++ b/src/Tracy/Dumper/Renderer.php
@@ -91,7 +91,7 @@ public function renderAsHtml(\stdClass $model): string
 				$uri ?? '#',
 				$file,
 				$line,
-				$uri ? "\nClick to open in editor" : ''
+				$uri ? "\nClick to open in editor" : '',
 			) . Helpers::encodeString($code, 50) . " 📍</a\n>";
 		}
 
@@ -339,7 +339,7 @@ private function renderObject(Value $object, int $depth): string
 				$object->editor->line,
 				$object->editor->url ? "\nCtrl-Click to open in editor" : '',
 				"\nAlt-Click to expand/collapse all child nodes",
-				$object->editor->url
+				$object->editor->url,
 			);
 		}
 
@@ -493,7 +493,7 @@ function ($m) use ($colors, &$stack): string {
 
 				return "\033[" . end($stack) . 'm';
 			},
-			$s
+			$s,
 		);
 		$s = preg_replace('/\e\[0m(\n*)(?=\e)/', '$1', $s);
 		return $s;
diff --git a/src/Tracy/Helpers.php b/src/Tracy/Helpers.php
index 4ea49e7e1..1fd045760 100644
--- a/src/Tracy/Helpers.php
+++ b/src/Tracy/Helpers.php
@@ -39,7 +39,7 @@ public static function editorLink(string $file, ?int $line = null): string
 				$origFile . ($line ? ":$line" : ''),
 				rtrim(dirname($file), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR,
 				basename($file),
-				$line ? ":$line" : ''
+				$line ? ":$line" : '',
 			);
 		} else {
 			return self::formatHtml('<span>%</span>', $file . ($line ? ":$line" : ''));
@@ -55,7 +55,7 @@ public static function editorUri(
 		?int $line = null,
 		string $action = 'open',
 		string $search = '',
-		string $replace = ''
+		string $replace = '',
 	): ?string
 	{
 		if (Debugger::$editor && $file && ($action === 'create' || is_file($file))) {
@@ -112,7 +112,7 @@ public static function findTrace(array $trace, $method, ?int &$index = null): ?a
 
 	public static function getClass($obj): string
 	{
-		return explode("\x00", get_class($obj))[0];
+		return explode("\x00", $obj::class)[0];
 	}
 
 
@@ -212,14 +212,14 @@ public static function improveException(\Throwable $e): void
 
 		} elseif (preg_match('#^Undefined property: ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
 			$rc = new \ReflectionClass($m[1]);
-			$items = array_filter($rc->getProperties(\ReflectionProperty::IS_PUBLIC), function ($prop) { return !$prop->isStatic(); });
+			$items = array_filter($rc->getProperties(\ReflectionProperty::IS_PUBLIC), fn($prop) => !$prop->isStatic());
 			$hint = self::getSuggestion($items, $m[2]);
 			$message .= ", did you mean $$hint?";
 			$replace = ["->$m[2]", "->$hint"];
 
 		} elseif (preg_match('#^Access to undeclared static property:? ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
 			$rc = new \ReflectionClass($m[1]);
-			$items = array_filter($rc->getProperties(\ReflectionProperty::IS_STATIC), function ($prop) { return $prop->isPublic(); });
+			$items = array_filter($rc->getProperties(\ReflectionProperty::IS_STATIC), fn($prop) => $prop->isPublic());
 			$hint = self::getSuggestion($items, $m[2]);
 			$message .= ", did you mean $$hint?";
 			$replace = ["::$$m[2]", "::$$hint"];
@@ -243,7 +243,7 @@ public static function improveError(string $message): string
 	{
 		if (preg_match('#^Undefined property: ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
 			$rc = new \ReflectionClass($m[1]);
-			$items = array_filter($rc->getProperties(\ReflectionProperty::IS_PUBLIC), function ($prop) { return !$prop->isStatic(); });
+			$items = array_filter($rc->getProperties(\ReflectionProperty::IS_PUBLIC), fn($prop) => !$prop->isStatic());
 			$hint = self::getSuggestion($items, $m[2]);
 			return $hint ? $message . ", did you mean $$hint?" : $message;
 		}
@@ -285,9 +285,7 @@ public static function getSuggestion(array $items, string $value): ?string
 	{
 		$best = null;
 		$min = (strlen($value) / 4 + 1) * 10 + .1;
-		$items = array_map(function ($item) {
-			return $item instanceof \Reflector ? $item->getName() : (string) $item;
-		}, $items);
+		$items = array_map(fn($item) => $item instanceof \Reflector ? $item->getName() : (string) $item, $items);
 		foreach (array_unique($items) as $item) {
 			if (($len = levenshtein($item, $value, 10, 11, 10)) > 0 && $len < $min) {
 				$min = $len;
@@ -367,7 +365,7 @@ private static function escapeArg(string $s): string
 	 */
 	public static function capture(callable $func): string
 	{
-		ob_start(function () {});
+		ob_start(fn() => null);
 		try {
 			$func();
 			return ob_get_clean();
@@ -414,12 +412,10 @@ private static function doEncodeString(string $s, bool $utf8, bool $showWhitespa
 		$special = $specials[$showWhitespaces];
 		$s = preg_replace_callback(
 			$utf8 ? '#[\p{C}<&]#u' : '#[\x00-\x1F\x7F-\xFF<&]#',
-			function ($m) use ($special) {
-				return $special[$m[0]] ?? (strlen($m[0]) === 1
+			fn($m) => $special[$m[0]] ?? (strlen($m[0]) === 1
 					? '<i>\x' . str_pad(strtoupper(dechex(ord($m[0]))), 2, '0', STR_PAD_LEFT) . '</i>'
-					: '<i>\u{' . strtoupper(ltrim(dechex(self::utf8Ord($m[0])), '0')) . '}</i>');
-			},
-			$s
+					: '<i>\u{' . strtoupper(ltrim(dechex(self::utf8Ord($m[0])), '0')) . '}</i>'),
+			$s,
 		);
 		$s = str_replace('</i><i>', '', $s);
 		$s = preg_replace('~\n$~D', '', $s);
@@ -483,22 +479,21 @@ public static function minifyJs(string $s): string
 		$last = '';
 		return preg_replace_callback(
 			<<<'XX'
-			(
-				(?:
-					(^|[-+\([{}=,:;!%^&*|?~]|/(?![/*])|return|throw) # context before regexp
-					(?:\s|//[^\n]*+\n|/\*(?:[^*]|\*(?!/))*+\*/)* # optional space
-					(/(?![/*])(?:\\[^\n]|[^[\n/\\]|\[(?:\\[^\n]|[^]])++)+/) # regexp
-					|(^
-						|'(?:\\.|[^\n'\\])*'
-						|"(?:\\.|[^\n"\\])*"
-						|([0-9A-Za-z_$]+)
-						|([-+]+)
-						|.
-					)
-				)(?:\s|//[^\n]*+\n|/\*(?:[^*]|\*(?!/))*+\*/)* # optional space
-			())sx
-XX
-			,
+				(
+					(?:
+						(^|[-+\([{}=,:;!%^&*|?~]|/(?![/*])|return|throw) # context before regexp
+						(?:\s|//[^\n]*+\n|/\*(?:[^*]|\*(?!/))*+\*/)* # optional space
+						(/(?![/*])(?:\\[^\n]|[^[\n/\\]|\[(?:\\[^\n]|[^]])++)+/) # regexp
+						|(^
+							|'(?:\\.|[^\n'\\])*'
+							|"(?:\\.|[^\n"\\])*"
+							|([0-9A-Za-z_$]+)
+							|([-+]+)
+							|.
+						)
+					)(?:\s|//[^\n]*+\n|/\*(?:[^*]|\*(?!/))*+\*/)* # optional space
+				())sx
+				XX,
 			function ($match) use (&$last) {
 				[, $context, $regexp, $result, $word, $operator] = $match;
 				if ($word !== '') {
@@ -517,7 +512,7 @@ function ($match) use (&$last) {
 
 				return $result;
 			},
-			$s . "\n"
+			$s . "\n",
 		);
 	}
 
@@ -528,16 +523,15 @@ public static function minifyCss(string $s): string
 		$last = '';
 		return preg_replace_callback(
 			<<<'XX'
-			(
-				(^
-					|'(?:\\.|[^\n'\\])*'
-					|"(?:\\.|[^\n"\\])*"
-					|([0-9A-Za-z_*#.%:()[\]-]+)
-					|.
-				)(?:\s|/\*(?:[^*]|\*(?!/))*+\*/)* # optional space
-			())sx
-XX
-			,
+				(
+					(^
+						|'(?:\\.|[^\n'\\])*'
+						|"(?:\\.|[^\n"\\])*"
+						|([0-9A-Za-z_*#.%:()[\]-]+)
+						|.
+					)(?:\s|/\*(?:[^*]|\*(?!/))*+\*/)* # optional space
+				())sx
+				XX,
 			function ($match) use (&$last) {
 				[, $result, $word] = $match;
 				if ($last === ';') {
@@ -557,7 +551,7 @@ function ($match) use (&$last) {
 
 				return $result;
 			},
-			$s . "\n"
+			$s . "\n",
 		);
 	}
 
@@ -604,7 +598,7 @@ public static function traverseValue($val, callable $callback, array &$skip = []
 			}
 
 			foreach ($val as $k => $v) {
-				$refId = ($r = \ReflectionReference::fromArrayElement($val, $k)) ? $r->getId() : null;
+				$refId = \ReflectionReference::fromArrayElement($val, $k)?->getId();
 				self::traverseValue($v, $callback, $skip, $refId);
 			}
 		}
diff --git a/src/Tracy/Logger/Logger.php b/src/Tracy/Logger/Logger.php
index bbdc2d604..2a50a8e78 100644
--- a/src/Tracy/Logger/Logger.php
+++ b/src/Tracy/Logger/Logger.php
@@ -123,7 +123,7 @@ public function getExceptionFile(\Throwable $exception, string $level = self::EX
 	{
 		foreach (Helpers::getExceptionChain($exception) as $exception) {
 			$data[] = [
-				get_class($exception), $exception->getMessage(), $exception->getCode(), $exception->getFile(), $exception->getLine(),
+				$exception::class, $exception->getMessage(), $exception->getCode(), $exception->getFile(), $exception->getLine(),
 				array_map(function (array $item): array {
 					unset($item['args']);
 					return $item;
@@ -196,7 +196,7 @@ public function defaultMailer($message, string $email): void
 				]) . "\n",
 				'subject' => "PHP: An error occurred on the server $host",
 				'body' => static::formatMessage($message) . "\n\nsource: " . Helpers::getSource(),
-			]
+			],
 		);
 
 		mail($email, $parts['subject'], $parts['body'], $parts['headers']);
diff --git a/src/Tracy/Session/FileSession.php b/src/Tracy/Session/FileSession.php
index 783651d2e..f68b8d581 100644
--- a/src/Tracy/Session/FileSession.php
+++ b/src/Tracy/Session/FileSession.php
@@ -13,7 +13,7 @@
 class FileSession implements SessionStorage
 {
 	private const FilePrefix = 'tracy-';
-	private const CookieLifetime = 31557600;
+	private const CookieLifetime = 31_557_600;
 
 	/** @var string */
 	public $cookieName = 'tracy-session';
diff --git a/tests/Tracy/BlueScreen.getDumper().phpt b/tests/Tracy/BlueScreen.getDumper().phpt
index d574625d4..d6cac3cc3 100644
--- a/tests/Tracy/BlueScreen.getDumper().phpt
+++ b/tests/Tracy/BlueScreen.getDumper().phpt
@@ -18,9 +18,7 @@ test('dumper with default keysToHide scrubbing', function () {
 
 test('dumper with custom scrubbing', function () {
 	$blueScreen = new Tracy\BlueScreen;
-	$blueScreen->scrubber = function (string $k, $v = null): bool {
-		return strtolower($k) === 'pin' || strtolower($k) === 'foo' || $v === 42;
-	};
+	$blueScreen->scrubber = fn(string $k, $v = null): bool => strtolower($k) === 'pin' || strtolower($k) === 'foo' || $v === 42;
 	$dumper = $blueScreen->getDumper();
 	Assert::contains('foo', $dumper('foo', 'bar'));
 	Assert::notContains('secret', $dumper('secret', 'password')); // default keysToHide
@@ -31,9 +29,7 @@ test('dumper with custom scrubbing', function () {
 
 test('dumper with regexp scrubbing', function () {
 	$blueScreen = new Tracy\BlueScreen;
-	$blueScreen->scrubber = function (string $k): bool {
-		return (bool) preg_match('#password#i', $k);
-	};
+	$blueScreen->scrubber = fn(string $k): bool => (bool) preg_match('#password#i', $k);
 	$dumper = $blueScreen->getDumper();
 	Assert::contains('foo', $dumper('foo', 'bar'));
 	Assert::notContains('secret', $dumper('secret', 'super_password'));
diff --git a/tests/Tracy/BlueScreen.renderActions().phpt b/tests/Tracy/BlueScreen.renderActions().phpt
index d39be1340..803abbddc 100644
--- a/tests/Tracy/BlueScreen.renderActions().phpt
+++ b/tests/Tracy/BlueScreen.renderActions().phpt
@@ -19,7 +19,7 @@ Assert::with($blueScreen, function () {
 				'external' => true,
 			],
 		],
-		$this->renderActions(new Exception)
+		$this->renderActions(new Exception),
 	);
 
 	Assert::same(
@@ -30,7 +30,7 @@ Assert::with($blueScreen, function () {
 				'external' => true,
 			],
 		],
-		$this->renderActions(new Exception('The = message', 123))
+		$this->renderActions(new Exception('The = message', 123)),
 	);
 
 	Assert::same(
@@ -41,7 +41,7 @@ Assert::with($blueScreen, function () {
 				'external' => true,
 			],
 		],
-		$this->renderActions(new ErrorException('Message', 123, E_USER_WARNING))
+		$this->renderActions(new ErrorException('Message', 123, E_USER_WARNING)),
 	);
 });
 
@@ -59,7 +59,7 @@ Assert::with($blueScreen, function () {
 
 	Assert::same(
 		[$search],
-		$this->renderActions($e)
+		$this->renderActions($e),
 	);
 
 	if (PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg') {
@@ -72,7 +72,7 @@ Assert::with($blueScreen, function () {
 					'label' => 'skip error',
 				],
 			],
-			$this->renderActions($e)
+			$this->renderActions($e),
 		);
 	}
 });
@@ -85,7 +85,7 @@ Assert::with($blueScreen, function () {
 			'link' => 'editor://open/?file=' . urlencode(__FILE__) . '&line=1&search=&replace=',
 			'label' => 'open file',
 		],
-		$this->renderActions(new Exception(" '" . __FILE__ . "'"))[0]
+		$this->renderActions(new Exception(" '" . __FILE__ . "'"))[0],
 	);
 
 	Assert::same(
@@ -93,7 +93,7 @@ Assert::with($blueScreen, function () {
 			'link' => 'editor://open/?file=' . urlencode(__FILE__) . '&line=1&search=&replace=',
 			'label' => 'open file',
 		],
-		$this->renderActions(new Exception(' "' . __FILE__ . '"'))[0]
+		$this->renderActions(new Exception(' "' . __FILE__ . '"'))[0],
 	);
 
 	$ds = urlencode(DIRECTORY_SEPARATOR);
@@ -102,7 +102,7 @@ Assert::with($blueScreen, function () {
 			'link' => 'editor://create/?file=' . $ds . 'notexists.txt&line=1&search=&replace=',
 			'label' => 'create file',
 		],
-		$this->renderActions(new Exception(' "/notexists.txt"'))[0]
+		$this->renderActions(new Exception(' "/notexists.txt"'))[0],
 	);
 
 	Assert::same(
@@ -110,7 +110,7 @@ Assert::with($blueScreen, function () {
 			'link' => 'editor://create/?file=c%3A%5Cnotexists.txt&line=1&search=&replace=',
 			'label' => 'create file',
 		],
-		$this->renderActions(new Exception(' "c:\notexists.txt"'))[0]
+		$this->renderActions(new Exception(' "c:\notexists.txt"'))[0],
 	);
 
 	Assert::same(
@@ -118,7 +118,7 @@ Assert::with($blueScreen, function () {
 			'link' => 'editor://create/?file=c%3A' . $ds . 'notexists.txt&line=1&search=&replace=',
 			'label' => 'create file',
 		],
-		$this->renderActions(new Exception(' "c:/notexists.txt"'))[0]
+		$this->renderActions(new Exception(' "c:/notexists.txt"'))[0],
 	);
 
 	Assert::count(1, $this->renderActions(new Exception(' "/notfile"')));
@@ -136,19 +136,15 @@ Assert::with($blueScreen, function () {
 	@$e->tracyAction = ['link' => 'a', 'label' => 'b']; // deprecated since PHP 8.2
 	Assert::same(
 		['link' => 'a', 'label' => 'b'],
-		$this->renderActions($e)[0]
+		$this->renderActions($e)[0],
 	);
 });
 
 
 // addAction
-$blueScreen->addAction(function (Throwable $e) {
-	return [];
-});
+$blueScreen->addAction(fn(Throwable $e) => []);
 
-$blueScreen->addAction(function (Throwable $e) {
-	return ['link' => 'a', 'label' => 'b'];
-});
+$blueScreen->addAction(fn(Throwable $e) => ['link' => 'a', 'label' => 'b']);
 
 Assert::with($blueScreen, function () {
 	$e = new Exception;
@@ -161,7 +157,7 @@ Assert::with($blueScreen, function () {
 				'external' => true,
 			],
 		],
-		$this->renderActions($e)
+		$this->renderActions($e),
 	);
 });
 
diff --git a/tests/Tracy/BlueScreen.showEnvironment.phpt b/tests/Tracy/BlueScreen.showEnvironment.phpt
index 452fd23af..20687319f 100644
--- a/tests/Tracy/BlueScreen.showEnvironment.phpt
+++ b/tests/Tracy/BlueScreen.showEnvironment.phpt
@@ -25,13 +25,13 @@ $lookFor = '<h2 class="tracy-section-label"><a href="#" data-tracy-ref="^+" clas
 
 // sanity test: The environment section is present in the rendered string
 $c = $render($exception);
-Assert::true(strpos($c, $lookFor) !== false);
+Assert::true(str_contains($c, $lookFor));
 
 // on memory failures, it's hidden by default:
 $c = $render($hohoh = new ErrorException('Fatal Error: Allowed memory size of 134217728 bytes exhausted'));
-Assert::true(strpos($c, $lookFor) === false);
+Assert::true(!str_contains($c, $lookFor));
 
 // this time the section is absent:
 $blueScreen->showEnvironment = false;
 $c = $render($exception);
-Assert::true(strpos($c, $lookFor) === false);
+Assert::true(!str_contains($c, $lookFor));
diff --git a/tests/Tracy/Debugger.E_ERROR.console.phpt b/tests/Tracy/Debugger.E_ERROR.console.phpt
index 0d2eda029..24e049008 100644
--- a/tests/Tracy/Debugger.E_ERROR.console.phpt
+++ b/tests/Tracy/Debugger.E_ERROR.console.phpt
@@ -33,7 +33,7 @@ Stack trace:
 #3 {main}
 Tracy is unable to log error: Logging directory is not specified.
 ",
-		ob_get_clean()
+		ob_get_clean(),
 	);
 	echo 'OK!'; // prevents PHP bug #62725
 });
diff --git a/tests/Tracy/Debugger.barDump().showLocation.phpt b/tests/Tracy/Debugger.barDump().showLocation.phpt
index f0c051575..d0c7e9eb6 100644
--- a/tests/Tracy/Debugger.barDump().showLocation.phpt
+++ b/tests/Tracy/Debugger.barDump().showLocation.phpt
@@ -30,18 +30,17 @@ register_shutdown_function(function () {
 	preg_match('#Tracy\.Debug\.init\((".*[^\\\\]")\)#', $output, $m);
 	$rawContent = json_decode($m[1]);
 	$panelContent = (string) DomQuery::fromHtml($rawContent)->find('#tracy-debug-panel-Tracy-dumps')[0]['data-tracy-content'];
-	Assert::match(<<<'EOD'
-%A%<h1>Dumps</h1>
-
-<div class="tracy-inner tracy-DumpPanel">
-
-	<pre class="tracy-dump tracy-light"
-><a href="editor:%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">barDump('value') 📍</a
-><span class="tracy-dump-string" title="5 characters"><span>'</span>value<span>'</span></span></pre>
-</div>
-%A%
-EOD
-		, $panelContent);
+	Assert::match(<<<'XX'
+		%A%<h1>Dumps</h1>
+
+		<div class="tracy-inner tracy-DumpPanel">
+
+			<pre class="tracy-dump tracy-light"
+		><a href="editor:%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">barDump('value') 📍</a
+		><span class="tracy-dump-string" title="5 characters"><span>'</span>value<span>'</span></span></pre>
+		</div>
+		%A%
+		XX, $panelContent);
 	echo 'OK!'; // prevents PHP bug #62725
 });
 
diff --git a/tests/Tracy/Debugger.warnings.console.phpt b/tests/Tracy/Debugger.warnings.console.phpt
index 676e7c78b..a9e04c941 100644
--- a/tests/Tracy/Debugger.warnings.console.phpt
+++ b/tests/Tracy/Debugger.warnings.console.phpt
@@ -39,15 +39,17 @@ function third($arg1)
 
 
 register_shutdown_function(function () {
-	Assert::match(<<<'XX'
+	Assert::match(
+		<<<'XX'
 
-PHP Notice: Only variables should be assigned by reference in %a% on line %d%
+			PHP Notice: Only variables should be assigned by reference in %a% on line %d%
 
-PHP Warning: hex2bin(): Hexadecimal input string must have an even length in %a% on line %d%
+			PHP Warning: hex2bin(): Hexadecimal input string must have an even length in %a% on line %d%
 
-PHP Compile Warning: Unsupported declare 'foo' in %a% on line %d%
-XX
-		, ob_get_clean());
+			PHP Compile Warning: Unsupported declare 'foo' in %a% on line %d%
+			XX,
+		ob_get_clean(),
+	);
 });
 
 
diff --git a/tests/Tracy/Debugger.warnings.html.phpt b/tests/Tracy/Debugger.warnings.html.phpt
index b276d5be2..e94338b12 100644
--- a/tests/Tracy/Debugger.warnings.html.phpt
+++ b/tests/Tracy/Debugger.warnings.html.phpt
@@ -30,24 +30,23 @@ register_shutdown_function(function () {
 	$rawContent = json_decode($m[1]);
 	$panelContent = (string) DomQuery::fromHtml($rawContent)->find('#tracy-debug-panel-Tracy-errors')[0]['data-tracy-content'];
 	Assert::match(<<<'XX'
-%A%<table class="tracy-sortable">
-<tr><th>Count</th><th>Error</th></tr>
-<tr>
-	<td class="tracy-right">1%a%</td>
-	<td><pre>PHP Notice: Only variables should be assigned by reference in %a%:%d%</a></pre></td>
-</tr>
-<tr>
-	<td class="tracy-right">1%a%</td>
-	<td><pre>PHP Warning: hex2bin(): Hexadecimal input string must have an even length in %a%:%d%</a></pre></td>
-</tr>
-<tr>
-	<td class="tracy-right">1%a%</td>
-	<td><pre>PHP Compile Warning: Unsupported declare &apos;foo&apos; in %a%:%d%</a></pre></td>
-</tr>
-</table>
-</div>%A%
-XX
-		, $panelContent);
+		%A%<table class="tracy-sortable">
+		<tr><th>Count</th><th>Error</th></tr>
+		<tr>
+			<td class="tracy-right">1%a%</td>
+			<td><pre>PHP Notice: Only variables should be assigned by reference in %a%:%d%</a></pre></td>
+		</tr>
+		<tr>
+			<td class="tracy-right">1%a%</td>
+			<td><pre>PHP Warning: hex2bin(): Hexadecimal input string must have an even length in %a%:%d%</a></pre></td>
+		</tr>
+		<tr>
+			<td class="tracy-right">1%a%</td>
+			<td><pre>PHP Compile Warning: Unsupported declare &apos;foo&apos; in %a%:%d%</a></pre></td>
+		</tr>
+		</table>
+		</div>%A%
+		XX, $panelContent);
 	echo 'OK!'; // prevents PHP bug #62725
 });
 
diff --git a/tests/Tracy/Dumper.debugInfo.phpt b/tests/Tracy/Dumper.debugInfo.phpt
index dd4317206..943c3ef6c 100644
--- a/tests/Tracy/Dumper.debugInfo.phpt
+++ b/tests/Tracy/Dumper.debugInfo.phpt
@@ -31,21 +31,22 @@ $obj = new Password;
 $obj->password = 'secret';
 
 
-Assert::match(<<<'XX'
-Password #%d%
-   password: '[censored]'
-XX
-	, Dumper::toText($obj, [Dumper::DEBUGINFO => true]));
+Assert::match(
+	<<<'XX'
+		Password #%d%
+		   password: '[censored]'
+		XX,
+	Dumper::toText($obj, [Dumper::DEBUGINFO => true]),
+);
 
 
 Assert::match(
 	<<<'XX'
-Password #%d%
-   password: 'secret'
-   extra: 'foo'
-XX
-	,
-	Dumper::toText($obj)
+		Password #%d%
+		   password: 'secret'
+		   extra: 'foo'
+		XX,
+	Dumper::toText($obj),
 );
 
 
@@ -53,18 +54,22 @@ $container = new stdClass;
 $container->passwordObject = $obj;
 
 
-Assert::match(<<<'XX'
-stdClass #%d%
-   passwordObject: Password #%d%
-   |  password: '[censored]'
-XX
-	, Dumper::toText($container, [Dumper::DEBUGINFO => true]));
+Assert::match(
+	<<<'XX'
+		stdClass #%d%
+		   passwordObject: Password #%d%
+		   |  password: '[censored]'
+		XX,
+	Dumper::toText($container, [Dumper::DEBUGINFO => true]),
+);
 
 
-Assert::match(<<<'XX'
-stdClass #%d%
-   passwordObject: Password #%d%
-   |  password: 'secret'
-   |  extra: 'foo'
-XX
-	, Dumper::toText($container));
+Assert::match(
+	<<<'XX'
+		stdClass #%d%
+		   passwordObject: Password #%d%
+		   |  password: 'secret'
+		   |  extra: 'foo'
+		XX,
+	Dumper::toText($container),
+);
diff --git a/tests/Tracy/Dumper.dump().html.phpt b/tests/Tracy/Dumper.dump().html.phpt
index f2af15248..8727b219a 100644
--- a/tests/Tracy/Dumper.dump().html.phpt
+++ b/tests/Tracy/Dumper.dump().html.phpt
@@ -21,26 +21,30 @@ test('html mode', function () {
 	setHtmlMode();
 	ob_start();
 	Assert::same(123, Dumper::dump(123));
-	Assert::match(<<<'XX'
-<style>%a%</style>
-<script>%a%</script>
-<pre class="tracy-dump tracy-light"
-><a href="editor://%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::dump(123)) 📍</a
-><span class="tracy-dump-number">123</span></pre>
-XX
-		, ob_get_clean());
+	Assert::match(
+		<<<'XX'
+			<style>%a%</style>
+			<script>%a%</script>
+			<pre class="tracy-dump tracy-light"
+			><a href="editor://%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::dump(123)) 📍</a
+			><span class="tracy-dump-number">123</span></pre>
+			XX,
+		ob_get_clean(),
+	);
 });
 
 
 test('repeated html mode', function () {
 	ob_start();
 	Assert::same(123, Dumper::dump(123));
-	Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><a %A%>Dumper::dump(123)) 📍</a
-><span class="tracy-dump-number">123</span></pre>
-XX
-		, ob_get_clean());
+	Assert::match(
+		<<<'XX'
+			<pre class="tracy-dump tracy-light"
+			><a %A%>Dumper::dump(123)) 📍</a
+			><span class="tracy-dump-number">123</span></pre>
+			XX,
+		ob_get_clean(),
+	);
 });
 
 
diff --git a/tests/Tracy/Dumper.keys.phpt b/tests/Tracy/Dumper.keys.phpt
index b9ad1f205..23a4e72c9 100644
--- a/tests/Tracy/Dumper.keys.phpt
+++ b/tests/Tracy/Dumper.keys.phpt
@@ -24,47 +24,51 @@ $keys = [
 	'<a> &amp;' => 0,
 ];
 
-Assert::match(<<<'XX'
-array (%i%)
-   '' => 0
-   '"' => 0
-   ''' => 0
-   'key' => 0
-   ' key' => 0
-   'key ' => 0
-   0 => 0
-   '01' => 0
-   'true' => 0
-   'false' => 0
-   'null' => 0
-   'NULL' => 0
-   '<a> &amp;' => 0
-XX
-	, Dumper::toText($keys));
+Assert::match(
+	<<<'XX'
+		array (%i%)
+		   '' => 0
+		   '"' => 0
+		   ''' => 0
+		   'key' => 0
+		   ' key' => 0
+		   'key ' => 0
+		   0 => 0
+		   '01' => 0
+		   'true' => 0
+		   'false' => 0
+		   'null' => 0
+		   'NULL' => 0
+		   '<a> &amp;' => 0
+		XX,
+	Dumper::toText($keys),
+);
 
-Assert::match(<<<'XX'
-stdClass #%d%
-   '': 0
-   '"': 0
-   ''': 0
-   key: 0
-   ' key': 0
-   'key ': 0
-   0: 0
-   01: 0
-   'true': 0
-   'false': 0
-   'null': 0
-   'NULL': 0
-   '<a> &amp;': 0
-XX
-	, Dumper::toText((object) $keys));
+Assert::match(
+	<<<'XX'
+		stdClass #%d%
+		   '': 0
+		   '"': 0
+		   ''': 0
+		   key: 0
+		   ' key': 0
+		   'key ': 0
+		   0: 0
+		   01: 0
+		   'true': 0
+		   'false': 0
+		   'null': 0
+		   'NULL': 0
+		   '<a> &amp;': 0
+		XX,
+	Dumper::toText((object) $keys),
+);
 
 
 $snapshot = [];
 Assert::match(
 	'<pre class="tracy-dump tracy-light" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml((object) $keys, [Dumper::SNAPSHOT => &$snapshot])
+	Dumper::toHtml((object) $keys, [Dumper::SNAPSHOT => &$snapshot]),
 );
 
 Assert::equal([
diff --git a/tests/Tracy/Dumper.keysToHide.phpt b/tests/Tracy/Dumper.keysToHide.phpt
index 6846c1236..a6a826171 100644
--- a/tests/Tracy/Dumper.keysToHide.phpt
+++ b/tests/Tracy/Dumper.keysToHide.phpt
@@ -22,25 +22,27 @@ $obj = (object) [
 ];
 
 
-Assert::match(<<<'XX'
-stdClass #%d%
-   a: ***** (integer)
-   password: ***** (string)
-   PASSWORD: ***** (string)
-   Pin: ***** (string)
-   inner: array (4)
-   |  'a' => 123
-   |  'password' => ***** (string)
-   |  'PASSWORD' => ***** (string)
-   |  'Pin' => ***** (string)
-XX
-	, Dumper::toText($obj, [Dumper::KEYS_TO_HIDE => ['password', 'PIN', 'stdClass::$a']]));
+Assert::match(
+	<<<'XX'
+		stdClass #%d%
+		   a: ***** (integer)
+		   password: ***** (string)
+		   PASSWORD: ***** (string)
+		   Pin: ***** (string)
+		   inner: array (4)
+		   |  'a' => 123
+		   |  'password' => ***** (string)
+		   |  'PASSWORD' => ***** (string)
+		   |  'Pin' => ***** (string)
+		XX,
+	Dumper::toText($obj, [Dumper::KEYS_TO_HIDE => ['password', 'PIN', 'stdClass::$a']]),
+);
 
 
 $snapshot = [];
 Assert::match(
 	'<pre class="tracy-dump tracy-light" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml($obj, [Dumper::KEYS_TO_HIDE => ['password', 'pin'], Dumper::SNAPSHOT => &$snapshot])
+	Dumper::toHtml($obj, [Dumper::KEYS_TO_HIDE => ['password', 'pin'], Dumper::SNAPSHOT => &$snapshot]),
 );
 
 Assert::equal([
diff --git a/tests/Tracy/Dumper.nesting-error.phpt b/tests/Tracy/Dumper.nesting-error.phpt
index c4fcb6887..a13b0e74a 100644
--- a/tests/Tracy/Dumper.nesting-error.phpt
+++ b/tests/Tracy/Dumper.nesting-error.phpt
@@ -12,11 +12,13 @@ require __DIR__ . '/../bootstrap.php';
 
 $a[] = [&$a];
 
-Assert::match(<<<'XX'
-array (1)
-   0 => array (1)
-   |  0 => &1 array (1)
-   |  |  0 => array (1)
-   |  |  |  0 => &1 array (1) RECURSION
-XX
-	, Dumper::toText($a));
+Assert::match(
+	<<<'XX'
+		array (1)
+		   0 => array (1)
+		   |  0 => &1 array (1)
+		   |  |  0 => array (1)
+		   |  |  |  0 => &1 array (1) RECURSION
+		XX,
+	Dumper::toText($a),
+);
diff --git a/tests/Tracy/Dumper.objectExporters.phpt b/tests/Tracy/Dumper.objectExporters.phpt
index 1df74ac29..5a9bb64fd 100644
--- a/tests/Tracy/Dumper.objectExporters.phpt
+++ b/tests/Tracy/Dumper.objectExporters.phpt
@@ -26,15 +26,13 @@ Assert::match('stdClass #%d%
 
 // custom exposer
 $exporters = [
-	'stdClass' => function ($var) {
-		return ['x' => $var->a + 1];
-	},
+	'stdClass' => fn($var) => ['x' => $var->a + 1],
 ];
 Assert::match(
 	'stdClass #%d%
    x: 2
 ',
-	Dumper::toText($obj, [Dumper::OBJECT_EXPORTERS => $exporters])
+	Dumper::toText($obj, [Dumper::OBJECT_EXPORTERS => $exporters]),
 );
 
 
@@ -49,17 +47,19 @@ $exporters = [
 		$value->items[] = ['object', $inner];
 	},
 ];
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-dump-number">3</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">key</span>: <span class="tracy-dump-virtual">hello</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">$x</span>: <span class="tracy-dump-virtual">hello</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">object</span>: <span class="tracy-toggle"><span class="tracy-dump-object">hello</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-dump-string"><span>'</span>b<span>'</span></span>
-</div></div></pre>
-XX
-	, Dumper::toHtml($obj, [Dumper::OBJECT_EXPORTERS => $exporters]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-dump-number">3</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">key</span>: <span class="tracy-dump-virtual">hello</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">$x</span>: <span class="tracy-dump-virtual">hello</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">object</span>: <span class="tracy-toggle"><span class="tracy-dump-object">hello</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-dump-string"><span>'</span>b<span>'</span></span>
+		</div></div></pre>
+		XX,
+	Dumper::toHtml($obj, [Dumper::OBJECT_EXPORTERS => $exporters]),
+);
 
 
 // custom exposer & collapsed
@@ -69,74 +69,90 @@ $exporters = [
 		$value->collapsed = true;
 	},
 ];
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["x","y",0]],"collapsed":true}}'
-><span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":%d%}'><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span></pre>
-XX
-	, Dumper::toHtml($obj, [Dumper::OBJECT_EXPORTERS => $exporters]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["x","y",0]],"collapsed":true}}'
+		><span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":%d%}'><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span></pre>
+		XX,
+	Dumper::toHtml($obj, [Dumper::OBJECT_EXPORTERS => $exporters]),
+);
 
 
 // PHP incomplete class
 $obj = unserialize('O:1:"Y":7:{s:1:"1";N;s:1:"b";i:2;s:4:"' . "\0" . '*' . "\0" . 'c";N;s:4:"' . "\0" . '*' . "\0" . 'd";s:1:"d";s:4:"' . "\0" . 'Y' . "\0" . 'e";N;s:4:"' . "\0" . 'Y' . "\0" . 'i";s:3:"bar";s:4:"' . "\0" . 'X' . "\0" . 'i";s:3:"foo";}');
 
-Assert::match(<<<'XX'
-Y (Incomplete Class) #%d%
-   1: null
-   b: 2
-   c: null
-   d: 'd'
-   e: null
-   i: 'bar'
-   i: 'foo'
-XX
-	, Dumper::toText($obj));
+Assert::match(
+	<<<'XX'
+		Y (Incomplete Class) #%d%
+		   1: null
+		   b: 2
+		   c: null
+		   d: 'd'
+		   e: null
+		   i: 'bar'
+		   i: 'foo'
+		XX,
+	Dumper::toText($obj),
+);
 
 
 
 // inheritance
 Dumper::$objectExporters = [
-	null => function ($var) { return ['type' => 'NULL']; },
-	'Iterator' => function ($var) { return ['type' => 'Default Iterator']; },
+	null => fn($var) => ['type' => 'NULL'],
+	'Iterator' => fn($var) => ['type' => 'Default Iterator'],
 ];
 
 $exporters = [
-	'Iterator' => function ($var) { return ['type' => 'Iterator']; },
-	'SplFileInfo' => function ($var) { return ['type' => 'SplFileInfo']; },
-	'SplFileObject' => function ($var) { return ['type' => 'SplFileObject']; },
+	'Iterator' => fn($var) => ['type' => 'Iterator'],
+	'SplFileInfo' => fn($var) => ['type' => 'SplFileInfo'],
+	'SplFileObject' => fn($var) => ['type' => 'SplFileObject'],
 ];
 
-Assert::match(<<<'XX'
-SplFileInfo #%d%
-   type: 'SplFileInfo'
-XX
-	, Dumper::toText(new SplFileInfo(__FILE__), [Dumper::OBJECT_EXPORTERS => $exporters]));
-
-Assert::match(<<<'XX'
-SplFileObject #%d%
-   type: 'SplFileObject'
-XX
-	, Dumper::toText(new SplFileObject(__FILE__), [Dumper::OBJECT_EXPORTERS => $exporters]));
-
-Assert::match(<<<'XX'
-ArrayIterator #%d%
-   type: 'Iterator'
-XX
-	, Dumper::toText(new ArrayIterator([]), [Dumper::OBJECT_EXPORTERS => $exporters]));
-
-Assert::match(<<<'XX'
-stdClass #%d%
-   type: 'NULL'
-XX
-	, Dumper::toText(new stdClass, [Dumper::OBJECT_EXPORTERS => $exporters]));
-
-Assert::match(<<<'XX'
-ArrayIterator #%d%
-   type: 'Default Iterator'
-XX
-	, Dumper::toText(new ArrayIterator([])));
-
-Assert::match(<<<'XX'
-stdClass #%d%
-   type: 'NULL'
-XX
-	, Dumper::toText(new stdClass));
+Assert::match(
+	<<<'XX'
+		SplFileInfo #%d%
+		   type: 'SplFileInfo'
+		XX,
+	Dumper::toText(new SplFileInfo(__FILE__), [Dumper::OBJECT_EXPORTERS => $exporters]),
+);
+
+Assert::match(
+	<<<'XX'
+		SplFileObject #%d%
+		   type: 'SplFileObject'
+		XX,
+	Dumper::toText(new SplFileObject(__FILE__), [Dumper::OBJECT_EXPORTERS => $exporters]),
+);
+
+Assert::match(
+	<<<'XX'
+		ArrayIterator #%d%
+		   type: 'Iterator'
+		XX,
+	Dumper::toText(new ArrayIterator([]), [Dumper::OBJECT_EXPORTERS => $exporters]),
+);
+
+Assert::match(
+	<<<'XX'
+		stdClass #%d%
+		   type: 'NULL'
+		XX,
+	Dumper::toText(new stdClass, [Dumper::OBJECT_EXPORTERS => $exporters]),
+);
+
+Assert::match(
+	<<<'XX'
+		ArrayIterator #%d%
+		   type: 'Default Iterator'
+		XX,
+	Dumper::toText(new ArrayIterator([])),
+);
+
+Assert::match(
+	<<<'XX'
+		stdClass #%d%
+		   type: 'NULL'
+		XX,
+	Dumper::toText(new stdClass),
+);
diff --git a/tests/Tracy/Dumper.scrubber.phpt b/tests/Tracy/Dumper.scrubber.phpt
index 2f470ca13..567d1910b 100644
--- a/tests/Tracy/Dumper.scrubber.phpt
+++ b/tests/Tracy/Dumper.scrubber.phpt
@@ -24,44 +24,42 @@ $obj = (object) [
 		'bar' => 42,
 	],
 ];
-$scrubber = function (string $k, $v = null): bool {
-	return strtolower($k) === 'pin' || strtolower($k) === 'foo' || $v === 42;
-};
+$scrubber = fn(string $k, $v = null): bool => strtolower($k) === 'pin' || strtolower($k) === 'foo' || $v === 42;
 
 $expect1 = <<<'XX'
-stdClass #%d%
-   a: 456
-   password: 'secret1'
-   PASSWORD: 'secret2'
-   Pin: ***** (string)
-   foo: ***** (string)
-   q: ***** (integer)
-   inner: array (5)
-   |  'a' => 123
-   |  'password' => 'secret4'
-   |  'PASSWORD' => 'secret5'
-   |  'Pin' => ***** (string)
-   |  'bar' => ***** (integer)
-XX;
+	stdClass #%d%
+	   a: 456
+	   password: 'secret1'
+	   PASSWORD: 'secret2'
+	   Pin: ***** (string)
+	   foo: ***** (string)
+	   q: ***** (integer)
+	   inner: array (5)
+	   |  'a' => 123
+	   |  'password' => 'secret4'
+	   |  'PASSWORD' => 'secret5'
+	   |  'Pin' => ***** (string)
+	   |  'bar' => ***** (integer)
+	XX;
 
 Assert::match($expect1, Dumper::toText($obj, [Dumper::SCRUBBER => $scrubber]));
 
 // scrubber works with "keys to hide" (back compatibility)
 $expect2 = <<<'XX'
-stdClass #%d%
-   a: 456
-   password: ***** (string)
-   PASSWORD: ***** (string)
-   Pin: ***** (string)
-   foo: ***** (string)
-   q: ***** (integer)
-   inner: array (5)
-   |  'a' => 123
-   |  'password' => ***** (string)
-   |  'PASSWORD' => ***** (string)
-   |  'Pin' => ***** (string)
-   |  'bar' => ***** (integer)
-XX;
+	stdClass #%d%
+	   a: 456
+	   password: ***** (string)
+	   PASSWORD: ***** (string)
+	   Pin: ***** (string)
+	   foo: ***** (string)
+	   q: ***** (integer)
+	   inner: array (5)
+	   |  'a' => 123
+	   |  'password' => ***** (string)
+	   |  'PASSWORD' => ***** (string)
+	   |  'Pin' => ***** (string)
+	   |  'bar' => ***** (integer)
+	XX;
 Assert::match($expect2, Dumper::toText($obj, [Dumper::SCRUBBER => $scrubber, Dumper::KEYS_TO_HIDE => ['password']]));
 
 
diff --git a/tests/Tracy/Dumper.sensitiveValue.phpt b/tests/Tracy/Dumper.sensitiveValue.phpt
index 33d5d6f24..1e437e43d 100644
--- a/tests/Tracy/Dumper.sensitiveValue.phpt
+++ b/tests/Tracy/Dumper.sensitiveValue.phpt
@@ -15,7 +15,7 @@ require __DIR__ . '/../bootstrap.php';
 function sensitiveParameters(
 	#[SensitiveParameter]
 	string $secret,
-	string $normal
+	string $normal,
 ) {
 	throw new Exception;
 }
@@ -28,21 +28,21 @@ try {
 
 
 $expect = <<<'XX'
-Exception #%d%
-   message: ''
-   string: ''
-   code: 0
-   file: '%a%'
-   line: %d%
-   trace: array (1)
-   |  0 => array (4)
-   |  |  'file' => '%a%'
-   |  |  'line' => %d%
-   |  |  'function' => 'sensitiveParameters'
-   |  |  'args' => array (2)
-   |  |  |  0 => ***** (string)
-   |  |  |  1 => 'normal'
-   previous: null
-XX;
+	Exception #%d%
+	   message: ''
+	   string: ''
+	   code: 0
+	   file: '%a%'
+	   line: %d%
+	   trace: array (1)
+	   |  0 => array (4)
+	   |  |  'file' => '%a%'
+	   |  |  'line' => %d%
+	   |  |  'function' => 'sensitiveParameters'
+	   |  |  'args' => array (2)
+	   |  |  |  0 => ***** (string)
+	   |  |  |  1 => 'normal'
+	   previous: null
+	XX;
 
 Assert::match($expect, Dumper::toText($e));
diff --git a/tests/Tracy/Dumper.toHtml().collapse.phpt b/tests/Tracy/Dumper.toHtml().collapse.phpt
index c8d1b1472..40797e927 100644
--- a/tests/Tracy/Dumper.toHtml().collapse.phpt
+++ b/tests/Tracy/Dumper.toHtml().collapse.phpt
@@ -13,34 +13,42 @@ require __DIR__ . '/../bootstrap.php';
 require __DIR__ . '/fixtures/DumpClass.php';
 
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
-><span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,10],[1,null]]'><span class="tracy-dump-array">array</span> (2)</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test">y</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-number">30.0</span>
-</div></pre>
-XX
-	, Dumper::toHtml(new Test, [Dumper::COLLAPSE_COUNT => 1]));
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
-><span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,10],[1,null]]'><span class="tracy-dump-array">array</span> (2)</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test">y</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-number">30.0</span>
-</div></pre>
-XX
-	, Dumper::toHtml(new Test, [Dumper::COLLAPSE_COUNT => 1, Dumper::COLLAPSE => false]));
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"Test","items":[["x",[[0,10],[1,null]],0],["y","hello","Test"],["z",{"number":"30.0"},1]]}}'
-><span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":%d%}'><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span></pre>
-XX
-	, Dumper::toHtml(new Test, [Dumper::COLLAPSE => true]));
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"Test","items":[["x",[[0,10],[1,null]],0],["y","hello","Test"],["z",{"number":"30.0"},1]]}}'
-><span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":%d%}'><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span></pre>
-XX
-	, Dumper::toHtml(new Test, [Dumper::COLLAPSE => 3]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
+		><span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,10],[1,null]]'><span class="tracy-dump-array">array</span> (2)</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test">y</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-number">30.0</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml(new Test, [Dumper::COLLAPSE_COUNT => 1]),
+);
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
+		><span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,10],[1,null]]'><span class="tracy-dump-array">array</span> (2)</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test">y</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-number">30.0</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml(new Test, [Dumper::COLLAPSE_COUNT => 1, Dumper::COLLAPSE => false]),
+);
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"Test","items":[["x",[[0,10],[1,null]],0],["y","hello","Test"],["z",{"number":"30.0"},1]]}}'
+		><span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":%d%}'><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span></pre>
+		XX,
+	Dumper::toHtml(new Test, [Dumper::COLLAPSE => true]),
+);
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"Test","items":[["x",[[0,10],[1,null]],0],["y","hello","Test"],["z",{"number":"30.0"},1]]}}'
+		><span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":%d%}'><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span></pre>
+		XX,
+	Dumper::toHtml(new Test, [Dumper::COLLAPSE => 3]),
+);
diff --git a/tests/Tracy/Dumper.toHtml().depth.phpt b/tests/Tracy/Dumper.toHtml().depth.phpt
index 3009d4222..355ff6592 100644
--- a/tests/Tracy/Dumper.toHtml().depth.phpt
+++ b/tests/Tracy/Dumper.toHtml().depth.phpt
@@ -31,103 +31,119 @@ $arr = [
 ];
 
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["0",{"ref":%d%},3]]},"%d%":{"object":"stdClass","items":[["hello","world",3]]}}'
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>long<span>'</span></span> => <span class="tracy-dump-string" title="15000 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework <span>…</span>  Framework<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,[["hello","world"]]]]'><span class="tracy-dump-array">array</span> (1)</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>long2<span>'</span></span> => <span class="tracy-dump-string" title="15000 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework <span>…</span>  Framework<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":%d%}'><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-</div></div></pre>
-XX
-	, Dumper::toHtml($arr));
-
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>long<span>'</span></span> => <span class="tracy-dump-string" title="15000 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,[["hello","world"]]]]'><span class="tracy-dump-array">array</span> (1)</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>long2<span>'</span></span> => <span class="tracy-dump-string" title="15000 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span> …
-</div></pre>
-XX
-	, Dumper::toHtml($arr, [Dumper::DEPTH => 0, Dumper::TRUNCATE => 0]));
-
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>long<span>'</span></span> => <span class="tracy-dump-string" title="15000 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette <span>…</span>  Framework<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-array">array</span> (1) …
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>long2<span>'</span></span> => <span class="tracy-dump-string" title="15000 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette <span>…</span>  Framework<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span> …
-</div></div></pre>
-XX
-	, Dumper::toHtml($arr, [Dumper::DEPTH => 2, Dumper::TRUNCATE => 50]));
-
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-dump-string" title="150 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework<span>'</span></span></pre>
-XX
-	, Dumper::toHtml(str_repeat('Nette Framework', 10), [Dumper::TRUNCATE => 50]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["0",{"ref":%d%},3]]},"%d%":{"object":"stdClass","items":[["hello","world",3]]}}'
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>long<span>'</span></span> => <span class="tracy-dump-string" title="15000 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework <span>…</span>  Framework<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,[["hello","world"]]]]'><span class="tracy-dump-array">array</span> (1)</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>long2<span>'</span></span> => <span class="tracy-dump-string" title="15000 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework <span>…</span>  Framework<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":%d%}'><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		</div></div></pre>
+		XX,
+	Dumper::toHtml($arr),
+);
+
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>long<span>'</span></span> => <span class="tracy-dump-string" title="15000 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,[["hello","world"]]]]'><span class="tracy-dump-array">array</span> (1)</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>long2<span>'</span></span> => <span class="tracy-dump-string" title="15000 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span> …
+		</div></pre>
+		XX,
+	Dumper::toHtml($arr, [Dumper::DEPTH => 0, Dumper::TRUNCATE => 0]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>long<span>'</span></span> => <span class="tracy-dump-string" title="15000 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette <span>…</span>  Framework<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-array">array</span> (1) …
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>long2<span>'</span></span> => <span class="tracy-dump-string" title="15000 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette <span>…</span>  Framework<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span> …
+		</div></div></pre>
+		XX,
+	Dumper::toHtml($arr, [Dumper::DEPTH => 2, Dumper::TRUNCATE => 50]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-dump-string" title="150 characters"><span>'</span>Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework<span>'</span></span></pre>
+		XX,
+	Dumper::toHtml(str_repeat('Nette Framework', 10), [Dumper::TRUNCATE => 50]),
+);
 
 
 $arr = [1, 2, 3, 4];
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-number">4</span>
-</div></pre>
-XX
-	, Dumper::toHtml($arr, [Dumper::ITEMS => 0]));
-
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-number">4</span>
-</div></pre>
-XX
-	, Dumper::toHtml($arr, [Dumper::ITEMS => 2]));
-
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">2</span>: <span class="tracy-dump-number">3</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">3</span>: <span class="tracy-dump-number">4</span>
-</div></pre>
-XX
-	, Dumper::toHtml((object) $arr, [Dumper::ITEMS => 2]));
-
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   |  </span>…
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   |  </span>…
-</div></div></pre>
-XX
-	, Dumper::toHtml([$arr, (object) $arr], [Dumper::ITEMS => 2]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-number">4</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml($arr, [Dumper::ITEMS => 0]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-number">4</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml($arr, [Dumper::ITEMS => 2]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">2</span>: <span class="tracy-dump-number">3</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">3</span>: <span class="tracy-dump-number">4</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml((object) $arr, [Dumper::ITEMS => 2]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   |  </span>…
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   |  </span>…
+		</div></div></pre>
+		XX,
+	Dumper::toHtml([$arr, (object) $arr], [Dumper::ITEMS => 2]),
+);
diff --git a/tests/Tracy/Dumper.toHtml().key.phpt b/tests/Tracy/Dumper.toHtml().key.phpt
index 8952f744b..07618db8e 100644
--- a/tests/Tracy/Dumper.toHtml().key.phpt
+++ b/tests/Tracy/Dumper.toHtml().key.phpt
@@ -11,10 +11,10 @@ require __DIR__ . '/../bootstrap.php';
 
 Assert::match(
 	'<pre class="tracy-dump tracy-light"><span class="tracy-dump-number">123</span></pre>',
-	Dumper::toHtml(123, [Dumper::KEYS_TO_HIDE => ['password', 'pin']], 'pass')
+	Dumper::toHtml(123, [Dumper::KEYS_TO_HIDE => ['password', 'pin']], 'pass'),
 );
 
 Assert::match(
 	'<pre class="tracy-dump tracy-light"><span class="tracy-dump-virtual">***** (integer)</span></pre>',
-	Dumper::toHtml(123, [Dumper::KEYS_TO_HIDE => ['password', 'pin']], 'password')
+	Dumper::toHtml(123, [Dumper::KEYS_TO_HIDE => ['password', 'pin']], 'password'),
 );
diff --git a/tests/Tracy/Dumper.toHtml().lazy.auto.phpt b/tests/Tracy/Dumper.toHtml().lazy.auto.phpt
index b194bb0d8..02e6494dc 100644
--- a/tests/Tracy/Dumper.toHtml().lazy.auto.phpt
+++ b/tests/Tracy/Dumper.toHtml().lazy.auto.phpt
@@ -14,95 +14,109 @@ require __DIR__ . '/../bootstrap.php';
 
 // depth
 $arr = [1, [2, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', [3, [4, [5, [6]]]]]], 3];
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (3)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,"a"],[1,"b"],[2,"c"],[3,"d"],[4,"e"],[5,"f"],[6,"g"],[7,"h"],[8,[[0,3],[1,{"array":null,"length":2}]]]]'><span class="tracy-dump-array">array</span> (9)</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
-</div></pre>
-XX
-	, Dumper::toHtml($arr, [Dumper::DEPTH => 4]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (3)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,"a"],[1,"b"],[2,"c"],[3,"d"],[4,"e"],[5,"f"],[6,"g"],[7,"h"],[8,[[0,3],[1,{"array":null,"length":2}]]]]'><span class="tracy-dump-array">array</span> (9)</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml($arr, [Dumper::DEPTH => 4]),
+);
 
 $obj = new stdClass;
 $obj->items = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'];
 $obj->items['x'] = new stdClass;
 $obj->items['x']->b = new stdClass;
 $obj->items['x']->b->c = new stdClass;
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["b",{"ref":%d%},3]]},"%d%":{"object":"stdClass","items":[["c",{"ref":%d%},3]]},"%d%":{"object":"stdClass"}}'
-><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">items</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,"a"],[1,"b"],[2,"c"],[3,"d"],[4,"e"],[5,"f"],[6,"g"],[7,"h"],["x",{"ref":%d%}]]'><span class="tracy-dump-array">array</span> (9)</span>
-</div></pre>
-XX
-	, Dumper::toHtml($obj, [Dumper::DEPTH => 4]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["b",{"ref":%d%},3]]},"%d%":{"object":"stdClass","items":[["c",{"ref":%d%},3]]},"%d%":{"object":"stdClass"}}'
+		><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">items</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,"a"],[1,"b"],[2,"c"],[3,"d"],[4,"e"],[5,"f"],[6,"g"],[7,"h"],["x",{"ref":%d%}]]'><span class="tracy-dump-array">array</span> (9)</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml($obj, [Dumper::DEPTH => 4]),
+);
 
 
 // recursion
 $arr = [1, 2, 3, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']];
 $arr[3][] = &$arr;
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"p1":{"array":null,"items":[[0,1],[1,2],[2,3],[3,[[0,"a"],[1,"b"],[2,"c"],[3,"d"],[4,"e"],[5,"f"],[6,"g"],[7,"h"],[8,{"ref":"p1"},1]]]]}}'
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,"a"],[1,"b"],[2,"c"],[3,"d"],[4,"e"],[5,"f"],[6,"g"],[7,"h"],[8,{"ref":"p1"},1]]'><span class="tracy-dump-array">array</span> (9)</span>
-</div></pre>
-XX
-	, Dumper::toHtml($arr));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"p1":{"array":null,"items":[[0,1],[1,2],[2,3],[3,[[0,"a"],[1,"b"],[2,"c"],[3,"d"],[4,"e"],[5,"f"],[6,"g"],[7,"h"],[8,{"ref":"p1"},1]]]]}}'
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,"a"],[1,"b"],[2,"c"],[3,"d"],[4,"e"],[5,"f"],[6,"g"],[7,"h"],[8,{"ref":"p1"},1]]'><span class="tracy-dump-array">array</span> (9)</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml($arr),
+);
 
 $obj = new stdClass;
 $obj->items = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', $obj];
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["items",[[0,"a"],[1,"b"],[2,"c"],[3,"d"],[4,"e"],[5,"f"],[6,"g"],[7,"h"],[8,{"ref":%d%}]],3]]}}'
-><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">items</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,"a"],[1,"b"],[2,"c"],[3,"d"],[4,"e"],[5,"f"],[6,"g"],[7,"h"],[8,{"ref":%d%}]]'><span class="tracy-dump-array">array</span> (9)</span>
-</div></pre>
-XX
-	, Dumper::toHtml($obj));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["items",[[0,"a"],[1,"b"],[2,"c"],[3,"d"],[4,"e"],[5,"f"],[6,"g"],[7,"h"],[8,{"ref":%d%}]],3]]}}'
+		><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">items</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,"a"],[1,"b"],[2,"c"],[3,"d"],[4,"e"],[5,"f"],[6,"g"],[7,"h"],[8,{"ref":%d%}]]'><span class="tracy-dump-array">array</span> (9)</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml($obj),
+);
 
 // recursion fix
 $arr = [new stdClass, 'arr' => [1, 2, 3, 4, 5, 6]];
 $obj = (object) $arr;
 $obj->arr[] = $obj;
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["0",{"ref":%d%},3],["arr",[[0,1],[1,2],[2,3],[3,4],[4,5],[5,6],[6,{"ref":%d%}]],3]]},"%d%":{"object":"stdClass","items":[]}}'
-><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">arr</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,1],[1,2],[2,3],[3,4],[4,5],[5,6],[6,{"ref":%d%}]]'><span class="tracy-dump-array">array</span> (7)</span>
-</div></pre>
-XX
-	, Dumper::toHtml($obj));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["0",{"ref":%d%},3],["arr",[[0,1],[1,2],[2,3],[3,4],[4,5],[5,6],[6,{"ref":%d%}]],3]]},"%d%":{"object":"stdClass","items":[]}}'
+		><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">arr</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[0,1],[1,2],[2,3],[3,4],[4,5],[5,6],[6,{"ref":%d%}]]'><span class="tracy-dump-array">array</span> (7)</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml($obj),
+);
 
 
 // lazy dump & max items
 $arr = [1, 2, 3, 4, 5, 6, 7, 8];
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"array":null,"length":8,"items":[[0,1],[1,2],[2,3],[3,4],[4,5]]}'><span class="tracy-dump-array">array</span> (8)</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">2</span>: <span class="tracy-dump-number">3</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">3</span>: <span class="tracy-dump-number">4</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">4</span>: <span class="tracy-dump-number">5</span>
-<span class="tracy-dump-indent">   |  </span>…
-</div></div></pre>
-XX
-	, Dumper::toHtml([$arr, (object) $arr], [Dumper::ITEMS => 5]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"array":null,"length":8,"items":[[0,1],[1,2],[2,3],[3,4],[4,5]]}'><span class="tracy-dump-array">array</span> (8)</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">2</span>: <span class="tracy-dump-number">3</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">3</span>: <span class="tracy-dump-number">4</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">4</span>: <span class="tracy-dump-number">5</span>
+		<span class="tracy-dump-indent">   |  </span>…
+		</div></div></pre>
+		XX,
+	Dumper::toHtml([$arr, (object) $arr], [Dumper::ITEMS => 5]),
+);
 
 
 // lazy dump & max items & reference
 $arr = [1, 2, 3, 4, 5, 6, 7, 8];
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"p1":{"array":null,"length":8,"items":[[0,1],[1,2],[2,3],[3,4],[4,5]]}}'
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":"p1"}'><span class="tracy-dump-array">array</span> (8)</span>
-</div></pre>
-XX
-	, Dumper::toHtml([&$arr], [Dumper::ITEMS => 5]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"p1":{"array":null,"length":8,"items":[[0,1],[1,2],[2,3],[3,4],[4,5]]}}'
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":"p1"}'><span class="tracy-dump-array">array</span> (8)</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml([&$arr], [Dumper::ITEMS => 5]),
+);
diff --git a/tests/Tracy/Dumper.toHtml().lazy.no.phpt b/tests/Tracy/Dumper.toHtml().lazy.no.phpt
index 76db56ea6..18891fa52 100644
--- a/tests/Tracy/Dumper.toHtml().lazy.no.phpt
+++ b/tests/Tracy/Dumper.toHtml().lazy.no.phpt
@@ -26,109 +26,123 @@ Assert::match('<pre class="tracy-dump"><span class="tracy-dump-array">array</spa
 
 
 // no lazy dump of array
-Assert::match(<<<'XX'
-<pre class="tracy-dump"
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (11)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-null">null</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-bool">true</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-bool">false</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-number">0</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">4</span> => <span class="tracy-dump-number">0.0</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">5</span> => <span class="tracy-dump-string" title="6 characters"><span>'</span>string<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">6</span> => <span class="tracy-dump-string" title="3 characters"><span>'</span>'&amp;"<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">7</span> => <span class="tracy-dump-string"><span>'</span><i>\x00</i><span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">8</span> => <span class="tracy-dump-number">INF</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">9</span> => <span class="tracy-dump-number">-INF</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">10</span> => <span class="tracy-dump-number">NAN</span>
-</div></pre>
-XX
-	, Dumper::toHtml([null, true, false, 0, 0.0, 'string', "'&\"", "\x00", INF, -INF, NAN], $options));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump"
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (11)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-null">null</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-bool">true</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-bool">false</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-number">0</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">4</span> => <span class="tracy-dump-number">0.0</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">5</span> => <span class="tracy-dump-string" title="6 characters"><span>'</span>string<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">6</span> => <span class="tracy-dump-string" title="3 characters"><span>'</span>'&amp;"<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">7</span> => <span class="tracy-dump-string"><span>'</span><i>\x00</i><span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">8</span> => <span class="tracy-dump-number">INF</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">9</span> => <span class="tracy-dump-number">-INF</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">10</span> => <span class="tracy-dump-number">NAN</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml([null, true, false, 0, 0.0, 'string', "'&\"", "\x00", INF, -INF, NAN], $options),
+);
 
 
 // no lazy dump and resource
-Assert::match(<<<'XX'
-<pre class="tracy-dump"
-><span class="tracy-toggle tracy-collapsed"><span class="tracy-dump-resource">stream resource</span> <span class="tracy-dump-hash">@%d%</span></span>
-<div class="tracy-collapsed">%A%
-XX
-	, Dumper::toHtml(fopen(__FILE__, 'r'), $options));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump"
+		><span class="tracy-toggle tracy-collapsed"><span class="tracy-dump-resource">stream resource</span> <span class="tracy-dump-hash">@%d%</span></span>
+		<div class="tracy-collapsed">%A%
+		XX,
+	Dumper::toHtml(fopen(__FILE__, 'r'), $options),
+);
 
 
 // no lazy dump and collapse
-Assert::match(<<<'XX'
-<pre class="tracy-dump"
-><span class="tracy-toggle tracy-collapsed"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div class="tracy-collapsed"><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">10</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-null">null</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test">y</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-number">30.0</span>
-</div></pre>
-XX
-	, Dumper::toHtml(new Test, $options + [Dumper::COLLAPSE => true]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump"
+		><span class="tracy-toggle tracy-collapsed"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div class="tracy-collapsed"><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">10</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-null">null</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test">y</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-number">30.0</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml(new Test, $options + [Dumper::COLLAPSE => true]),
+);
 
 
 // no lazy dump & location
-Assert::match(<<<'XX'
-<pre class="tracy-dump"
-><a href="editor://open/?file=%a%&amp;line=%d%&amp;search=&amp;replace=" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml(new Test, $options + ['location' => <span>…</span> N_CLASS])) 📍</a
-><span class="tracy-toggle"><span class="tracy-dump-object" title="Declared in file %a% on line %d%&#10;Ctrl-Click to open in editor&#10;Alt-Click to expand/collapse all child nodes" data-tracy-href="editor://open/?file=%a%&amp;line=%d%&amp;search=&amp;replace=">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">10</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-null">null</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test">y</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-number">30.0</span>
-</div></pre>
-XX
-	, Dumper::toHtml(new Test, $options + ['location' => Dumper::LOCATION_SOURCE | Dumper::LOCATION_CLASS]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump"
+		><a href="editor://open/?file=%a%&amp;line=%d%&amp;search=&amp;replace=" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml(new Test, $options + ['location' => <span>…</span> ON_CLASS]) 📍</a
+		><span class="tracy-toggle"><span class="tracy-dump-object" title="Declared in file %a% on line %d%&#10;Ctrl-Click to open in editor&#10;Alt-Click to expand/collapse all child nodes" data-tracy-href="editor://open/?file=%a%&amp;line=%d%&amp;search=&amp;replace=">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">10</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-null">null</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test">y</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-number">30.0</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml(new Test, $options + ['location' => Dumper::LOCATION_SOURCE | Dumper::LOCATION_CLASS]),
+);
 
 
 // recursion
 $arr = [1, 2, 3];
 $arr[] = &$arr;
-Assert::match(<<<'XX'
-<pre class="tracy-dump"
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-array">array</span> (4) <i>RECURSION</i>
-</div></div></pre>
-XX
-	, Dumper::toHtml($arr, $options));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump"
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-array">array</span> (4) <i>RECURSION</i>
+		</div></div></pre>
+		XX,
+	Dumper::toHtml($arr, $options),
+);
 
 $obj = new stdClass;
 $obj->x = $obj;
-Assert::match(<<<'XX'
-<pre class="tracy-dump"
-><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">x</span>: <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span> <i>RECURSION</i>
-</div></pre>
-XX
-	, Dumper::toHtml($obj, $options));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump"
+		><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">x</span>: <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span> <i>RECURSION</i>
+		</div></pre>
+		XX,
+	Dumper::toHtml($obj, $options),
+);
 
 
 // max depth
 $arr = [1, [2, [3, [4, [5, [6]]]]], 3];
-Assert::match(<<<'XX'
-<pre class="tracy-dump"
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (3)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">3</span>
-<span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">4</span>
-<span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-array">array</span> (2) …
-</div></div></div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
-</div></pre>
-XX
-	, Dumper::toHtml($arr, $options + [Dumper::DEPTH => 4]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump"
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (3)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">3</span>
+		<span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">4</span>
+		<span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-array">array</span> (2) …
+		</div></div></div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml($arr, $options + [Dumper::DEPTH => 4]),
+);
 
 $obj = new stdClass;
 $obj->a = new stdClass;
@@ -136,13 +150,15 @@ $obj->a->b = new stdClass;
 $obj->a->b->c = new stdClass;
 $obj->a->b->c->d = new stdClass;
 $obj->a->b->c->d->e = new stdClass;
-Assert::match(<<<'XX'
-<pre class="tracy-dump"
-><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">a</span>: <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">b</span>: <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-dynamic">c</span>: <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-dynamic">d</span>: <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span> …
-</div></div></div></div></pre>
-XX
-	, Dumper::toHtml($obj, $options + [Dumper::DEPTH => 4]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump"
+		><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">a</span>: <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">b</span>: <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-dynamic">c</span>: <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-dynamic">d</span>: <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span> …
+		</div></div></div></div></pre>
+		XX,
+	Dumper::toHtml($obj, $options + [Dumper::DEPTH => 4]),
+);
diff --git a/tests/Tracy/Dumper.toHtml().lazy.phpt b/tests/Tracy/Dumper.toHtml().lazy.phpt
index 60fb1c903..a515e6c00 100644
--- a/tests/Tracy/Dumper.toHtml().lazy.phpt
+++ b/tests/Tracy/Dumper.toHtml().lazy.phpt
@@ -26,77 +26,97 @@ Assert::match('<pre class="tracy-dump"><span class="tracy-dump-array">array</spa
 
 
 // lazy dump of array
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-snapshot='[]' data-tracy-dump='[[0,null],[1,true],[2,false],[3,"string"],[4,{"string":"\u0027\u0026amp;\"","length":3}],[5,{"string":"<i>\\x00</i>","length":1}]]'></pre>
-XX
-	, Dumper::toHtml([null, true, false, 'string', "'&\"", "\x00"], $options));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-snapshot='[]' data-tracy-dump='[[0,null],[1,true],[2,false],[3,"string"],[4,{"string":"\u0027\u0026amp;\"","length":3}],[5,{"string":"<i>\\x00</i>","length":1}]]'></pre>
+		XX,
+	Dumper::toHtml([null, true, false, 'string', "'&\"", "\x00"], $options),
+);
 
 
 // lazy dump of numbers
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-snapshot='[]' data-tracy-dump='[[0,0],[1,{"number":"0.0"}],[2,1],[3,{"number":"1.0"}],[4,{"number":"9007199254740999"}],[5,{"number":"-9007199254740999"}],[6,{"number":"INF"}],[7,{"number":"-INF"}],[8,{"number":"NAN"}]]'></pre>
-XX
-	, Dumper::toHtml([0, 0.0, 1, 1.0, 9007199254740999, -9007199254740999, INF, -INF, NAN], $options));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-snapshot='[]' data-tracy-dump='[[0,0],[1,{"number":"0.0"}],[2,1],[3,{"number":"1.0"}],[4,{"number":"9007199254740999"}],[5,{"number":"-9007199254740999"}],[6,{"number":"INF"}],[7,{"number":"-INF"}],[8,{"number":"NAN"}]]'></pre>
+		XX,
+	Dumper::toHtml([0, 0.0, 1, 1.0, 9_007_199_254_740_999, -9_007_199_254_740_999, INF, -INF, NAN], $options),
+);
 
 
 // live dump of object
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[]}}' data-tracy-dump='{"ref":%d%}'></pre>
-XX
-	, Dumper::toHtml(new stdClass, $options));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[]}}' data-tracy-dump='{"ref":%d%}'></pre>
+		XX,
+	Dumper::toHtml(new stdClass, $options),
+);
 
 // twice with different identity
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[]}}' data-tracy-dump='{"ref":%d%}'></pre>
-XX
-	, Dumper::toHtml(new stdClass, $options)); // different object
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[]}}' data-tracy-dump='{"ref":%d%}'></pre>
+		XX,
+	Dumper::toHtml(new stdClass, $options),
+); // different object
 
 
-	// lazy dump and resource
-	Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-snapshot='{"r%d%":{"resource":"stream resource","items":[%a%]}}' data-tracy-dump='{"ref":"r%d%"}'></pre>
-XX
-		, Dumper::toHtml(fopen(__FILE__, 'r'), $options));
+// lazy dump and resource
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-snapshot='{"r%d%":{"resource":"stream resource","items":[%a%]}}' data-tracy-dump='{"ref":"r%d%"}'></pre>
+		XX,
+	Dumper::toHtml(fopen(__FILE__, 'r'), $options),
+);
 
 
 // lazy dump and collapse
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-collapsed" data-tracy-snapshot='{"%d%":{"object":"Test","items":[["x",[[0,10],[1,null]],0],["y","hello","Test"],["z",{"number":"30.0"},1]]}}' data-tracy-dump='{"ref":%d%}'></pre>
-XX
-	, Dumper::toHtml(new Test, $options + [Dumper::COLLAPSE => true]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-collapsed" data-tracy-snapshot='{"%d%":{"object":"Test","items":[["x",[[0,10],[1,null]],0],["y","hello","Test"],["z",{"number":"30.0"},1]]}}' data-tracy-dump='{"ref":%d%}'></pre>
+		XX,
+	Dumper::toHtml(new Test, $options + [Dumper::COLLAPSE => true]),
+);
 
 
 // lazy dump & location
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-snapshot='{"%d%":{"object":"Test","editor":{"file":"%a%","line":%d%,"url":"editor://open/?file=%a%\u0026line=%d%\u0026search=\u0026replace="},"items":[["x",[[0,10],[1,null]],0],["y","hello","Test"],["z",{"number":"30.0"},1]]}}' data-tracy-dump='{"ref":%d%}'
-><a href="editor://open/?file=%a%&amp;line=%d%&amp;search=&amp;replace=" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml(new Test, $options + ['location' => <span>…</span> N_CLASS])) 📍</a
-></pre>
-XX
-	, Dumper::toHtml(new Test, $options + ['location' => Dumper::LOCATION_SOURCE | Dumper::LOCATION_CLASS]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-snapshot='{"%d%":{"object":"Test","editor":{"file":"%a%","line":%d%,"url":"editor://open/?file=%a%\u0026line=%d%\u0026search=\u0026replace="},"items":[["x",[[0,10],[1,null]],0],["y","hello","Test"],["z",{"number":"30.0"},1]]}}' data-tracy-dump='{"ref":%d%}'
+		><a href="editor://open/?file=%a%&amp;line=%d%&amp;search=&amp;replace=" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml(new Test, $options + ['location' => <span>…</span> ON_CLASS]) 📍</a
+		></pre>
+		XX,
+	Dumper::toHtml(new Test, $options + ['location' => Dumper::LOCATION_SOURCE | Dumper::LOCATION_CLASS]),
+);
 
 
 // lazy dump & recursion
 $arr = [1, 2, 3];
 $arr[] = &$arr;
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-snapshot='{"p1":{"array":null,"items":[[0,1],[1,2],[2,3],[3,{"ref":"p1"},1]]}}' data-tracy-dump='[[0,1],[1,2],[2,3],[3,{"ref":"p1"},1]]'></pre>
-XX
-	, Dumper::toHtml($arr, $options));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-snapshot='{"p1":{"array":null,"items":[[0,1],[1,2],[2,3],[3,{"ref":"p1"},1]]}}' data-tracy-dump='[[0,1],[1,2],[2,3],[3,{"ref":"p1"},1]]'></pre>
+		XX,
+	Dumper::toHtml($arr, $options),
+);
 
 $obj = new stdClass;
 $obj->x = $obj;
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["x",{"ref":%d%},3]]}}' data-tracy-dump='{"ref":%d%}'></pre>
-XX
-	, Dumper::toHtml($obj, $options));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["x",{"ref":%d%},3]]}}' data-tracy-dump='{"ref":%d%}'></pre>
+		XX,
+	Dumper::toHtml($obj, $options),
+);
 
 
 // lazy dump & max depth
 $arr = [1, [2, [3, [4, [5, [6]]]]], 3];
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-snapshot='[]' data-tracy-dump='[[0,1],[1,[[0,2],[1,[[0,3],[1,[[0,4],[1,{"array":null,"length":2}]]]]]]],[2,3]]'></pre>
-XX
-	, Dumper::toHtml($arr, $options + [Dumper::DEPTH => 4]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-snapshot='[]' data-tracy-dump='[[0,1],[1,[[0,2],[1,[[0,3],[1,[[0,4],[1,{"array":null,"length":2}]]]]]]],[2,3]]'></pre>
+		XX,
+	Dumper::toHtml($arr, $options + [Dumper::DEPTH => 4]),
+);
 
 $obj = new stdClass;
 $obj->a = new stdClass;
@@ -104,23 +124,29 @@ $obj->a->b = new stdClass;
 $obj->a->b->c = new stdClass;
 $obj->a->b->c->d = new stdClass;
 $obj->a->b->c->d->e = new stdClass;
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["a",{"ref":%d%},3]]},"%d%":{"object":"stdClass","items":[["b",{"ref":%d%},3]]},"%d%":{"object":"stdClass","items":[["c",{"ref":%d%},3]]},"%d%":{"object":"stdClass","items":[["d",{"ref":%d%},3]]},"%d%":{"object":"stdClass"}}' data-tracy-dump='{"ref":%d%}'></pre>
-XX
-	, Dumper::toHtml($obj, $options + [Dumper::DEPTH => 4]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["a",{"ref":%d%},3]]},"%d%":{"object":"stdClass","items":[["b",{"ref":%d%},3]]},"%d%":{"object":"stdClass","items":[["c",{"ref":%d%},3]]},"%d%":{"object":"stdClass","items":[["d",{"ref":%d%},3]]},"%d%":{"object":"stdClass"}}' data-tracy-dump='{"ref":%d%}'></pre>
+		XX,
+	Dumper::toHtml($obj, $options + [Dumper::DEPTH => 4]),
+);
 
 
 // lazy dump & max string length
 $arr = [str_repeat('x', 80)];
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-snapshot='[]' data-tracy-dump='[[0,{"string":"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx <span>…</span> xxxxxxxxxx","length":80}]]'></pre>
-XX
-	, Dumper::toHtml($arr, $options + [Dumper::TRUNCATE => 50]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-snapshot='[]' data-tracy-dump='[[0,{"string":"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx <span>…</span> xxxxxxxxxx","length":80}]]'></pre>
+		XX,
+	Dumper::toHtml($arr, $options + [Dumper::TRUNCATE => 50]),
+);
 
 
 // lazy dump & max items
 $arr = [1, 2, 3, 4, 5, 6, 7, 8];
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-snapshot='{"%d%":{"object":"stdClass","length":8,"items":[["0",1,3],["1",2,3],["2",3,3],["3",4,3],["4",5,3]]}}' data-tracy-dump='[[0,{"array":null,"length":8,"items":[[0,1],[1,2],[2,3],[3,4],[4,5]]}],[1,{"ref":%d%}]]'></pre>
-XX
-	, Dumper::toHtml([$arr, (object) $arr], $options + [Dumper::ITEMS => 5]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-snapshot='{"%d%":{"object":"stdClass","length":8,"items":[["0",1,3],["1",2,3],["2",3,3],["3",4,3],["4",5,3]]}}' data-tracy-dump='[[0,{"array":null,"length":8,"items":[[0,1],[1,2],[2,3],[3,4],[4,5]]}],[1,{"ref":%d%}]]'></pre>
+		XX,
+	Dumper::toHtml([$arr, (object) $arr], $options + [Dumper::ITEMS => 5]),
+);
diff --git a/tests/Tracy/Dumper.toHtml().live.phpt b/tests/Tracy/Dumper.toHtml().live.phpt
index 6743fa22c..25e946304 100644
--- a/tests/Tracy/Dumper.toHtml().live.phpt
+++ b/tests/Tracy/Dumper.toHtml().live.phpt
@@ -36,20 +36,20 @@ Assert::same([], Dumper::$liveSnapshot[0]);
 // live dump of array
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'[[0,null],[1,true],[2,false],[3,0],[4,{"number":"0.0"}],[5,"string"],[6,{"string":"\u0027\u0026amp;\"","length":3}],[7,{"string":"<i>\\\\x00</i>","length":1}],[8,{"number":"INF"}],[9,{"number":"-INF"}],[10,{"number":"NAN"}]]\'></pre>',
-	Dumper::toHtml([null, true, false, 0, 0.0, 'string', "'&\"", "\x00", INF, -INF, NAN], $options)
+	Dumper::toHtml([null, true, false, 0, 0.0, 'string', "'&\"", "\x00", INF, -INF, NAN], $options),
 );
 
 
 // live dump of object
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml(new stdClass, $options)
+	Dumper::toHtml(new stdClass, $options),
 );
 
 // twice with different identity
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml(new stdClass, $options) // different object
+	Dumper::toHtml(new stdClass, $options), // different object
 );
 Assert::equal([
 	['object' => 'stdClass', 'items' => []],
@@ -65,7 +65,7 @@ Assert::match('<pre class="tracy-dump"><span class="tracy-dump-null">null</span>
 Dumper::$liveSnapshot = [];
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'{"ref":"r%d%"}\'></pre>',
-	Dumper::toHtml(fopen(__FILE__, 'r'), $options)
+	Dumper::toHtml(fopen(__FILE__, 'r'), $options),
 );
 Assert::count(1, Dumper::$liveSnapshot[0]);
 
@@ -74,7 +74,7 @@ Assert::count(1, Dumper::$liveSnapshot[0]);
 Dumper::$liveSnapshot = [];
 Assert::match(
 	'<pre class="tracy-dump tracy-collapsed" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml(new Test, $options + [Dumper::COLLAPSE => true])
+	Dumper::toHtml(new Test, $options + [Dumper::COLLAPSE => true]),
 );
 
 
@@ -82,7 +82,7 @@ Assert::match(
 Dumper::$liveSnapshot = [];
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml(new Test, $options)
+	Dumper::toHtml(new Test, $options),
 );
 
 Assert::equal([
@@ -99,12 +99,14 @@ Assert::equal([
 
 // live dump & location
 Dumper::$liveSnapshot = [];
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-dump='{"ref":%d%}'
-><a href="editor://open/?file=%a%&amp;line=%d%&amp;search=&amp;replace=" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml(new Test, $options + ['location' => <span>…</span> N_CLASS])) 📍</a
-></pre>
-XX
-	, Dumper::toHtml(new Test, $options + ['location' => Dumper::LOCATION_SOURCE | Dumper::LOCATION_CLASS]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-dump='{"ref":%d%}'
+		><a href="editor://open/?file=%a%&amp;line=%d%&amp;search=&amp;replace=" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml(new Test, $options + ['location' => <span>…</span> ON_CLASS]) 📍</a
+		></pre>
+		XX,
+	Dumper::toHtml(new Test, $options + ['location' => Dumper::LOCATION_SOURCE | Dumper::LOCATION_CLASS]),
+);
 
 Assert::equal([
 	[
@@ -129,7 +131,7 @@ $arr = [1, 2, 3];
 $arr[] = &$arr;
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'[[0,1],[1,2],[2,3],[3,{"ref":"p1"},1]]\'></pre>',
-	Dumper::toHtml($arr, $options)
+	Dumper::toHtml($arr, $options),
 );
 Assert::equal([
 	[
@@ -143,7 +145,7 @@ $obj = new stdClass;
 $obj->x = $obj;
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml($obj, $options)
+	Dumper::toHtml($obj, $options),
 );
 
 
@@ -152,7 +154,7 @@ Dumper::$liveSnapshot = [];
 $arr = [1, [2, [3, [4, [5, [6]]]]], 3];
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'[[0,1],[1,[[0,2],[1,[[0,3],[1,[[0,4],[1,{"array":null,"length":2}]]]]]]],[2,3]]\'></pre>',
-	Dumper::toHtml($arr, $options + [Dumper::DEPTH => 4])
+	Dumper::toHtml($arr, $options + [Dumper::DEPTH => 4]),
 );
 Assert::same([], Dumper::$liveSnapshot[0]);
 
@@ -160,7 +162,7 @@ Assert::same([], Dumper::$liveSnapshot[0]);
 $arr = [1, [2, [3, [4, []]]], 3];
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'[[0,1],[1,[[0,2],[1,[[0,3],[1,[[0,4],[1,[]]]]]]]],[2,3]]\'></pre>',
-	Dumper::toHtml($arr, $options + [Dumper::DEPTH => 4])
+	Dumper::toHtml($arr, $options + [Dumper::DEPTH => 4]),
 );
 Assert::same([], Dumper::$liveSnapshot[0]);
 
@@ -173,5 +175,5 @@ $obj->a->b->c->d = new stdClass;
 $obj->a->b->c->d->e = new stdClass;
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml($obj, $options + [Dumper::DEPTH => 4])
+	Dumper::toHtml($obj, $options + [Dumper::DEPTH => 4]),
 );
diff --git a/tests/Tracy/Dumper.toHtml().locale.phpt b/tests/Tracy/Dumper.toHtml().locale.phpt
index 03c300560..8447ac1ae 100644
--- a/tests/Tracy/Dumper.toHtml().locale.phpt
+++ b/tests/Tracy/Dumper.toHtml().locale.phpt
@@ -14,11 +14,13 @@ require __DIR__ . '/../bootstrap.php';
 
 setlocale(LC_ALL, 'czech');
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">-10.0</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">10.3</span>
-</div></pre>
-XX
-	, Dumper::toHtml([-10.0, 10.3]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">-10.0</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">10.3</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml([-10.0, 10.3]),
+);
diff --git a/tests/Tracy/Dumper.toHtml().location.phpt b/tests/Tracy/Dumper.toHtml().location.phpt
index 8a5c980eb..1044100e8 100644
--- a/tests/Tracy/Dumper.toHtml().location.phpt
+++ b/tests/Tracy/Dumper.toHtml().location.phpt
@@ -15,44 +15,54 @@ require __DIR__ . '/../bootstrap.php';
 Assert::same("</pre>\n", substr(Dumper::toHtml(true, ['location' => true]), -7));
 
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><a href="editor:%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml([1], ['location' => true])) 📍</a
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-</div></pre>
-XX
-	, Dumper::toHtml([1], ['location' => true]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><a href="editor:%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml([1], ['location' => true]) 📍</a
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml([1], ['location' => true]),
+);
 
 
 class Test
 {
 }
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><a href="editor:%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml(new Test, ['location' => true])) 📍</a
-><span class="tracy-dump-object" title="Declared in file %a% on line %d%&#10;Ctrl-Click to open in editor&#10;Alt-Click to expand/collapse all child nodes" data-tracy-href="editor:%a%">Test</span> <span class="tracy-dump-hash">#%d%</span></pre>
-XX
-	, Dumper::toHtml(new Test, ['location' => true]));
-
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></pre>
-XX
-	, Dumper::toHtml(new Test, ['location' => false]));
-
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><a href="editor:%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml(new Test, ['location' => Dumper::LOCATION_SOURCE])) 📍</a
-><span class="tracy-dump-object" title="Declared in file %a% on line %d%&#10;Ctrl-Click to open in editor&#10;Alt-Click to expand/collapse all child nodes" data-tracy-href="editor:%a%">Test</span> <span class="tracy-dump-hash">#%d%</span></pre>
-XX
-	, Dumper::toHtml(new Test, ['location' => Dumper::LOCATION_SOURCE]));
-
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-dump-object" title="Declared in file %a% on line %d%&#10;Ctrl-Click to open in editor&#10;Alt-Click to expand/collapse all child nodes" data-tracy-href="editor:%a%">Test</span> <span class="tracy-dump-hash">#%d%</span></pre>
-XX
-	, Dumper::toHtml(new Test, ['location' => Dumper::LOCATION_CLASS]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><a href="editor:%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml(new Test, ['location' => true]) 📍</a
+		><span class="tracy-dump-object" title="Declared in file %a% on line %d%&#10;Ctrl-Click to open in editor&#10;Alt-Click to expand/collapse all child nodes" data-tracy-href="editor:%a%">Test</span> <span class="tracy-dump-hash">#%d%</span></pre>
+		XX,
+	Dumper::toHtml(new Test, ['location' => true]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></pre>
+		XX,
+	Dumper::toHtml(new Test, ['location' => false]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><a href="editor:%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml(new Test, ['location' => Dumper::LOCATION_SOURCE]) 📍</a
+		><span class="tracy-dump-object" title="Declared in file %a% on line %d%&#10;Ctrl-Click to open in editor&#10;Alt-Click to expand/collapse all child nodes" data-tracy-href="editor:%a%">Test</span> <span class="tracy-dump-hash">#%d%</span></pre>
+		XX,
+	Dumper::toHtml(new Test, ['location' => Dumper::LOCATION_SOURCE]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-dump-object" title="Declared in file %a% on line %d%&#10;Ctrl-Click to open in editor&#10;Alt-Click to expand/collapse all child nodes" data-tracy-href="editor:%a%">Test</span> <span class="tracy-dump-hash">#%d%</span></pre>
+		XX,
+	Dumper::toHtml(new Test, ['location' => Dumper::LOCATION_CLASS]),
+);
diff --git a/tests/Tracy/Dumper.toHtml().phpt b/tests/Tracy/Dumper.toHtml().phpt
index 284e19cf6..418a69406 100644
--- a/tests/Tracy/Dumper.toHtml().phpt
+++ b/tests/Tracy/Dumper.toHtml().phpt
@@ -51,65 +51,73 @@ Assert::same(str_replace(
 	"\r",
 	'',
 	<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-</div></pre>
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		</div></pre>
 
-XX
+		XX,
 ), Dumper::toHtml([1]));
 
 
 // multiline
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (3)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle">string</span>
-<div class="tracy-dump-string" title="3 characters"><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-lq">'</span>a<i>\n</i>
-<span class="tracy-dump-indent">   |   </span>b<span>'</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle">string</span>
-<div class="tracy-dump-string" title="3 characters"><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-lq">'</span>a<i>\n</i>
-<span class="tracy-dump-indent">   |  |   </span>b<span>'</span>
-</div></div></div></pre>
-XX
-	, Dumper::toHtml(['hello', "a\nb", ["a\nb"]]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (3)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle">string</span>
+		<div class="tracy-dump-string" title="3 characters"><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-lq">'</span>a<i>\n</i>
+		<span class="tracy-dump-indent">   |   </span>b<span>'</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle">string</span>
+		<div class="tracy-dump-string" title="3 characters"><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-lq">'</span>a<i>\n</i>
+		<span class="tracy-dump-indent">   |  |   </span>b<span>'</span>
+		</div></div></div></pre>
+		XX,
+	Dumper::toHtml(['hello', "a\nb", ["a\nb"]]),
+);
 
 
 // array (with snapshot)
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (5)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-array">array</span> (0)
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">4</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[1,1],[2,2],[3,3],[4,4],[5,5],[6,6],[7,7]]'><span class="tracy-dump-array">array</span> (7)</span>
-</div></pre>
-XX
-	, Dumper::toHtml([1, 'hello', [], [1, 2], [1 => 1, 2, 3, 4, 5, 6, 7]]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (5)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-array">array</span> (0)
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">4</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[1,1],[2,2],[3,3],[4,4],[5,5],[6,6],[7,7]]'><span class="tracy-dump-array">array</span> (7)</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml([1, 'hello', [], [1, 2], [1 => 1, 2, 3, 4, 5, 6, 7]]),
+);
 
 
 // object
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></pre>
-XX
-	, Dumper::toHtml(new stdClass));
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">10</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-null">null</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test">y</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-number">30.0</span>
-</div></pre>
-XX
-	, Dumper::toHtml(new Test));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></pre>
+		XX,
+	Dumper::toHtml(new stdClass),
+);
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">10</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-null">null</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test">y</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-number">30.0</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml(new Test),
+);
 
 $obj = new Child;
 $obj->new = 7;
@@ -119,37 +127,41 @@ $obj->{''} = 10;
 $obj->{"a\x00\n"} = 11;
 $obj->{"a\xA0"} = 12;
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-object">Child</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">new</span>: <span class="tracy-dump-number">7</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-number">8</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-number">9</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic"><span class='tracy-dump-lq'>'</span><span>'</span></span>: <span class="tracy-dump-number">10</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic"><span class='tracy-dump-lq'>'</span>a<i>\x00\n</i><span>'</span></span>: <span class="tracy-dump-number">11</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic"><span class='tracy-dump-lq'>'</span>a<i>\xA0</i><span>'</span></span>: <span class="tracy-dump-number">12</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Child">y</span>: <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-number">3</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x2</span>: <span class="tracy-dump-number">4</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">y2</span>: <span class="tracy-dump-number">5</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Child">z2</span>: <span class="tracy-dump-number">6</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test">y</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
-</div></pre>
-XX
-	, Dumper::toHtml($obj));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-object">Child</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">new</span>: <span class="tracy-dump-number">7</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-number">8</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-number">9</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic"><span class='tracy-dump-lq'>'</span><span>'</span></span>: <span class="tracy-dump-number">10</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic"><span class='tracy-dump-lq'>'</span>a<i>\x00\n</i><span>'</span></span>: <span class="tracy-dump-number">11</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic"><span class='tracy-dump-lq'>'</span>a<i>\xA0</i><span>'</span></span>: <span class="tracy-dump-number">12</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Child">y</span>: <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-number">3</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x2</span>: <span class="tracy-dump-number">4</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">y2</span>: <span class="tracy-dump-number">5</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Child">z2</span>: <span class="tracy-dump-number">6</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test">y</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>hello<span>'</span></span>
+		</div></pre>
+		XX,
+	Dumper::toHtml($obj),
+);
 
 
 // PHP 7.4 features
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-object">Test74</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test74">y</span>: <span class="tracy-dump-virtual">unset</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-virtual">unset</span>
-</div></pre>
-XX
-, Dumper::toHtml(new Test74));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-object">Test74</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test74">y</span>: <span class="tracy-dump-virtual">unset</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-virtual">unset</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml(new Test74),
+);
 
 
 $obj = new Child74;
@@ -157,16 +169,18 @@ $obj->new = 7;
 unset($obj->unset1, $obj->unset2);
 
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-object">Child74</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">new</span>: <span class="tracy-dump-number">7</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Child74">y</span>: <span class="tracy-dump-virtual">unset</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-virtual">unset</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-public">unset1</span>: <span class="tracy-dump-virtual">unset</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-public">unset2</span>: <span class="tracy-dump-virtual">unset</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test74">y</span>: <span class="tracy-dump-virtual">unset</span>
-</div></pre>
-XX
-, Dumper::toHtml($obj));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-object">Child74</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">new</span>: <span class="tracy-dump-number">7</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-public">x</span>: <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Child74">y</span>: <span class="tracy-dump-virtual">unset</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-protected">z</span>: <span class="tracy-dump-virtual">unset</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-public">unset1</span>: <span class="tracy-dump-virtual">unset</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-public">unset2</span>: <span class="tracy-dump-virtual">unset</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in Test74">y</span>: <span class="tracy-dump-virtual">unset</span>
+		</div></pre>
+		XX,
+	Dumper::toHtml($obj),
+);
diff --git a/tests/Tracy/Dumper.toHtml().recursion.phpt b/tests/Tracy/Dumper.toHtml().recursion.phpt
index f41cd9e39..7cc4a2a88 100644
--- a/tests/Tracy/Dumper.toHtml().recursion.phpt
+++ b/tests/Tracy/Dumper.toHtml().recursion.phpt
@@ -14,30 +14,34 @@ require __DIR__ . '/../bootstrap.php';
 
 $arr = [1, 2, 3];
 $arr[] = &$arr;
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-array">array</span> (4) <i>RECURSION</i>
-</div></div></pre>
-XX
-	, Dumper::toHtml($arr));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-number">3</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-array">array</span> (4) <i>RECURSION</i>
+		</div></div></pre>
+		XX,
+	Dumper::toHtml($arr),
+);
 
 
 $arr = (object) ['x' => 1, 'y' => 2];
 $arr->z = &$arr;
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">x</span>: <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">y</span>: <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">z</span>: <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span> <i>RECURSION</i>
-</div></pre>
-XX
-	, Dumper::toHtml($arr));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">x</span>: <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">y</span>: <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">z</span>: <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span> <i>RECURSION</i>
+		</div></pre>
+		XX,
+	Dumper::toHtml($arr),
+);
diff --git a/tests/Tracy/Dumper.toHtml().references.phpt b/tests/Tracy/Dumper.toHtml().references.phpt
index 8100de373..dc46d6641 100644
--- a/tests/Tracy/Dumper.toHtml().references.phpt
+++ b/tests/Tracy/Dumper.toHtml().references.phpt
@@ -17,22 +17,24 @@ $a = 1;
 $b = 2;
 $obj = (object) [&$a, $a, &$b, $b, (object) [&$a, &$b], (object) [$a, $b], [&$b, &$a]];
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">2</span>: <span class="tracy-dump-hash">&2</span> <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">3</span>: <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">4</span>: <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-hash">&2</span> <span class="tracy-dump-number">2</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">5</span>: <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-number">2</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">6</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-hash">&2</span> <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-number">1</span>
-</div></div></pre>
-XX
-	, Dumper::toHtml($obj));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">2</span>: <span class="tracy-dump-hash">&2</span> <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">3</span>: <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">4</span>: <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-hash">&2</span> <span class="tracy-dump-number">2</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">5</span>: <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-number">2</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-dynamic">6</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-hash">&2</span> <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-number">1</span>
+		</div></div></pre>
+		XX,
+	Dumper::toHtml($obj),
+);
diff --git a/tests/Tracy/Dumper.toHtml().see.phpt b/tests/Tracy/Dumper.toHtml().see.phpt
index 1a36cd948..c85812127 100644
--- a/tests/Tracy/Dumper.toHtml().see.phpt
+++ b/tests/Tracy/Dumper.toHtml().see.phpt
@@ -39,61 +39,63 @@ $var = [
 	$file,
 ];
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (8)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-array">array</span> (1) …
-</div></div></div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>a<span>'</span></span> => <span class="tracy-toggle tracy-collapsed"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div class="tracy-collapsed"><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">b</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>c<span>'</span></span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (5)</span>
-<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span> <i>see below</i>
-<span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span> …
-<span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-hash">&%d%</span> <span class="tracy-dump-array">array</span> (1) <i>see below</i>
-<span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-array">array</span> (1) …
-<span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">4</span> => <span class="tracy-toggle tracy-collapsed"><span class="tracy-dump-resource">stream resource</span> <span class="tracy-dump-hash">@%d%</span></span>
-<div class="tracy-collapsed"><span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">timed_out</span>: <span class="tracy-dump-bool">false</span>
-<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">blocked</span>: <span class="tracy-dump-bool">true</span>
-<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">eof</span>: <span class="tracy-dump-bool">false</span>
-<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">wrapper_type</span>: <span class="tracy-dump-string" title="9 characters"><span>'</span>plainfile<span>'</span></span>
-<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">stream_type</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>STDIO<span>'</span></span>
-<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">mode</span>: <span class="tracy-dump-string"><span>'</span>r<span>'</span></span>
-<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">unread_bytes</span>: <span class="tracy-dump-number">0</span>
-<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">seekable</span>: <span class="tracy-dump-bool">true</span>
-<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">uri</span>: <span class="tracy-dump-string" title="%d% characters"><span>'</span>%a%<span>'</span></span>
-</div></div></div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span> <i>see below</i>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span> <i>see above</i>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">2</span>: <span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-array">array</span> (1) …
-</div></div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">3</span>: <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-array">array</span> (1) <i>see below</i>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">4</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-array">array</span> (1) …
-</div></div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">5</span>: <span class="tracy-dump-resource">stream resource</span> <span class="tracy-dump-hash">@%d%</span> <i>see above</i>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-array">array</span> (1) …
-</div></div></div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span> <i>see above</i>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-array">array</span> (1) …
-</div></div></div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">4</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-string" title="4 characters"><span>'</span>item<span>'</span></span>
-</div></div></div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">5</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
-<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-string" title="4 characters"><span>'</span>item<span>'</span></span>
-</div></div></div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">6</span> => <span class="tracy-dump-resource">stream resource</span> <span class="tracy-dump-hash">@%d%</span> <i>see above</i>
-</div></pre>
-XX
-	, Dumper::toHtml($var, [Dumper::DEPTH => 4, Dumper::LAZY => false]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (8)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-array">array</span> (1) …
+		</div></div></div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>a<span>'</span></span> => <span class="tracy-toggle tracy-collapsed"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div class="tracy-collapsed"><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">b</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>c<span>'</span></span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (5)</span>
+		<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span> <i>see below</i>
+		<span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span> …
+		<span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-hash">&%d%</span> <span class="tracy-dump-array">array</span> (1) <i>see below</i>
+		<span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-array">array</span> (1) …
+		<span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">4</span> => <span class="tracy-toggle tracy-collapsed"><span class="tracy-dump-resource">stream resource</span> <span class="tracy-dump-hash">@%d%</span></span>
+		<div class="tracy-collapsed"><span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">timed_out</span>: <span class="tracy-dump-bool">false</span>
+		<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">blocked</span>: <span class="tracy-dump-bool">true</span>
+		<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">eof</span>: <span class="tracy-dump-bool">false</span>
+		<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">wrapper_type</span>: <span class="tracy-dump-string" title="9 characters"><span>'</span>plainfile<span>'</span></span>
+		<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">stream_type</span>: <span class="tracy-dump-string" title="5 characters"><span>'</span>STDIO<span>'</span></span>
+		<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">mode</span>: <span class="tracy-dump-string"><span>'</span>r<span>'</span></span>
+		<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">unread_bytes</span>: <span class="tracy-dump-number">0</span>
+		<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">seekable</span>: <span class="tracy-dump-bool">true</span>
+		<span class="tracy-dump-indent">   |  |  |  |  </span><span class="tracy-dump-virtual">uri</span>: <span class="tracy-dump-string" title="%d% characters"><span>'</span>%a%<span>'</span></span>
+		</div></div></div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">0</span>: <span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span> <i>see below</i>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">1</span>: <span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span> <i>see above</i>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">2</span>: <span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-array">array</span> (1) …
+		</div></div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">3</span>: <span class="tracy-dump-hash">&1</span> <span class="tracy-dump-array">array</span> (1) <i>see below</i>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">4</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-array">array</span> (1) …
+		</div></div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">5</span>: <span class="tracy-dump-resource">stream resource</span> <span class="tracy-dump-hash">@%d%</span> <i>see above</i>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-array">array</span> (1) …
+		</div></div></div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span> <i>see above</i>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-array">array</span> (1) …
+		</div></div></div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">4</span> => <span class="tracy-dump-hash">&1</span> <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-string" title="4 characters"><span>'</span>item<span>'</span></span>
+		</div></div></div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">5</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  </span><span class="tracy-dump-number">2</span> => <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (1)</span>
+		<div><span class="tracy-dump-indent">   |  |  |  </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-string" title="4 characters"><span>'</span>item<span>'</span></span>
+		</div></div></div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">6</span> => <span class="tracy-dump-resource">stream resource</span> <span class="tracy-dump-hash">@%d%</span> <i>see above</i>
+		</div></pre>
+		XX,
+	Dumper::toHtml($var, [Dumper::DEPTH => 4, Dumper::LAZY => false]),
+);
 
 
 // no above or below in lazy mode
@@ -108,16 +110,18 @@ $var = [
 	$obj2,
 ];
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"Test","items":[["a",[[1,[[2,{"array":null,"length":1}]]]],0]]},"%d%":{"object":"Test","items":[["a",[[1,[[2,{"array":null,"length":1}]]]],0]]}}'
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[1,[[2,{"array":null,"length":1}]]]]'><span class="tracy-dump-array">array</span> (1)</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>a<span>'</span></span> => <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">b</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[["c",[[0,{"ref":%d%}]]]]'><span class="tracy-dump-array">array</span> (1)</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[1,[[2,{"array":null,"length":1}]]]]'><span class="tracy-dump-array">array</span> (1)</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":%d%}'><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
-</div></pre>
-XX
-	, Dumper::toHtml($var, [Dumper::DEPTH => 4]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"Test","items":[["a",[[1,[[2,{"array":null,"length":1}]]]],0]]},"%d%":{"object":"Test","items":[["a",[[1,[[2,{"array":null,"length":1}]]]],0]]}}'
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (4)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[1,[[2,{"array":null,"length":1}]]]]'><span class="tracy-dump-array">array</span> (1)</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>a<span>'</span></span> => <span class="tracy-toggle"><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-dynamic">b</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[["c",[[0,{"ref":%d%}]]]]'><span class="tracy-dump-array">array</span> (1)</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-toggle"><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-public">a</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='[[1,[[2,{"array":null,"length":1}]]]]'><span class="tracy-dump-array">array</span> (1)</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":%d%}'><span class="tracy-dump-object">Test</span> <span class="tracy-dump-hash">#%d%</span></span>
+		</div></pre>
+		XX,
+	Dumper::toHtml($var, [Dumper::DEPTH => 4]),
+);
diff --git a/tests/Tracy/Dumper.toHtml().snapshot.phpt b/tests/Tracy/Dumper.toHtml().snapshot.phpt
index b05978efc..19b348a2f 100644
--- a/tests/Tracy/Dumper.toHtml().snapshot.phpt
+++ b/tests/Tracy/Dumper.toHtml().snapshot.phpt
@@ -35,22 +35,24 @@ Assert::same([], $snapshot[0]);
 
 
 // snapshot dump of array
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-dump='[[0,null],[1,true],[2,false],[3,0],[4,{"number":"0.0"}],[5,"string"],[6,{"string":"\u0027\u0026amp;\"","length":3}],[7,{"string":"<i>\\x00</i>","length":1}],[8,{"number":"INF"}],[9,{"number":"-INF"}],[10,{"number":"NAN"}]]'></pre>
-XX
-	, Dumper::toHtml([null, true, false, 0, 0.0, 'string', "'&\"", "\x00", INF, -INF, NAN], $options));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-dump='[[0,null],[1,true],[2,false],[3,0],[4,{"number":"0.0"}],[5,"string"],[6,{"string":"\u0027\u0026amp;\"","length":3}],[7,{"string":"<i>\\x00</i>","length":1}],[8,{"number":"INF"}],[9,{"number":"-INF"}],[10,{"number":"NAN"}]]'></pre>
+		XX,
+	Dumper::toHtml([null, true, false, 0, 0.0, 'string', "'&\"", "\x00", INF, -INF, NAN], $options),
+);
 
 
 // snapshot dump of object
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml(new stdClass, $options)
+	Dumper::toHtml(new stdClass, $options),
 );
 
 // twice with different identity
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml(new stdClass, $options) // different object
+	Dumper::toHtml(new stdClass, $options), // different object
 );
 Assert::equal([
 	['object' => 'stdClass', 'items' => []],
@@ -66,7 +68,7 @@ Assert::match('<pre class="tracy-dump"><span class="tracy-dump-null">null</span>
 $snapshot = [];
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'{"ref":"r%d%"}\'></pre>',
-	Dumper::toHtml(fopen(__FILE__, 'r'), $options)
+	Dumper::toHtml(fopen(__FILE__, 'r'), $options),
 );
 Assert::count(1, $snapshot[0]);
 
@@ -75,7 +77,7 @@ Assert::count(1, $snapshot[0]);
 $snapshot = [];
 Assert::match(
 	'<pre class="tracy-dump tracy-collapsed" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml(new Test, $options + [Dumper::COLLAPSE => true])
+	Dumper::toHtml(new Test, $options + [Dumper::COLLAPSE => true]),
 );
 
 
@@ -83,7 +85,7 @@ Assert::match(
 $snapshot = [];
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml(new Test, $options)
+	Dumper::toHtml(new Test, $options),
 );
 
 Assert::equal([
@@ -100,12 +102,14 @@ Assert::equal([
 
 // snapshot & location
 $snapshot = [];
-Assert::match(<<<'XX'
-<pre class="tracy-dump" data-tracy-dump='{"ref":%d%}'
-><a href="editor://open/?file=%a%&amp;line=%d%&amp;search=&amp;replace=" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml(new Test, $options + ['location' => <span>…</span> N_CLASS])) 📍</a
-></pre>
-XX
-	, Dumper::toHtml(new Test, $options + ['location' => Dumper::LOCATION_SOURCE | Dumper::LOCATION_CLASS]));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump" data-tracy-dump='{"ref":%d%}'
+		><a href="editor://open/?file=%a%&amp;line=%d%&amp;search=&amp;replace=" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">Dumper::toHtml(new Test, $options + ['location' => <span>…</span> ON_CLASS]) 📍</a
+		></pre>
+		XX,
+	Dumper::toHtml(new Test, $options + ['location' => Dumper::LOCATION_SOURCE | Dumper::LOCATION_CLASS]),
+);
 
 Assert::equal([
 	[
@@ -130,7 +134,7 @@ $arr = [1, 2, 3];
 $arr[] = &$arr;
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'[[0,1],[1,2],[2,3],[3,{"ref":"p1"},1]]\'></pre>',
-	Dumper::toHtml($arr, $options)
+	Dumper::toHtml($arr, $options),
 );
 Assert::equal([
 	[
@@ -144,7 +148,7 @@ $obj = new stdClass;
 $obj->x = $obj;
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml($obj, $options)
+	Dumper::toHtml($obj, $options),
 );
 
 
@@ -153,7 +157,7 @@ $snapshot = [];
 $arr = [1, [2, [3, [4, [5, [6]]]]], 3];
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'[[0,1],[1,[[0,2],[1,[[0,3],[1,[[0,4],[1,{"array":null,"length":2}]]]]]]],[2,3]]\'></pre>',
-	Dumper::toHtml($arr, $options + [Dumper::DEPTH => 4])
+	Dumper::toHtml($arr, $options + [Dumper::DEPTH => 4]),
 );
 Assert::same([], $snapshot[0]);
 
@@ -161,7 +165,7 @@ Assert::same([], $snapshot[0]);
 $arr = [1, [2, [3, [4, []]]], 3];
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'[[0,1],[1,[[0,2],[1,[[0,3],[1,[[0,4],[1,[]]]]]]]],[2,3]]\'></pre>',
-	Dumper::toHtml($arr, $options + [Dumper::DEPTH => 4])
+	Dumper::toHtml($arr, $options + [Dumper::DEPTH => 4]),
 );
 Assert::same([], $snapshot[0]);
 
@@ -174,7 +178,7 @@ $obj->a->b->c->d = new stdClass;
 $obj->a->b->c->d->e = new stdClass;
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'{"ref":%d%}\'></pre>',
-	Dumper::toHtml($obj, $options + [Dumper::DEPTH => 4])
+	Dumper::toHtml($obj, $options + [Dumper::DEPTH => 4]),
 );
 
 
@@ -183,10 +187,10 @@ $a = ['a'];
 $b = ['b'];
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'[[0,{"ref":"p1"},1],[1,{"ref":"p2"},2]]\'></pre>',
-	Dumper::toHtml([&$a, &$b], $options)
+	Dumper::toHtml([&$a, &$b], $options),
 );
 
 Assert::match(
 	'<pre class="tracy-dump" data-tracy-dump=\'[[0,{"ref":"p2"},2],[1,{"ref":"p1"},1]]\'></pre>',
-	Dumper::toHtml([&$b, &$a], $options)
+	Dumper::toHtml([&$b, &$a], $options),
 );
diff --git a/tests/Tracy/Dumper.toHtml().specialChars.phpt b/tests/Tracy/Dumper.toHtml().specialChars.phpt
index fe444f711..140305b76 100644
--- a/tests/Tracy/Dumper.toHtml().specialChars.phpt
+++ b/tests/Tracy/Dumper.toHtml().specialChars.phpt
@@ -12,32 +12,33 @@ use Tracy\Dumper;
 require __DIR__ . '/../bootstrap.php';
 
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (14)</span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-string"><span>'</span><span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-string"><span>'</span> <span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-string"><span>'</span><i>\x00</i><span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-string"><span>'</span><i>\xFF</i><span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">4</span> => <span class="tracy-dump-string" title="20 characters"><span>'</span>Iñtërnâtiônàlizætiøn<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">5</span> => <span class="tracy-toggle">string</span>
-<div class="tracy-dump-string" title="16 characters"><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-lq">'</span>utf <i>\n</i>
-<span class="tracy-dump-indent">   |   </span><i>\r\t</i>    <i>\e\x00</i> Iñtër<i>\n</i><span>'</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">6</span> => <span class="tracy-dump-string" title="20 characters"><span>'</span>utf \n\r\t\xab Iñtër<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">7</span> => <span class="tracy-toggle">string</span>
-<div class="tracy-dump-string" title="22 bytes"><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-lq">'</span>binary <i>\n</i>
-<span class="tracy-dump-indent">   |   </span><i>\r\t</i>    <i>\e\x00</i> I<i>\xC3\xB1</i>t<i>\xC3\xAB</i>r <i>\xA0</i><span>'</span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">8</span> => <span class="tracy-dump-string" title="27 bytes"><span>'</span>binary \n\r\t\xab I<i>\xC3\xB1</i>t<i>\xC3\xAB</i>r <i>\xA0</i><span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>utf \n\r\t\xab Iñtër<span>'</span></span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>utf <i>\n</i>
-<span class="tracy-dump-indent">    </span><i>\r\t</i>    <i>\e\x00</i> Iñtër<span>'</span></span> => <span class="tracy-dump-number">2</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>utf <i>\n</i>
-<span class="tracy-dump-indent">    </span><i>\r\t</i>    <i>\e\x00</i> I<i>\xC3\xB1</i>t<i>\xC3\xAB</i>r <i>\xA0</i><span>'</span></span> => <span class="tracy-dump-number">3</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>&lt;div> &amp;amp;<span>'</span></span> => <span class="tracy-dump-string" title="11 characters"><span>'</span>&lt;div> &amp;amp;<span>'</span></span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">9</span> => <span class="tracy-dump-string"><span>'</span><i>\u{FEFF}</i><span>'</span></span>
-</div></pre>
-XX
-	, Dumper::toHtml([
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-array">array</span> (14)</span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">0</span> => <span class="tracy-dump-string"><span>'</span><span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">1</span> => <span class="tracy-dump-string"><span>'</span> <span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">2</span> => <span class="tracy-dump-string"><span>'</span><i>\x00</i><span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">3</span> => <span class="tracy-dump-string"><span>'</span><i>\xFF</i><span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">4</span> => <span class="tracy-dump-string" title="20 characters"><span>'</span>Iñtërnâtiônàlizætiøn<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">5</span> => <span class="tracy-toggle">string</span>
+		<div class="tracy-dump-string" title="16 characters"><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-lq">'</span>utf <i>\n</i>
+		<span class="tracy-dump-indent">   |   </span><i>\r\t</i>    <i>\e\x00</i> Iñtër<i>\n</i><span>'</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">6</span> => <span class="tracy-dump-string" title="20 characters"><span>'</span>utf \n\r\t\xab Iñtër<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">7</span> => <span class="tracy-toggle">string</span>
+		<div class="tracy-dump-string" title="22 bytes"><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-lq">'</span>binary <i>\n</i>
+		<span class="tracy-dump-indent">   |   </span><i>\r\t</i>    <i>\e\x00</i> I<i>\xC3\xB1</i>t<i>\xC3\xAB</i>r <i>\xA0</i><span>'</span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-number">8</span> => <span class="tracy-dump-string" title="27 bytes"><span>'</span>binary \n\r\t\xab I<i>\xC3\xB1</i>t<i>\xC3\xAB</i>r <i>\xA0</i><span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>utf \n\r\t\xab Iñtër<span>'</span></span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>utf <i>\n</i>
+		<span class="tracy-dump-indent">    </span><i>\r\t</i>    <i>\e\x00</i> Iñtër<span>'</span></span> => <span class="tracy-dump-number">2</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>utf <i>\n</i>
+		<span class="tracy-dump-indent">    </span><i>\r\t</i>    <i>\e\x00</i> I<i>\xC3\xB1</i>t<i>\xC3\xAB</i>r <i>\xA0</i><span>'</span></span> => <span class="tracy-dump-number">3</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>&lt;div> &amp;amp;<span>'</span></span> => <span class="tracy-dump-string" title="11 characters"><span>'</span>&lt;div> &amp;amp;<span>'</span></span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-number">9</span> => <span class="tracy-dump-string"><span>'</span><i>\u{FEFF}</i><span>'</span></span>
+		</div></pre>
+		XX,
+	Dumper::toHtml([
 		'',
 		' ',
 		"\x00",
@@ -52,4 +53,5 @@ XX
 		"utf \n\r\t\e\x00 Iñtër \xA0" => 3, // binary + control chars in key,
 		'<div> &amp;' => '<div> &amp;', // HTML
 		"\xEF\xBB\xBF", // BOM
-	], [Dumper::COLLAPSE => false]));
+	], [Dumper::COLLAPSE => false]),
+);
diff --git a/tests/Tracy/Dumper.toHtml().specials.phpt b/tests/Tracy/Dumper.toHtml().specials.phpt
index 54f72320f..a4217a3a7 100644
--- a/tests/Tracy/Dumper.toHtml().specials.phpt
+++ b/tests/Tracy/Dumper.toHtml().specials.phpt
@@ -14,61 +14,75 @@ require __DIR__ . '/../bootstrap.php';
 
 // resource
 $f = fopen(__FILE__, 'r');
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle tracy-collapsed"><span class="tracy-dump-resource">stream resource</span> <span class="tracy-dump-hash">@%d%</span></span>
-<div class="tracy-collapsed"><span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">%a%</span>: <span class="tracy-dump-bool">%a%</span>%A%
-XX
-	, Dumper::toHtml($f));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle tracy-collapsed"><span class="tracy-dump-resource">stream resource</span> <span class="tracy-dump-hash">@%d%</span></span>
+		<div class="tracy-collapsed"><span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">%a%</span>: <span class="tracy-dump-bool">%a%</span>%A%
+		XX,
+	Dumper::toHtml($f),
+);
 
 fclose($f);
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"><span class="tracy-dump-resource">closed resource</span> <span class="tracy-dump-hash">@%d%</span></pre>
-XX
-	, Dumper::toHtml($f));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"><span class="tracy-dump-resource">closed resource</span> <span class="tracy-dump-hash">@%d%</span></pre>
+		XX,
+	Dumper::toHtml($f),
+);
 
 
 // closure
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"><span class="tracy-dump-object">Closure()</span> <span class="tracy-dump-hash">#%d%</span></pre>
-XX
-	, Dumper::toHtml(function () {}));
-
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-object" title="Declared in file %a% on line %d%&#10;Ctrl-Click to open in editor&#10;Alt-Click to expand/collapse all child nodes" data-tracy-href="editor://open/?file=%a%&amp;line=%d%&amp;search=&amp;replace=">Closure()</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">file</span>: <span class="tracy-dump-string" title="%d% characters"><span>'</span>%a%:%d%<span>'</span></span>
-</div></pre>
-XX
-	, Dumper::toHtml(function () {}, [Dumper::LOCATION => Dumper::LOCATION_CLASS]));
-
-
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
-><span class="tracy-toggle"><span class="tracy-dump-object">Closure($x, $y)</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">use</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"object":"$use","items":[["$use",null,4]],"collapsed":true}'><span class="tracy-dump-object">$use</span></span>
-</div></pre>
-XX
-	, Dumper::toHtml(function ($x, int $y = 1) use (&$use) {}));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"><span class="tracy-dump-object">Closure()</span> <span class="tracy-dump-hash">#%d%</span></pre>
+		XX,
+	Dumper::toHtml(function () {}),
+);
+
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-object" title="Declared in file %a% on line %d%&#10;Ctrl-Click to open in editor&#10;Alt-Click to expand/collapse all child nodes" data-tracy-href="editor://open/?file=%a%&amp;line=%d%&amp;search=&amp;replace=">Closure()</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">file</span>: <span class="tracy-dump-string" title="%d% characters"><span>'</span>%a%:%d%<span>'</span></span>
+		</div></pre>
+		XX,
+	Dumper::toHtml(function () {}, [Dumper::LOCATION => Dumper::LOCATION_CLASS]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='[]'
+		><span class="tracy-toggle"><span class="tracy-dump-object">Closure($x, $y)</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">use</span>: <span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"object":"$use","items":[["$use",null,4]],"collapsed":true}'><span class="tracy-dump-object">$use</span></span>
+		</div></pre>
+		XX,
+	Dumper::toHtml(function ($x, int $y = 1) use (&$use) {}),
+);
 
 
 // new class
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"><span class="tracy-dump-object">class@anonymous</span> <span class="tracy-dump-hash">#%d%</span></pre>
-XX
-	, Dumper::toHtml(new class {
-	}));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"><span class="tracy-dump-object">class@anonymous</span> <span class="tracy-dump-hash">#%d%</span></pre>
+		XX,
+	Dumper::toHtml(new class {
+	}),
+);
 
 
 // SplFileInfo
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-object">SplFileInfo</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">path</span>: <span class="tracy-dump-string" title="%d% characters"><span>'</span>%a%<span>'</span></span>
-</div></pre>
-XX
-	, Dumper::toHtml(new SplFileInfo(__FILE__)));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-object">SplFileInfo</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">path</span>: <span class="tracy-dump-string" title="%d% characters"><span>'</span>%a%<span>'</span></span>
+		</div></pre>
+		XX,
+	Dumper::toHtml(new SplFileInfo(__FILE__)),
+);
 
 
 // SplObjectStorage
@@ -81,33 +95,37 @@ $objStorage[$o2] = 'o2';
 $objStorage->next();
 $key = $objStorage->key();
 
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["foo","bar",3]]}}'
-><span class="tracy-toggle"><span class="tracy-dump-object">SplObjectStorage</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">0</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>object<span>'</span></span> => <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>data<span>'</span></span> => <span class="tracy-dump-string" title="2 characters"><span>'</span>o1<span>'</span></span>
-</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">1</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>object<span>'</span></span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":%d%}'><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>data<span>'</span></span> => <span class="tracy-dump-string" title="2 characters"><span>'</span>o2<span>'</span></span>
-</div></div></pre>
-XX
-	, Dumper::toHtml($objStorage));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light" data-tracy-snapshot='{"%d%":{"object":"stdClass","items":[["foo","bar",3]]}}'
+		><span class="tracy-toggle"><span class="tracy-dump-object">SplObjectStorage</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">0</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>object<span>'</span></span> => <span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>data<span>'</span></span> => <span class="tracy-dump-string" title="2 characters"><span>'</span>o1<span>'</span></span>
+		</div><span class="tracy-dump-indent">   </span><span class="tracy-dump-virtual">1</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>object<span>'</span></span> => <span class="tracy-toggle tracy-collapsed" data-tracy-dump='{"ref":%d%}'><span class="tracy-dump-object">stdClass</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>data<span>'</span></span> => <span class="tracy-dump-string" title="2 characters"><span>'</span>o2<span>'</span></span>
+		</div></div></pre>
+		XX,
+	Dumper::toHtml($objStorage),
+);
 
 Assert::same($key, $objStorage->key());
 
 
 // ArrayObject
 $obj = new ArrayObject(['a' => 1, 'b' => 2]);
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-object">ArrayObject</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in ArrayObject">storage</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>a<span>'</span></span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>b<span>'</span></span> => <span class="tracy-dump-number">2</span>
-</div></div></pre>
-XX
-	, Dumper::toHtml($obj));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-object">ArrayObject</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in ArrayObject">storage</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>a<span>'</span></span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>b<span>'</span></span> => <span class="tracy-dump-number">2</span>
+		</div></div></pre>
+		XX,
+	Dumper::toHtml($obj),
+);
 
 class ArrayObjectChild extends ArrayObject
 {
@@ -115,13 +133,15 @@ class ArrayObjectChild extends ArrayObject
 }
 
 $obj = new ArrayObjectChild(['a' => 1, 'b' => 2]);
-Assert::match(<<<'XX'
-<pre class="tracy-dump tracy-light"
-><span class="tracy-toggle"><span class="tracy-dump-object">ArrayObjectChild</span> <span class="tracy-dump-hash">#%d%</span></span>
-<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">prop</span>: <span class="tracy-dump-number">123</span>
-<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in ArrayObject">storage</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
-<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>a<span>'</span></span> => <span class="tracy-dump-number">1</span>
-<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>b<span>'</span></span> => <span class="tracy-dump-number">2</span>
-</div></div></pre>
-XX
-	, Dumper::toHtml($obj));
+Assert::match(
+	<<<'XX'
+		<pre class="tracy-dump tracy-light"
+		><span class="tracy-toggle"><span class="tracy-dump-object">ArrayObjectChild</span> <span class="tracy-dump-hash">#%d%</span></span>
+		<div><span class="tracy-dump-indent">   </span><span class="tracy-dump-public">prop</span>: <span class="tracy-dump-number">123</span>
+		<span class="tracy-dump-indent">   </span><span class="tracy-dump-private" title="declared in ArrayObject">storage</span>: <span class="tracy-toggle"><span class="tracy-dump-array">array</span> (2)</span>
+		<div><span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>a<span>'</span></span> => <span class="tracy-dump-number">1</span>
+		<span class="tracy-dump-indent">   |  </span><span class="tracy-dump-string"><span class='tracy-dump-lq'>'</span>b<span>'</span></span> => <span class="tracy-dump-number">2</span>
+		</div></div></pre>
+		XX,
+	Dumper::toHtml($obj),
+);
diff --git a/tests/Tracy/Dumper.toTerminal().phpt b/tests/Tracy/Dumper.toTerminal().phpt
index 54957e7bd..18365fe16 100644
--- a/tests/Tracy/Dumper.toTerminal().phpt
+++ b/tests/Tracy/Dumper.toTerminal().phpt
@@ -16,17 +16,19 @@ require __DIR__ . '/fixtures/DumpClass.php';
 Assert::match("\e[1;33mnull\e[0m", Dumper::toTerminal(null));
 
 
-Assert::match(<<<XX
-\e[1;31marray\e[0m (4)
-\e[1;30m   \e[1;32m0\e[0m => \e[1;32m1
-\e[1;30m   \e[1;32m1\e[0m => \e[1;36m\e[0m'\e[1;36mhello\e[0m'\e[1;36m
-\e[1;30m   \e[1;32m2\e[0m => \e[1;31marray\e[0m (0)
-\e[1;30m   \e[1;32m3\e[0m => \e[1;31marray\e[0m (2)
-\e[1;30m   |  \e[1;32m0\e[0m => \e[1;33mtrue
-\e[1;30m   |  \e[1;32m1\e[0m => \e[1;33mnull
-\e[0m
-XX
-	, Dumper::toTerminal([1, 'hello', [], [true, null]]));
+Assert::match(
+	<<<XX
+		\e[1;31marray\e[0m (4)
+		\e[1;30m   \e[1;32m0\e[0m => \e[1;32m1
+		\e[1;30m   \e[1;32m1\e[0m => \e[1;36m\e[0m'\e[1;36mhello\e[0m'\e[1;36m
+		\e[1;30m   \e[1;32m2\e[0m => \e[1;31marray\e[0m (0)
+		\e[1;30m   \e[1;32m3\e[0m => \e[1;31marray\e[0m (2)
+		\e[1;30m   |  \e[1;32m0\e[0m => \e[1;33mtrue
+		\e[1;30m   |  \e[1;32m1\e[0m => \e[1;33mnull
+		\e[0m
+		XX,
+	Dumper::toTerminal([1, 'hello', [], [true, null]]),
+);
 
 
 $obj = new Child;
@@ -35,31 +37,35 @@ $obj->{0} = 8;
 $obj->{1} = 9;
 $obj->{''} = 10;
 
-Assert::match(<<<XX
-\e[1;31mChild\e[0m \e[0m#%d%
-\e[1;30m   \e[1;37mnew\e[0m: \e[1;32m7
-\e[1;30m   \e[1;37m0\e[0m: \e[1;32m8
-\e[1;30m   \e[1;37m1\e[0m: \e[1;32m9
-\e[1;30m   \e[1;37m\e[0m'\e[1;37m\e[0m'\e[1;37m\e[0m: \e[1;32m10
-\e[1;30m   \e[1;37mx\e[0m: \e[1;32m1
-\e[1;30m   \e[1;37my\e[0m: \e[1;32m2
-\e[1;30m   \e[1;37mz\e[0m: \e[1;32m3
-\e[1;30m   \e[1;37mx2\e[0m: \e[1;32m4
-\e[1;30m   \e[1;37my2\e[0m: \e[1;32m5
-\e[1;30m   \e[1;37mz2\e[0m: \e[1;32m6
-\e[1;30m   \e[1;37my\e[0m: \e[1;36m\e[0m'\e[1;36mhello\e[0m'\e[1;36m
-\e[0m
-XX
-	, Dumper::toTerminal($obj));
+Assert::match(
+	<<<XX
+		\e[1;31mChild\e[0m \e[0m#%d%
+		\e[1;30m   \e[1;37mnew\e[0m: \e[1;32m7
+		\e[1;30m   \e[1;37m0\e[0m: \e[1;32m8
+		\e[1;30m   \e[1;37m1\e[0m: \e[1;32m9
+		\e[1;30m   \e[1;37m\e[0m'\e[1;37m\e[0m'\e[1;37m\e[0m: \e[1;32m10
+		\e[1;30m   \e[1;37mx\e[0m: \e[1;32m1
+		\e[1;30m   \e[1;37my\e[0m: \e[1;32m2
+		\e[1;30m   \e[1;37mz\e[0m: \e[1;32m3
+		\e[1;30m   \e[1;37mx2\e[0m: \e[1;32m4
+		\e[1;30m   \e[1;37my2\e[0m: \e[1;32m5
+		\e[1;30m   \e[1;37mz2\e[0m: \e[1;32m6
+		\e[1;30m   \e[1;37my\e[0m: \e[1;36m\e[0m'\e[1;36mhello\e[0m'\e[1;36m
+		\e[0m
+		XX,
+	Dumper::toTerminal($obj),
+);
 
 
 $arr = (object) ['x' => 1, 'y' => 2];
 $arr->z = &$arr;
-Assert::match(<<<XX
-\e[1;31mstdClass\e[0m \e[0m#%d%
-\e[1;30m   \e[1;37mx\e[0m: \e[1;32m1
-\e[1;30m   \e[1;37my\e[0m: \e[1;32m2
-\e[1;30m   \e[1;37mz\e[0m: \e[0m&1\e[0m \e[1;31mstdClass\e[0m \e[0m#%d%\e[0m \e[0mRECURSION
-\e[0m
-XX
-	, Dumper::toTerminal($arr));
+Assert::match(
+	<<<XX
+		\e[1;31mstdClass\e[0m \e[0m#%d%
+		\e[1;30m   \e[1;37mx\e[0m: \e[1;32m1
+		\e[1;30m   \e[1;37my\e[0m: \e[1;32m2
+		\e[1;30m   \e[1;37mz\e[0m: \e[0m&1\e[0m \e[1;31mstdClass\e[0m \e[0m#%d%\e[0m \e[0mRECURSION
+		\e[0m
+		XX,
+	Dumper::toTerminal($arr),
+);
diff --git a/tests/Tracy/Dumper.toText().depth.phpt b/tests/Tracy/Dumper.toText().depth.phpt
index eb89dd028..00ce17e23 100644
--- a/tests/Tracy/Dumper.toText().depth.phpt
+++ b/tests/Tracy/Dumper.toText().depth.phpt
@@ -31,85 +31,99 @@ $arr = [
 ];
 
 
-Assert::match(<<<'XX'
-array (4)
-   'long' => 'Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework ...  Framework'
-   0 => array (1)
-   |  0 => array (1)
-   |  |  0 => array (1)
-   |  |  |  'hello' => 'world'
-   'long2' => 'Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework ...  Framework'
-   1 => stdClass #%a%
-   |  0: stdClass #%a%
-   |  |  0: stdClass #%a%
-   |  |  |  hello: 'world'
-XX
-	, Dumper::toText($arr));
-
-
-Assert::match(<<<'XX'
-array (4)
-   'long' => 'Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework'
-   0 => array (1)
-   |  0 => array (1)
-   |  |  0 => array (1)
-   |  |  |  'hello' => 'world'
-   'long2' => 'Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework'
-   1 => stdClass #%a% ...
-XX
-	, Dumper::toText($arr, [Dumper::DEPTH => 0, Dumper::TRUNCATE => 0]));
-
-
-Assert::match(<<<'XX'
-array (4)
-   'long' => 'Nette FrameworkNette FrameworkNette FrameworkNette ...  Framework'
-   0 => array (1)
-   |  0 => array (1) ...
-   'long2' => 'Nette FrameworkNette FrameworkNette FrameworkNette ...  Framework'
-   1 => stdClass #%a%
-   |  0: stdClass #%a% ...
-XX
-	, Dumper::toText($arr, [Dumper::DEPTH => 2, Dumper::TRUNCATE => 50]));
+Assert::match(
+	<<<'XX'
+		array (4)
+		   'long' => 'Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework ...  Framework'
+		   0 => array (1)
+		   |  0 => array (1)
+		   |  |  0 => array (1)
+		   |  |  |  'hello' => 'world'
+		   'long2' => 'Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework ...  Framework'
+		   1 => stdClass #%a%
+		   |  0: stdClass #%a%
+		   |  |  0: stdClass #%a%
+		   |  |  |  hello: 'world'
+		XX,
+	Dumper::toText($arr),
+);
+
+
+Assert::match(
+	<<<'XX'
+		array (4)
+		   'long' => 'Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework'
+		   0 => array (1)
+		   |  0 => array (1)
+		   |  |  0 => array (1)
+		   |  |  |  'hello' => 'world'
+		   'long2' => 'Nette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette FrameworkNette Framework'
+		   1 => stdClass #%a% ...
+		XX,
+	Dumper::toText($arr, [Dumper::DEPTH => 0, Dumper::TRUNCATE => 0]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		array (4)
+		   'long' => 'Nette FrameworkNette FrameworkNette FrameworkNette ...  Framework'
+		   0 => array (1)
+		   |  0 => array (1) ...
+		   'long2' => 'Nette FrameworkNette FrameworkNette FrameworkNette ...  Framework'
+		   1 => stdClass #%a%
+		   |  0: stdClass #%a% ...
+		XX,
+	Dumper::toText($arr, [Dumper::DEPTH => 2, Dumper::TRUNCATE => 50]),
+);
 
 
 $arr = [1, 2, 3, 4];
 
-Assert::match(<<<'XX'
-array (4)
-   0 => 1
-   1 => 2
-   2 => 3
-   3 => 4
-XX
-	, Dumper::toText($arr, [Dumper::ITEMS => 0]));
-
-Assert::match(<<<'XX'
-array (4)
-   0 => 1
-   1 => 2
-   2 => 3
-   3 => 4
-XX
-	, Dumper::toText($arr, [Dumper::ITEMS => 2]));
-
-Assert::match(<<<'XX'
-stdClass #%d%
-   0: 1
-   1: 2
-   2: 3
-   3: 4
-XX
-	, Dumper::toText((object) $arr, [Dumper::ITEMS => 2]));
-
-Assert::match(<<<'XX'
-array (2)
-   0 => array (4)
-   |  0 => 1
-   |  1 => 2
-   |  ...
-   1 => stdClass #%d%
-   |  0: 1
-   |  1: 2
-   |  ...
-XX
-	, Dumper::toText([$arr, (object) $arr], [Dumper::ITEMS => 2]));
+Assert::match(
+	<<<'XX'
+		array (4)
+		   0 => 1
+		   1 => 2
+		   2 => 3
+		   3 => 4
+		XX,
+	Dumper::toText($arr, [Dumper::ITEMS => 0]),
+);
+
+Assert::match(
+	<<<'XX'
+		array (4)
+		   0 => 1
+		   1 => 2
+		   2 => 3
+		   3 => 4
+		XX,
+	Dumper::toText($arr, [Dumper::ITEMS => 2]),
+);
+
+Assert::match(
+	<<<'XX'
+		stdClass #%d%
+		   0: 1
+		   1: 2
+		   2: 3
+		   3: 4
+		XX,
+	Dumper::toText((object) $arr, [Dumper::ITEMS => 2]),
+);
+
+Assert::match(
+	<<<'XX'
+		array (2)
+		   0 => array (4)
+		   |  0 => 1
+		   |  1 => 2
+		   |  ...
+		   1 => stdClass #%d%
+		   |  0: 1
+		   |  1: 2
+		   |  ...
+		XX,
+	Dumper::toText([$arr, (object) $arr], [Dumper::ITEMS => 2]),
+);
diff --git a/tests/Tracy/Dumper.toText().locale.phpt b/tests/Tracy/Dumper.toText().locale.phpt
index 3724c2b53..2afe50e0e 100644
--- a/tests/Tracy/Dumper.toText().locale.phpt
+++ b/tests/Tracy/Dumper.toText().locale.phpt
@@ -14,9 +14,11 @@ require __DIR__ . '/../bootstrap.php';
 
 setlocale(LC_ALL, 'czech');
 
-Assert::match(<<<'XX'
-array (2)
-   0 => -10.0
-   1 => 10.3
-XX
-	, Dumper::toText([-10.0, 10.3]));
+Assert::match(
+	<<<'XX'
+		array (2)
+		   0 => -10.0
+		   1 => 10.3
+		XX,
+	Dumper::toText([-10.0, 10.3]),
+);
diff --git a/tests/Tracy/Dumper.toText().nohash.phpt b/tests/Tracy/Dumper.toText().nohash.phpt
index 2cec53f63..b215635f0 100644
--- a/tests/Tracy/Dumper.toText().nohash.phpt
+++ b/tests/Tracy/Dumper.toText().nohash.phpt
@@ -14,39 +14,45 @@ require __DIR__ . '/../bootstrap.php';
 
 $arr = [1, 2, 3];
 $arr[] = &$arr;
-Assert::match(<<<'XX'
-array (4)
-   0 => 1
-   1 => 2
-   2 => 3
-   3 => array (4)
-   |  0 => 1
-   |  1 => 2
-   |  2 => 3
-   |  3 => array (4) RECURSION
-XX
-	, Dumper::toText($arr, [Dumper::HASH => false]));
+Assert::match(
+	<<<'XX'
+		array (4)
+		   0 => 1
+		   1 => 2
+		   2 => 3
+		   3 => array (4)
+		   |  0 => 1
+		   |  1 => 2
+		   |  2 => 3
+		   |  3 => array (4) RECURSION
+		XX,
+	Dumper::toText($arr, [Dumper::HASH => false]),
+);
 
 
 $arr = (object) ['x' => 1, 'y' => 2];
 $arr->z = &$arr;
-Assert::match(<<<'XX'
-stdClass
-   x: 1
-   y: 2
-   z: stdClass RECURSION
-XX
-	, Dumper::toText($arr, [Dumper::HASH => false]));
+Assert::match(
+	<<<'XX'
+		stdClass
+		   x: 1
+		   y: 2
+		   z: stdClass RECURSION
+		XX,
+	Dumper::toText($arr, [Dumper::HASH => false]),
+);
 
 
 $obj = (object) ['a' => 1];
-Assert::match(<<<'XX'
-array (3)
-   0 => stdClass
-   |  a: 1
-   1 => stdClass
-   |  a: 1
-   2 => stdClass
-   |  a: 1
-XX
-	, Dumper::toText([$obj, $obj, $obj], [Dumper::HASH => false]));
+Assert::match(
+	<<<'XX'
+		array (3)
+		   0 => stdClass
+		   |  a: 1
+		   1 => stdClass
+		   |  a: 1
+		   2 => stdClass
+		   |  a: 1
+		XX,
+	Dumper::toText([$obj, $obj, $obj], [Dumper::HASH => false]),
+);
diff --git a/tests/Tracy/Dumper.toText().phpt b/tests/Tracy/Dumper.toText().phpt
index 2502acc39..6e1f210ce 100644
--- a/tests/Tracy/Dumper.toText().phpt
+++ b/tests/Tracy/Dumper.toText().phpt
@@ -50,65 +50,73 @@ Assert::same(str_replace(
 	"\r",
 	'',
 	<<<'XX'
-array (1)
-   0 => 1
+		array (1)
+		   0 => 1
 
-XX
+		XX,
 ), Dumper::toText([1]));
 
-Assert::match(<<<'XX'
-array (5)
-   0 => 1
-   1 => 'hello'
-   2 => array (0)
-   3 => array (2)
-   |  0 => 1
-   |  1 => 2
-   4 => array (7)
-   |  1 => 1
-   |  2 => 2
-   |  3 => 3
-   |  4 => 4
-   |  5 => 5
-   |  6 => 6
-   |  7 => 7
-XX
-	, Dumper::toText([1, 'hello', [], [1, 2], [1 => 1, 2, 3, 4, 5, 6, 7]]));
+Assert::match(
+	<<<'XX'
+		array (5)
+		   0 => 1
+		   1 => 'hello'
+		   2 => array (0)
+		   3 => array (2)
+		   |  0 => 1
+		   |  1 => 2
+		   4 => array (7)
+		   |  1 => 1
+		   |  2 => 2
+		   |  3 => 3
+		   |  4 => 4
+		   |  5 => 5
+		   |  6 => 6
+		   |  7 => 7
+		XX,
+	Dumper::toText([1, 'hello', [], [1, 2], [1 => 1, 2, 3, 4, 5, 6, 7]]),
+);
 
 
 // multiline
-Assert::match(<<<'XX'
-array (3)
-   0 => 'hello'
-   1 => string
-   |  'a\n
-   |   b'
-   2 => array (1)
-   |  0 => string
-   |  |  'a\n
-   |  |   b'
-XX
-	, Dumper::toText(['hello', "a\nb", ["a\nb"]]));
+Assert::match(
+	<<<'XX'
+		array (3)
+		   0 => 'hello'
+		   1 => string
+		   |  'a\n
+		   |   b'
+		   2 => array (1)
+		   |  0 => string
+		   |  |  'a\n
+		   |  |   b'
+		XX,
+	Dumper::toText(['hello', "a\nb", ["a\nb"]]),
+);
 
 
 // object
 Assert::match('stdClass #%d%', Dumper::toText(new stdClass));
 
-Assert::match(<<<'XX'
-stdClass #%d%
-   '': 'foo'
-XX
-	, Dumper::toText((object) ['' => 'foo']));
+Assert::match(
+	<<<'XX'
+		stdClass #%d%
+		   '': 'foo'
+		XX,
+	Dumper::toText((object) ['' => 'foo']),
+);
 
-Assert::match(<<<'XX'
-Test #%d%
-   x: array (2)
-   |  0 => 10
-   |  1 => null
-   y: 'hello'
-   z: 30.0
-XX
-	, Dumper::toText(new Test));
+Assert::match(
+	<<<'XX'
+		Test #%d%
+		   x: array (2)
+		   |  0 => 10
+		   |  1 => null
+		   y: 'hello'
+		   z: 30.0
+		XX,
+	Dumper::toText(new Test),
+);
 
 
 $obj = new Child;
@@ -117,31 +125,35 @@ $obj->{0} = 8;
 $obj->{1} = 9;
 $obj->{''} = 10;
 
-Assert::match(<<<'XX'
-Child #%d%
-   new: 7
-   0: 8
-   1: 9
-   '': 10
-   x: 1
-   y: 2
-   z: 3
-   x2: 4
-   y2: 5
-   z2: 6
-   y: 'hello'
-XX
-	, Dumper::toText($obj));
+Assert::match(
+	<<<'XX'
+		Child #%d%
+		   new: 7
+		   0: 8
+		   1: 9
+		   '': 10
+		   x: 1
+		   y: 2
+		   z: 3
+		   x2: 4
+		   y2: 5
+		   z2: 6
+		   y: 'hello'
+		XX,
+	Dumper::toText($obj),
+);
 
 
 // PHP 7.4 features
-Assert::match(<<<'XX'
-Test74 #%d%
-   x: 1
-   y: unset
-   z: unset
-XX
-, Dumper::toText(new Test74));
+Assert::match(
+	<<<'XX'
+		Test74 #%d%
+		   x: 1
+		   y: unset
+		   z: unset
+		XX,
+	Dumper::toText(new Test74),
+);
 
 
 $obj = new Child74;
@@ -149,14 +161,16 @@ $obj->new = 7;
 unset($obj->unset1, $obj->unset2);
 
 
-Assert::match(<<<'XX'
-Child74 #%d%
-   new: 7
-   x: 2
-   y: unset
-   z: unset
-   unset1: unset
-   unset2: unset
-   y: unset
-XX
-		, Dumper::toText($obj));
+Assert::match(
+	<<<'XX'
+		Child74 #%d%
+		   new: 7
+		   x: 2
+		   y: unset
+		   z: unset
+		   unset1: unset
+		   unset2: unset
+		   y: unset
+		XX,
+	Dumper::toText($obj),
+);
diff --git a/tests/Tracy/Dumper.toText().recursion.phpt b/tests/Tracy/Dumper.toText().recursion.phpt
index 8aec242df..68d5d0b82 100644
--- a/tests/Tracy/Dumper.toText().recursion.phpt
+++ b/tests/Tracy/Dumper.toText().recursion.phpt
@@ -14,26 +14,30 @@ require __DIR__ . '/../bootstrap.php';
 
 $arr = [1, 2, 3];
 $arr[] = &$arr;
-Assert::match(<<<'XX'
-array (4)
-   0 => 1
-   1 => 2
-   2 => 3
-   3 => &1 array (4)
-   |  0 => 1
-   |  1 => 2
-   |  2 => 3
-   |  3 => &1 array (4) RECURSION
-XX
-	, Dumper::toText($arr));
+Assert::match(
+	<<<'XX'
+		array (4)
+		   0 => 1
+		   1 => 2
+		   2 => 3
+		   3 => &1 array (4)
+		   |  0 => 1
+		   |  1 => 2
+		   |  2 => 3
+		   |  3 => &1 array (4) RECURSION
+		XX,
+	Dumper::toText($arr),
+);
 
 
 $arr = (object) ['x' => 1, 'y' => 2];
 $arr->z = &$arr;
-Assert::match(<<<'XX'
-stdClass #%d%
-   x: 1
-   y: 2
-   z: &1 stdClass #%d% RECURSION
-XX
-	, Dumper::toText($arr));
+Assert::match(
+	<<<'XX'
+		stdClass #%d%
+		   x: 1
+		   y: 2
+		   z: &1 stdClass #%d% RECURSION
+		XX,
+	Dumper::toText($arr),
+);
diff --git a/tests/Tracy/Dumper.toText().references.phpt b/tests/Tracy/Dumper.toText().references.phpt
index 0324ae8cc..a5936d54f 100644
--- a/tests/Tracy/Dumper.toText().references.phpt
+++ b/tests/Tracy/Dumper.toText().references.phpt
@@ -17,20 +17,22 @@ $a = 1;
 $b = 2;
 $obj = (object) [&$a, $a, &$b, $b, (object) [&$a, &$b], (object) [$a, $b], [&$b, &$a]];
 
-Assert::match(<<<'XX'
-stdClass #%d%
-   0: &1 1
-   1: 1
-   2: &2 2
-   3: 2
-   4: stdClass #%d%
-   |  0: &1 1
-   |  1: &2 2
-   5: stdClass #%d%
-   |  0: 1
-   |  1: 2
-   6: array (2)
-   |  0 => &2 2
-   |  1 => &1 1
-XX
-	, Dumper::toText($obj));
+Assert::match(
+	<<<'XX'
+		stdClass #%d%
+		   0: &1 1
+		   1: 1
+		   2: &2 2
+		   3: 2
+		   4: stdClass #%d%
+		   |  0: &1 1
+		   |  1: &2 2
+		   5: stdClass #%d%
+		   |  0: 1
+		   |  1: 2
+		   6: array (2)
+		   |  0 => &2 2
+		   |  1 => &1 1
+		XX,
+	Dumper::toText($obj),
+);
diff --git a/tests/Tracy/Dumper.toText().see.phpt b/tests/Tracy/Dumper.toText().see.phpt
index 6603ac80c..0174796f1 100644
--- a/tests/Tracy/Dumper.toText().see.phpt
+++ b/tests/Tracy/Dumper.toText().see.phpt
@@ -40,56 +40,58 @@ $var = [
 ];
 
 
-Assert::match(<<<'XX'
-array (8)
-   0 => Test #%d%
-   |  a: array (1)
-   |  |  1 => array (1)
-   |  |  |  2 => array (1) ...
-   'a' => stdClass #%d%
-   |  b: array (1)
-   |  |  'c' => array (5)
-   |  |  |  0 => Test #%d% see below
-   |  |  |  1 => Test #%d% ...
-   |  |  |  2 => &1 array (1) see below
-   |  |  |  3 => array (1) ...
-   |  |  |  4 => stream resource @%d%
-   |  |  |  |  timed_out: false
-   |  |  |  |  blocked: true
-   |  |  |  |  eof: false
-   |  |  |  |  wrapper_type: 'plainfile'
-   |  |  |  |  stream_type: 'STDIO'
-   |  |  |  |  mode: 'r'
-   |  |  |  |  unread_bytes: 0
-   |  |  |  |  seekable: true
-   |  |  |  |  uri: '%a%'
-   |  0: Test #%d% see below
-   |  1: Test #%d% see above
-   |  2: Test #%d%
-   |  |  a: array (1)
-   |  |  |  1 => array (1) ...
-   |  3: &1 array (1) see below
-   |  4: array (1)
-   |  |  1 => array (1)
-   |  |  |  2 => array (1) ...
-   |  5: stream resource @%d% see above
-   1 => Test #%d%
-   |  a: array (1)
-   |  |  1 => array (1)
-   |  |  |  2 => array (1) ...
-   2 => Test #%d% see above
-   3 => Test #%d%
-   |  a: array (1)
-   |  |  1 => array (1)
-   |  |  |  2 => array (1) ...
-   4 => &1 array (1)
-   |  1 => array (1)
-   |  |  2 => array (1)
-   |  |  |  3 => 'item'
-   5 => array (1)
-   |  1 => array (1)
-   |  |  2 => array (1)
-   |  |  |  3 => 'item'
-   6 => stream resource @%d% see above
-XX
-	, Dumper::toText($var, [Dumper::DEPTH => 4]));
+Assert::match(
+	<<<'XX'
+		array (8)
+		   0 => Test #%d%
+		   |  a: array (1)
+		   |  |  1 => array (1)
+		   |  |  |  2 => array (1) ...
+		   'a' => stdClass #%d%
+		   |  b: array (1)
+		   |  |  'c' => array (5)
+		   |  |  |  0 => Test #%d% see below
+		   |  |  |  1 => Test #%d% ...
+		   |  |  |  2 => &1 array (1) see below
+		   |  |  |  3 => array (1) ...
+		   |  |  |  4 => stream resource @%d%
+		   |  |  |  |  timed_out: false
+		   |  |  |  |  blocked: true
+		   |  |  |  |  eof: false
+		   |  |  |  |  wrapper_type: 'plainfile'
+		   |  |  |  |  stream_type: 'STDIO'
+		   |  |  |  |  mode: 'r'
+		   |  |  |  |  unread_bytes: 0
+		   |  |  |  |  seekable: true
+		   |  |  |  |  uri: '%a%'
+		   |  0: Test #%d% see below
+		   |  1: Test #%d% see above
+		   |  2: Test #%d%
+		   |  |  a: array (1)
+		   |  |  |  1 => array (1) ...
+		   |  3: &1 array (1) see below
+		   |  4: array (1)
+		   |  |  1 => array (1)
+		   |  |  |  2 => array (1) ...
+		   |  5: stream resource @%d% see above
+		   1 => Test #%d%
+		   |  a: array (1)
+		   |  |  1 => array (1)
+		   |  |  |  2 => array (1) ...
+		   2 => Test #%d% see above
+		   3 => Test #%d%
+		   |  a: array (1)
+		   |  |  1 => array (1)
+		   |  |  |  2 => array (1) ...
+		   4 => &1 array (1)
+		   |  1 => array (1)
+		   |  |  2 => array (1)
+		   |  |  |  3 => 'item'
+		   5 => array (1)
+		   |  1 => array (1)
+		   |  |  2 => array (1)
+		   |  |  |  3 => 'item'
+		   6 => stream resource @%d% see above
+		XX,
+	Dumper::toText($var, [Dumper::DEPTH => 4]),
+);
diff --git a/tests/Tracy/Dumper.toText().specialChars.phpt b/tests/Tracy/Dumper.toText().specialChars.phpt
index 9aa1db39c..0aba0ee78 100644
--- a/tests/Tracy/Dumper.toText().specialChars.phpt
+++ b/tests/Tracy/Dumper.toText().specialChars.phpt
@@ -12,30 +12,31 @@ use Tracy\Dumper;
 require __DIR__ . '/../bootstrap.php';
 
 
-Assert::match(<<<'XX'
-array (14)
-   0 => ''
-   1 => ' '
-   2 => '\x00'
-   3 => '\xFF'
-   4 => 'Iñtërnâtiônàlizætiøn'
-   5 => string
-   |  'utf \n
-   |   \r\t    \e\x00 Iñtër\n'
-   6 => 'utf \n\r\t\xab Iñtër'
-   7 => string
-   |  'binary \n
-   |   \r\t    \e\x00 I\xC3\xB1t\xC3\xABr \xA0'
-   8 => 'binary \n\r\t\xab I\xC3\xB1t\xC3\xABr \xA0'
-   'utf \n\r\t\xab Iñtër' => 1
-   'utf \n
-    \r\t    \e\x00 Iñtër' => 2
-   'utf \n
-    \r\t    \e\x00 I\xC3\xB1t\xC3\xABr \xA0' => 3
-   '<div> &amp;' => '<div> &amp;'
-   9 => '\u{FEFF}'
-XX
-	, Dumper::toText([
+Assert::match(
+	<<<'XX'
+		array (14)
+		   0 => ''
+		   1 => ' '
+		   2 => '\x00'
+		   3 => '\xFF'
+		   4 => 'Iñtërnâtiônàlizætiøn'
+		   5 => string
+		   |  'utf \n
+		   |   \r\t    \e\x00 Iñtër\n'
+		   6 => 'utf \n\r\t\xab Iñtër'
+		   7 => string
+		   |  'binary \n
+		   |   \r\t    \e\x00 I\xC3\xB1t\xC3\xABr \xA0'
+		   8 => 'binary \n\r\t\xab I\xC3\xB1t\xC3\xABr \xA0'
+		   'utf \n\r\t\xab Iñtër' => 1
+		   'utf \n
+		    \r\t    \e\x00 Iñtër' => 2
+		   'utf \n
+		    \r\t    \e\x00 I\xC3\xB1t\xC3\xABr \xA0' => 3
+		   '<div> &amp;' => '<div> &amp;'
+		   9 => '\u{FEFF}'
+		XX,
+	Dumper::toText([
 		'',
 		' ',
 		"\x00",
@@ -50,4 +51,5 @@ XX
 		"utf \n\r\t\e\x00 Iñtër \xA0" => 3, // binary + control chars in key
 		'<div> &amp;' => '<div> &amp;', // HTML
 		"\xEF\xBB\xBF", // BOM
-	]));
+	]),
+);
diff --git a/tests/Tracy/Dumper.toText().specials.dom.phpt b/tests/Tracy/Dumper.toText().specials.dom.phpt
index e63f84702..b964d0896 100644
--- a/tests/Tracy/Dumper.toText().specials.dom.phpt
+++ b/tests/Tracy/Dumper.toText().specials.dom.phpt
@@ -21,117 +21,127 @@ $namedNodeMap = $nodeList->item(0)->attributes;
 $element = $nodeList->item(0);
 
 
-Assert::match(<<<'XX'
-DOMDocument #%d%
-   actualEncoding: null
-   attributes: null
-   baseURI: null
-%A%
-   doctype: DOMDocumentType #%d%
-   |  attributes: null
-   |  baseURI: null
-   |  childNodes: %a%
-   |  entities: DOMNamedNodeMap #%d% ...
-   |  firstChild: null
-   |  internalSubset: null
-   |  lastChild: null
-   |  localName: null
-   |  name: 'html'
-   |  namespaceURI: null
-   |  nextSibling: DOMElement #%d% see below
-   |  nodeName: 'html'
-   |  nodeType: 10
-   |  nodeValue: null
-   |  notations: DOMNamedNodeMap #%d% ...
-   |  ownerDocument: DOMDocument #%d% RECURSION
-   |  parentNode: DOMDocument #%d% RECURSION
-   |  prefix: ''
-   |  previousSibling: null
-   |  publicId: ''
-   |  systemId: ''
-   |  textContent: ''
-   documentElement: DOMElement #%d%
-   |  attributes: DOMNamedNodeMap #%d% ...
-%A%
-   localName: null
-   namespaceURI: null
-   nextSibling: null
-   nodeName: '#document'
-   nodeType: 13
-   nodeValue: null
-   ownerDocument: null
-   parentNode: null
-   prefix: ''
-   preserveWhiteSpace: true
-   previousSibling: null
-   recover: false
-   resolveExternals: false
-   standalone: true
-   strictErrorChecking: true
-   substituteEntities: false
-   textContent: 'Ahoj'
-   validateOnParse: false
-   version: null
-   xmlEncoding: null
-   xmlStandalone: true
-   xmlVersion: null
-XX
-	, Dumper::toText($dom, [Dumper::DEPTH => 2]));
-
-
-Assert::match(<<<'XX'
-DOMNodeList #%d%
-   length: 1
-   items: array (1)
-   |  0 => DOMElement #%d% ...
-XX
-	, Dumper::toText($nodeList, [Dumper::DEPTH => 2]));
-
-
-Assert::match(<<<'XX'
-DOMNamedNodeMap #%d%
-   length: 1
-   items: array (1)
-   |  'class' => DOMAttr #%d%
-   |  |  attributes: null
-   |  |  baseURI: null
-   |  |  childNodes: DOMNodeList #%d% ...
-   |  |  firstChild: DOMText #%d% ...
-   |  |  lastChild: DOMText #%d% ...
-   |  |  localName: 'class'
-   |  |  name: 'class'
-   |  |  namespaceURI: null
-   |  |  nextSibling: null
-   |  |  nodeName: 'class'
-   |  |  nodeType: 2
-   |  |  nodeValue: 'a'
-   |  |  ownerDocument: DOMDocument #%d% ...
-   |  |  ownerElement: DOMElement #%d% ...
-   |  |  parentNode: DOMElement #%d% ...
-   |  |  prefix: ''
-   |  |  previousSibling: null
-   |  |  schemaTypeInfo: null
-   |  |  specified: true
-   |  |  textContent: 'a'
-   |  |  value: 'a'
-XX
-	, Dumper::toText($namedNodeMap, [Dumper::DEPTH => 3]));
-
-
-Assert::match(<<<'XX'
-DOMElement #%d%
-   attributes: DOMNamedNodeMap #%d% ...
-   baseURI: null
-%A%
-   previousSibling: null
-   schemaTypeInfo: null
-   tagName: 'li'
-   textContent: 'Ahoj'
-XX
-	, Dumper::toText($element, [Dumper::DEPTH => 1]));
-
-
-Assert::match(<<<'XX'
-DOMXPath #%d%%A%
-XX
-	, Dumper::toText($xpath, [Dumper::DEPTH => 1]));
+Assert::match(
+	<<<'XX'
+		DOMDocument #%d%
+		   actualEncoding: null
+		   attributes: null
+		   baseURI: null
+		%A%
+		   doctype: DOMDocumentType #%d%
+		   |  attributes: null
+		   |  baseURI: null
+		   |  childNodes: %a%
+		   |  entities: DOMNamedNodeMap #%d% ...
+		   |  firstChild: null
+		   |  internalSubset: null
+		   |  lastChild: null
+		   |  localName: null
+		   |  name: 'html'
+		   |  namespaceURI: null
+		   |  nextSibling: DOMElement #%d% see below
+		   |  nodeName: 'html'
+		   |  nodeType: 10
+		   |  nodeValue: null
+		   |  notations: DOMNamedNodeMap #%d% ...
+		   |  ownerDocument: DOMDocument #%d% RECURSION
+		   |  parentNode: DOMDocument #%d% RECURSION
+		   |  prefix: ''
+		   |  previousSibling: null
+		   |  publicId: ''
+		   |  systemId: ''
+		   |  textContent: ''
+		   documentElement: DOMElement #%d%
+		   |  attributes: DOMNamedNodeMap #%d% ...
+		%A%
+		   localName: null
+		   namespaceURI: null
+		   nextSibling: null
+		   nodeName: '#document'
+		   nodeType: 13
+		   nodeValue: null
+		   ownerDocument: null
+		   parentNode: null
+		   prefix: ''
+		   preserveWhiteSpace: true
+		   previousSibling: null
+		   recover: false
+		   resolveExternals: false
+		   standalone: true
+		   strictErrorChecking: true
+		   substituteEntities: false
+		   textContent: 'Ahoj'
+		   validateOnParse: false
+		   version: null
+		   xmlEncoding: null
+		   xmlStandalone: true
+		   xmlVersion: null
+		XX,
+	Dumper::toText($dom, [Dumper::DEPTH => 2]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		DOMNodeList #%d%
+		   length: 1
+		   items: array (1)
+		   |  0 => DOMElement #%d% ...
+		XX,
+	Dumper::toText($nodeList, [Dumper::DEPTH => 2]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		DOMNamedNodeMap #%d%
+		   length: 1
+		   items: array (1)
+		   |  'class' => DOMAttr #%d%
+		   |  |  attributes: null
+		   |  |  baseURI: null
+		   |  |  childNodes: DOMNodeList #%d% ...
+		   |  |  firstChild: DOMText #%d% ...
+		   |  |  lastChild: DOMText #%d% ...
+		   |  |  localName: 'class'
+		   |  |  name: 'class'
+		   |  |  namespaceURI: null
+		   |  |  nextSibling: null
+		   |  |  nodeName: 'class'
+		   |  |  nodeType: 2
+		   |  |  nodeValue: 'a'
+		   |  |  ownerDocument: DOMDocument #%d% ...
+		   |  |  ownerElement: DOMElement #%d% ...
+		   |  |  parentNode: DOMElement #%d% ...
+		   |  |  prefix: ''
+		   |  |  previousSibling: null
+		   |  |  schemaTypeInfo: null
+		   |  |  specified: true
+		   |  |  textContent: 'a'
+		   |  |  value: 'a'
+		XX,
+	Dumper::toText($namedNodeMap, [Dumper::DEPTH => 3]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		DOMElement #%d%
+		   attributes: DOMNamedNodeMap #%d% ...
+		   baseURI: null
+		%A%
+		   previousSibling: null
+		   schemaTypeInfo: null
+		   tagName: 'li'
+		   textContent: 'Ahoj'
+		XX,
+	Dumper::toText($element, [Dumper::DEPTH => 1]),
+);
+
+
+Assert::match(
+	<<<'XX'
+		DOMXPath #%d%%A%
+		XX,
+	Dumper::toText($xpath, [Dumper::DEPTH => 1]),
+);
diff --git a/tests/Tracy/Dumper.toText().specials.ds.phpt b/tests/Tracy/Dumper.toText().specials.ds.phpt
index a99533276..b2460650b 100644
--- a/tests/Tracy/Dumper.toText().specials.ds.phpt
+++ b/tests/Tracy/Dumper.toText().specials.ds.phpt
@@ -14,19 +14,23 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $collection = new Ds\Vector(['value']);
-Assert::match(<<<'XX'
-Ds\Vector #%d%
-   0: 'value'
-XX
-	, Dumper::toText($collection));
+Assert::match(
+	<<<'XX'
+		Ds\Vector #%d%
+		   0: 'value'
+		XX,
+	Dumper::toText($collection),
+);
 
 
 $map = new Ds\Map;
 $map->put('key', 'value');
-Assert::match(<<<'XX'
-Ds\Map #%d%
-   0: Ds\Pair #%d%
-   |  key: 'key'
-   |  value: 'value'
-XX
-	, Dumper::toText($map));
+Assert::match(
+	<<<'XX'
+		Ds\Map #%d%
+		   0: Ds\Pair #%d%
+		   |  key: 'key'
+		   |  value: 'value'
+		XX,
+	Dumper::toText($map),
+);
diff --git a/tests/Tracy/Dumper.toText().specials.enum.phpt b/tests/Tracy/Dumper.toText().specials.enum.phpt
index 2bdc78e04..10c522ae6 100644
--- a/tests/Tracy/Dumper.toText().specials.enum.phpt
+++ b/tests/Tracy/Dumper.toText().specials.enum.phpt
@@ -27,11 +27,13 @@ enum Methods: string
 	case POST = 'post';
 }
 
-Assert::match(<<<'XX'
-array (3)
-   0 => Suit::Clubs #%d%
-   1 => Methods::GET #%d%
-   |  value: 'get'
-   2 => Methods::GET #%d% see above
-XX
-	, Dumper::toText([Suit::Clubs, Methods::GET, Methods::GET]));
+Assert::match(
+	<<<'XX'
+		array (3)
+		   0 => Suit::Clubs #%d%
+		   1 => Methods::GET #%d%
+		   |  value: 'get'
+		   2 => Methods::GET #%d% see above
+		XX,
+	Dumper::toText([Suit::Clubs, Methods::GET, Methods::GET]),
+);
diff --git a/tests/Tracy/Dumper.toText().specials.fiber.phpt b/tests/Tracy/Dumper.toText().specials.fiber.phpt
index 0a8361b7e..285e4de3a 100644
--- a/tests/Tracy/Dumper.toText().specials.fiber.phpt
+++ b/tests/Tracy/Dumper.toText().specials.fiber.phpt
@@ -20,12 +20,14 @@ $fiber = new Fiber(function (): void {
 Assert::match('Fiber (not started) #%d%', Dumper::toText($fiber));
 
 $fiber->start();
-Assert::match(<<<'XX'
-Fiber #%d%
-   file: '%a%:%d%'
-   callable: Closure() #%d%
-XX
-	, Dumper::toText($fiber));
+Assert::match(
+	<<<'XX'
+		Fiber #%d%
+		   file: '%a%:%d%'
+		   callable: Closure() #%d%
+		XX,
+	Dumper::toText($fiber),
+);
 
 $fiber->resume();
 Assert::match('Fiber (terminated) #%d%', Dumper::toText($fiber));
diff --git a/tests/Tracy/Dumper.toText().specials.generator.phpt b/tests/Tracy/Dumper.toText().specials.generator.phpt
index 555ed9e71..18b08a5b9 100644
--- a/tests/Tracy/Dumper.toText().specials.generator.phpt
+++ b/tests/Tracy/Dumper.toText().specials.generator.phpt
@@ -20,12 +20,14 @@ function gen()
 
 $gen = gen();
 
-Assert::match(<<<'XX'
-Generator #%d%
-   file: '%a%:%d%'
-   this: null
-XX
-	, Dumper::toText($gen));
+Assert::match(
+	<<<'XX'
+		Generator #%d%
+		   file: '%a%:%d%'
+		   this: null
+		XX,
+	Dumper::toText($gen),
+);
 
 $gen->next();
 Assert::match('Generator (terminated) #%d%', Dumper::toText($gen));
@@ -40,9 +42,11 @@ function gen2()
 
 
 $gen = gen2();
-Assert::match(<<<'XX'
-Generator #%d%
-   file: '%a%:%d%'
-   this: null
-XX
-	, Dumper::toText($gen));
+Assert::match(
+	<<<'XX'
+		Generator #%d%
+		   file: '%a%:%d%'
+		   this: null
+		XX,
+	Dumper::toText($gen),
+);
diff --git a/tests/Tracy/Dumper.toText().specials.phpt b/tests/Tracy/Dumper.toText().specials.phpt
index 587e827d9..d92ecf3d3 100644
--- a/tests/Tracy/Dumper.toText().specials.phpt
+++ b/tests/Tracy/Dumper.toText().specials.phpt
@@ -21,19 +21,23 @@ Assert::match('closed resource @%d%', Dumper::toText($f));
 
 
 // closure
-Assert::match(<<<'XX'
-Closure() #%d%
-XX
-	, Dumper::toText(function () {}));
+Assert::match(
+	<<<'XX'
+		Closure() #%d%
+		XX,
+	Dumper::toText(function () {}),
+);
 
 
-Assert::match(<<<'XX'
-Closure($x, $y) #%d%
-   file: '%a%:%d%'
-   use: $use
-   |  $use: null
-XX
-	, Dumper::toText(function ($x, int $y = 1) use (&$use) {}, [Dumper::LOCATION => Dumper::LOCATION_CLASS]));
+Assert::match(
+	<<<'XX'
+		Closure($x, $y) #%d%
+		   file: '%a%:%d%'
+		   use: $use
+		   |  $use: null
+		XX,
+	Dumper::toText(function ($x, int $y = 1) use (&$use) {}, [Dumper::LOCATION => Dumper::LOCATION_CLASS]),
+);
 
 
 // new class
@@ -57,30 +61,34 @@ $objStorage[$o2] = 'o2';
 $objStorage->next();
 $key = $objStorage->key();
 
-Assert::match(<<<'XX'
-SplObjectStorage #%d%
-   0: array (2)
-   |  'object' => stdClass #%d%
-   |  'data' => 'o1'
-   1: array (2)
-   |  'object' => stdClass #%d%
-   |  |  foo: 'bar'
-   |  'data' => 'o2'
-XX
-	, Dumper::toText($objStorage));
+Assert::match(
+	<<<'XX'
+		SplObjectStorage #%d%
+		   0: array (2)
+		   |  'object' => stdClass #%d%
+		   |  'data' => 'o1'
+		   1: array (2)
+		   |  'object' => stdClass #%d%
+		   |  |  foo: 'bar'
+		   |  'data' => 'o2'
+		XX,
+	Dumper::toText($objStorage),
+);
 
 Assert::same($key, $objStorage->key());
 
 
 // ArrayObject
 $obj = new ArrayObject(['a' => 1, 'b' => 2]);
-Assert::match(<<<'XX'
-ArrayObject #%d%
-   storage: array (2)
-   |  'a' => 1
-   |  'b' => 2
-XX
-	, Dumper::toText($obj));
+Assert::match(
+	<<<'XX'
+		ArrayObject #%d%
+		   storage: array (2)
+		   |  'a' => 1
+		   |  'b' => 2
+		XX,
+	Dumper::toText($obj),
+);
 
 class ArrayObjectChild extends ArrayObject
 {
@@ -89,37 +97,41 @@ class ArrayObjectChild extends ArrayObject
 
 $obj = new ArrayObjectChild(['a' => 1, 'b' => 2]);
 Assert::match(<<<'XX'
-ArrayObjectChild #%d%
-   prop: 123
-   storage: array (2)
-   |  'a' => 1
-   |  'b' => 2
-XX
+	ArrayObjectChild #%d%
+	   prop: 123
+	   storage: array (2)
+	   |  'a' => 1
+	   |  'b' => 2
+	XX
 	, Dumper::toText($obj));
 
 
 // ArrayIterator
 $obj = new ArrayIterator(['a' => 1, 'b' => 2]);
-Assert::match(<<<'XX'
-ArrayIterator #%d%
-   a: 1
-   b: 2
-XX
-	, Dumper::toText($obj));
+Assert::match(
+	<<<'XX'
+		ArrayIterator #%d%
+		   a: 1
+		   b: 2
+		XX,
+	Dumper::toText($obj),
+);
 
 
 // Tracy\Dumper\Value
 $obj = new Tracy\Dumper\Value(Tracy\Dumper\Value::TypeText, 'ahoj');
-Assert::match(<<<'XX'
-Tracy\Dumper\Value #%d%
-   type: 'text'
-   value: 'ahoj'
-   length: null
-   depth: null
-   id: null
-   holder: null
-   items: null
-   editor: null
-   collapsed: null
-XX
-	, Dumper::toText($obj));
+Assert::match(
+	<<<'XX'
+		Tracy\Dumper\Value #%d%
+		   type: 'text'
+		   value: 'ahoj'
+		   length: null
+		   depth: null
+		   id: null
+		   holder: null
+		   items: null
+		   editor: null
+		   collapsed: null
+		XX,
+	Dumper::toText($obj),
+);
diff --git a/tests/Tracy/dump().html.phpt b/tests/Tracy/dump().html.phpt
index 0d424fc24..61e14f5da 100644
--- a/tests/Tracy/dump().html.phpt
+++ b/tests/Tracy/dump().html.phpt
@@ -20,15 +20,17 @@ test('html mode', function () {
 	setHtmlMode();
 	ob_start();
 	dump(123);
-	Assert::match(<<<'XX'
-<tracy-div><style>%a%</style>
-<script>%a%</script>
-<pre class="tracy-dump tracy-light"
-><a href="editor://%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">dump(123) 📍</a
-><span class="tracy-dump-number">123</span></pre>
-</tracy-div>
-XX
-		, ob_get_clean());
+	Assert::match(
+		<<<'XX'
+			<tracy-div><style>%a%</style>
+			<script>%a%</script>
+			<pre class="tracy-dump tracy-light"
+			><a href="editor://%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">dump(123) 📍</a
+			><span class="tracy-dump-number">123</span></pre>
+			</tracy-div>
+			XX,
+		ob_get_clean(),
+	);
 });
 
 
@@ -37,13 +39,15 @@ test('dark theme', function () {
 
 	ob_start();
 	dump(123);
-	Assert::match(<<<'XX'
-<tracy-div><pre class="tracy-dump tracy-dark"
-><a href="editor://%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">dump(123) 📍</a
-><span class="tracy-dump-number">123</span></pre>
-</tracy-div>
-XX
-		, ob_get_clean());
+	Assert::match(
+		<<<'XX'
+			<tracy-div><pre class="tracy-dump tracy-dark"
+			><a href="editor://%a%" class="tracy-dump-location" title="in file %a% on line %d%&#10;Click to open in editor">dump(123) 📍</a
+			><span class="tracy-dump-number">123</span></pre>
+			</tracy-div>
+			XX,
+		ob_get_clean(),
+	);
 });
 
 

From 31ee43e7f52ca72890d62f7a0d225d164511fb44 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Thu, 7 Apr 2022 18:06:37 +0200
Subject: [PATCH 07/30] coding style: reformatted Assert::exception

---
 tests/Tracy/Debugger.E_RECOVERABLE_ERROR.phpt | 31 ++++++++++---------
 tests/Tracy/Debugger.log().error.phpt         | 16 ++++++----
 tests/Tracy/Logger.log().errors.phpt          | 22 +++++++------
 3 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/tests/Tracy/Debugger.E_RECOVERABLE_ERROR.phpt b/tests/Tracy/Debugger.E_RECOVERABLE_ERROR.phpt
index 44d8db727..20b87966a 100644
--- a/tests/Tracy/Debugger.E_RECOVERABLE_ERROR.phpt
+++ b/tests/Tracy/Debugger.E_RECOVERABLE_ERROR.phpt
@@ -39,17 +39,20 @@ class TestClass
 
 $obj = new TestClass;
 
-Assert::exception(function () use ($obj) {
-	// Invalid argument #1
-	$obj->test1('hello');
-}, TypeError::class, 'Argument 1 passed to TestClass::test1() must be %a% array, string given, called in %a%');
-
-Assert::exception(function () use ($obj) {
-	// Invalid argument #2
-	$obj->test2('hello');
-}, TypeError::class, 'Argument 1 passed to TestClass::test2() must be an instance of TestClass, string given, called in %a%');
-
-Assert::exception(function () use ($obj) {
-	// Invalid toString
-	echo $obj;
-}, ErrorException::class, 'Method TestClass::__toString() must return a string value');
+Assert::exception(
+	fn() => $obj->test1('hello'),
+	TypeError::class,
+	'Argument 1 passed to TestClass::test1() must be %a% array, string given, called in %a%',
+);
+
+Assert::exception(
+	fn() => $obj->test2('hello'),
+	TypeError::class,
+	'Argument 1 passed to TestClass::test2() must be an instance of TestClass, string given, called in %a%',
+);
+
+Assert::exception(
+	fn() => (string) $obj,
+	ErrorException::class,
+	'Method TestClass::__toString() must return a string value',
+);
diff --git a/tests/Tracy/Debugger.log().error.phpt b/tests/Tracy/Debugger.log().error.phpt
index 319f30c6a..f1488f754 100644
--- a/tests/Tracy/Debugger.log().error.phpt
+++ b/tests/Tracy/Debugger.log().error.phpt
@@ -12,9 +12,11 @@ use Tracy\Debugger;
 require __DIR__ . '/../bootstrap.php';
 
 
-Assert::exception(function () {
-	Debugger::log('Hello');
-}, LogicException::class, 'Logging directory is not specified.');
+Assert::exception(
+	fn() => Debugger::log('Hello'),
+	LogicException::class,
+	'Logging directory is not specified.',
+);
 
 
 // no error
@@ -23,6 +25,8 @@ Debugger::log('Hello');
 
 
 Debugger::$logDirectory = getTempDir() . '/unknown';
-Assert::exception(function () {
-	Debugger::log('Hello');
-}, RuntimeException::class, "Logging directory '%a%' is not found or is not directory.");
+Assert::exception(
+	fn() => Debugger::log('Hello'),
+	RuntimeException::class,
+	"Logging directory '%a%' is not found or is not directory.",
+);
diff --git a/tests/Tracy/Logger.log().errors.phpt b/tests/Tracy/Logger.log().errors.phpt
index 05807c0c9..238e325da 100644
--- a/tests/Tracy/Logger.log().errors.phpt
+++ b/tests/Tracy/Logger.log().errors.phpt
@@ -16,14 +16,18 @@ $logger = new Logger(getTempDir());
 $logger->log('Hello'); // no error
 
 
-Assert::exception(function () {
-	$logger = new Logger(getTempDir() . '/unknown');
-	$logger->log('Hello');
-}, RuntimeException::class, "Logging directory '%a%' is not found or is not directory.");
+$logger = new Logger(getTempDir() . '/unknown');
+Assert::exception(
+	fn() => $logger->log('Hello'),
+	RuntimeException::class,
+	"Logging directory '%a%' is not found or is not directory.",
+);
 
 
-Assert::exception(function () {
-	$logger = new Logger(getTempDir());
-	mkdir(getTempDir() . '/test.log');
-	$logger->log('Hello', 'test');
-}, RuntimeException::class, "Unable to write to log file '%a%'. Is directory writable?");
+$logger = new Logger(getTempDir());
+mkdir(getTempDir() . '/test.log');
+Assert::exception(
+	fn() => $logger->log('Hello', 'test'),
+	RuntimeException::class,
+	"Unable to write to log file '%a%'. Is directory writable?",
+);

From 10ad9b33e5678ae08b1a9a91dde57a0e8c7e6f2f Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Thu, 3 Feb 2022 17:37:54 +0100
Subject: [PATCH 08/30] added property typehints

---
 src/Bridges/Nette/MailSender.php              |   5 +-
 src/Bridges/Nette/TracyExtension.php          |   7 +-
 src/Bridges/Psr/PsrToTracyLoggerAdapter.php   |   3 +-
 src/Bridges/Psr/TracyToPsrLoggerAdapter.php   |   3 +-
 src/Tracy/Bar/Bar.php                         |   6 +-
 src/Tracy/BlueScreen/BlueScreen.php           |  34 ++---
 src/Tracy/Debugger/Debugger.php               | 125 ++++++++----------
 src/Tracy/Debugger/DeferredContent.php        |  11 +-
 src/Tracy/Debugger/DevelopmentStrategy.php    |  11 +-
 src/Tracy/Dumper/Describer.php                |  32 ++---
 src/Tracy/Dumper/Dumper.php                   |  20 +--
 src/Tracy/Dumper/Renderer.php                 |  43 ++----
 src/Tracy/Dumper/Value.php                    |  35 ++---
 src/Tracy/OutputDebugger/OutputDebugger.php   |   2 +-
 src/Tracy/Session/FileSession.php             |  15 +--
 .../PsrToTracyLoggerAdapter.phpt              |   2 +-
 .../TracyToPsrLoggerAdapter.phpt              |   2 +-
 tests/Tracy/Dumper.toText().specials.phpt     |   2 +-
 18 files changed, 133 insertions(+), 225 deletions(-)

diff --git a/src/Bridges/Nette/MailSender.php b/src/Bridges/Nette/MailSender.php
index dd4c43c59..b6fde2130 100644
--- a/src/Bridges/Nette/MailSender.php
+++ b/src/Bridges/Nette/MailSender.php
@@ -20,11 +20,10 @@ class MailSender
 {
 	use Nette\SmartObject;
 
-	/** @var Nette\Mail\IMailer */
-	private $mailer;
+	private Nette\Mail\IMailer $mailer;
 
 	/** @var string|null sender of email notifications */
-	private $fromEmail;
+	private ?string $fromEmail = null;
 
 
 	public function __construct(Nette\Mail\IMailer $mailer, ?string $fromEmail = null)
diff --git a/src/Bridges/Nette/TracyExtension.php b/src/Bridges/Nette/TracyExtension.php
index c2e39ebe5..a467f2acf 100644
--- a/src/Bridges/Nette/TracyExtension.php
+++ b/src/Bridges/Nette/TracyExtension.php
@@ -22,11 +22,8 @@ class TracyExtension extends Nette\DI\CompilerExtension
 {
 	private const ErrorSeverityPattern = 'E_(?:ALL|PARSE|STRICT|RECOVERABLE_ERROR|(?:CORE|COMPILE)_(?:ERROR|WARNING)|(?:USER_)?(?:ERROR|WARNING|NOTICE|DEPRECATED))';
 
-	/** @var bool */
-	private $debugMode;
-
-	/** @var bool */
-	private $cliMode;
+	private bool $debugMode;
+	private bool $cliMode;
 
 
 	public function __construct(bool $debugMode = false, bool $cliMode = false)
diff --git a/src/Bridges/Psr/PsrToTracyLoggerAdapter.php b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
index 28fac20eb..291b06084 100644
--- a/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
+++ b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
@@ -28,8 +28,7 @@ class PsrToTracyLoggerAdapter implements Tracy\ILogger
 		Tracy\ILogger::CRITICAL => Psr\Log\LogLevel::CRITICAL,
 	];
 
-	/** @var Psr\Log\LoggerInterface */
-	private $psrLogger;
+	private Psr\Log\LoggerInterface $psrLogger;
 
 
 	public function __construct(Psr\Log\LoggerInterface $psrLogger)
diff --git a/src/Bridges/Psr/TracyToPsrLoggerAdapter.php b/src/Bridges/Psr/TracyToPsrLoggerAdapter.php
index 663846159..3c52f3b9e 100644
--- a/src/Bridges/Psr/TracyToPsrLoggerAdapter.php
+++ b/src/Bridges/Psr/TracyToPsrLoggerAdapter.php
@@ -30,8 +30,7 @@ class TracyToPsrLoggerAdapter extends Psr\Log\AbstractLogger
 		Psr\Log\LogLevel::DEBUG => Tracy\ILogger::DEBUG,
 	];
 
-	/** @var Tracy\ILogger */
-	private $tracyLogger;
+	private Tracy\ILogger $tracyLogger;
 
 
 	public function __construct(Tracy\ILogger $tracyLogger)
diff --git a/src/Tracy/Bar/Bar.php b/src/Tracy/Bar/Bar.php
index 6778e3fec..037bc3cee 100644
--- a/src/Tracy/Bar/Bar.php
+++ b/src/Tracy/Bar/Bar.php
@@ -16,10 +16,8 @@
 class Bar
 {
 	/** @var IBarPanel[] */
-	private $panels = [];
-
-	/** @var bool */
-	private $loaderRendered = false;
+	private array $panels = [];
+	private bool $loaderRendered = false;
 
 
 	/**
diff --git a/src/Tracy/BlueScreen/BlueScreen.php b/src/Tracy/BlueScreen/BlueScreen.php
index 8ddfeefb3..c082bf486 100644
--- a/src/Tracy/BlueScreen/BlueScreen.php
+++ b/src/Tracy/BlueScreen/BlueScreen.php
@@ -18,46 +18,36 @@ class BlueScreen
 	private const MaxMessageLength = 2000;
 
 	/** @var string[] */
-	public $info = [];
+	public array $info = [];
 
 	/** @var string[] paths to be collapsed in stack trace (e.g. core libraries) */
-	public $collapsePaths = [];
+	public array $collapsePaths = [];
 
-	/** @var int  */
-	public $maxDepth = 5;
-
-	/** @var int  */
-	public $maxLength = 150;
-
-	/** @var int */
-	public $maxItems = 100;
+	public int $maxDepth = 5;
+	public int $maxLength = 150;
+	public int $maxItems = 100;
 
 	/** @var callable|null  a callable returning true for sensitive data; fn(string $key, mixed $val): bool */
 	public $scrubber;
 
 	/** @var string[] */
-	public $keysToHide = [
+	public array $keysToHide = [
 		'password', 'passwd', 'pass', 'pwd', 'creditcard', 'credit card', 'cc', 'pin', 'authorization',
 		self::class . '::$snapshot',
 	];
 
-	/** @var bool */
-	public $showEnvironment = true;
+	public bool $showEnvironment = true;
 
 	/** @var callable[] */
-	private $panels = [];
+	private array $panels = [];
 
 	/** @var callable[] functions that returns action for exceptions */
-	private $actions = [];
-
-	/** @var callable[] */
-	private $fileGenerators = [];
-
-	/** @var array */
-	private $snapshot;
+	private array $actions = [];
+	private array $fileGenerators = [];
+	private ?array $snapshot = null;
 
 	/** @var \WeakMap<\Fiber|\Generator> */
-	private $fibers;
+	private \WeakMap $fibers;
 
 
 	public function __construct()
diff --git a/src/Tracy/Debugger/Debugger.php b/src/Tracy/Debugger/Debugger.php
index 495f981fc..c3b4df966 100644
--- a/src/Tracy/Debugger/Debugger.php
+++ b/src/Tracy/Debugger/Debugger.php
@@ -33,71 +33,70 @@ class Debugger
 	public const CookieSecret = 'tracy-debug';
 	public const COOKIE_SECRET = self::CookieSecret;
 
-	/** @var bool in production mode is suppressed any debugging output */
-	public static $productionMode = self::Detect;
+	/** in production mode is suppressed any debugging output */
+	public static ?bool $productionMode = self::DETECT;
 
-	/** @var bool whether to display debug bar in development mode */
-	public static $showBar = true;
+	/** whether to display debug bar in development mode */
+	public static bool $showBar = true;
 
-	/** @var int size of reserved memory */
-	public static $reservedMemorySize = 500_000;
+	/** size of reserved memory */
+	public static int $reservedMemorySize = 500_000;
 
-	/** @var bool */
-	private static $enabled = false;
+	private static bool $enabled = false;
 
-	/** @var string|null reserved memory; also prevents double rendering */
-	private static $reserved;
+	/** reserved memory; also prevents double rendering */
+	private static ?string $reserved = null;
 
-	/** @var int initial output buffer level */
-	private static $obLevel;
+	/** initial output buffer level */
+	private static int $obLevel;
 
-	/** @var ?array output buffer status @internal */
-	public static $obStatus;
+	/** output buffer status @internal */
+	public static ?array $obStatus = null;
 
 	/********************* errors and exceptions reporting ****************d*g**/
 
-	/** @var bool|int determines whether any error will cause immediate death in development mode; if integer that it's matched against error severity */
-	public static $strictMode = false;
+	/** determines whether any error will cause immediate death in development mode; if integer that it's matched against error severity */
+	public static bool|int $strictMode = false;
 
-	/** @var bool|int disables the @ (shut-up) operator so that notices and warnings are no longer hidden; if integer than it's matched against error severity */
-	public static $scream = false;
+	/** disables the @ (shut-up) operator so that notices and warnings are no longer hidden; if integer than it's matched against error severity */
+	public static bool|int $scream = false;
 
 	/** @var callable[] functions that are automatically called after fatal error */
-	public static $onFatalError = [];
+	public static array $onFatalError = [];
 
 	/********************* Debugger::dump() ****************d*g**/
 
-	/** @var int  how many nested levels of array/object properties display by dump() */
-	public static $maxDepth = 15;
+	/** how many nested levels of array/object properties display by dump() */
+	public static int $maxDepth = 15;
 
-	/** @var int  how long strings display by dump() */
-	public static $maxLength = 150;
+	/** how long strings display by dump() */
+	public static int $maxLength = 150;
 
-	/** @var int  how many items in array/object display by dump() */
-	public static $maxItems = 100;
+	/** how many items in array/object display by dump() */
+	public static int $maxItems = 100;
 
-	/** @var bool display location by dump()? */
-	public static $showLocation;
+	/** display location by dump()? */
+	public static ?bool $showLocation = null;
 
 	/** @var string[] sensitive keys not displayed by dump() */
-	public static $keysToHide = [];
+	public static array $keysToHide = [];
 
-	/** @var string theme for dump() */
-	public static $dumpTheme = 'light';
+	/** theme for dump() */
+	public static string $dumpTheme = 'light';
 
 	/** @deprecated */
 	public static $maxLen;
 
 	/********************* logging ****************d*g**/
 
-	/** @var string|null name of the directory where errors should be logged */
-	public static $logDirectory;
+	/** name of the directory where errors should be logged */
+	public static ?string $logDirectory = null;
 
-	/** @var int  log bluescreen in production mode for this error severity */
-	public static $logSeverity = 0;
+	/** log bluescreen in production mode for this error severity */
+	public static int $logSeverity = 0;
 
-	/** @var string|array email(s) to which send error notifications */
-	public static $email;
+	/** email(s) to which send error notifications */
+	public static string|array|null $email = null;
 
 	/** for Debugger::log() */
 	public const
@@ -110,49 +109,41 @@ class Debugger
 
 	/********************* misc ****************d*g**/
 
-	/** @var float timestamp with microseconds of the start of the request */
-	public static $time;
+	/** timestamp with microseconds of the start of the request */
+	public static float $time;
 
-	/** @var string URI pattern mask to open editor */
-	public static $editor = 'editor://%action/?file=%file&line=%line&search=%search&replace=%replace';
+	/** URI pattern mask to open editor */
+	public static ?string $editor = 'editor://%action/?file=%file&line=%line&search=%search&replace=%replace';
 
-	/** @var array replacements in path */
-	public static $editorMapping = [];
+	/** replacements in path */
+	public static array $editorMapping = [];
 
-	/** @var string command to open browser (use 'start ""' in Windows) */
-	public static $browser;
+	/** command to open browser (use 'start ""' in Windows) */
+	public static ?string $browser = null;
 
-	/** @var string custom static error template */
-	public static $errorTemplate;
+	/** custom static error template */
+	public static ?string $errorTemplate = null;
 
 	/** @var string[] */
-	public static $customCssFiles = [];
+	public static array $customCssFiles = [];
 
 	/** @var string[] */
-	public static $customJsFiles = [];
+	public static array $customJsFiles = [];
 
 	/** @var callable[] */
 	private static $sourceMappers = [];
 
-	/** @var array|null */
-	private static $cpuUsage;
+	private static ?array $cpuUsage = null;
 
 	/********************* services ****************d*g**/
 
-	/** @var BlueScreen */
-	private static $blueScreen;
-
-	/** @var Bar */
-	private static $bar;
-
-	/** @var ILogger */
-	private static $logger;
+	private static BlueScreen $blueScreen;
+	private static Bar $bar;
+	private static ILogger $logger;
 
 	/** @var array{DevelopmentStrategy, ProductionStrategy} */
-	private static $strategy;
-
-	/** @var SessionStorage */
-	private static $sessionStorage;
+	private static array $strategy;
+	private static SessionStorage $sessionStorage;
 
 
 	/**
@@ -391,7 +382,7 @@ public static function removeOutputBuffers(bool $errorOccurred): void
 
 	public static function getBlueScreen(): BlueScreen
 	{
-		if (!self::$blueScreen) {
+		if (empty(self::$blueScreen)) {
 			self::$blueScreen = new BlueScreen;
 			self::$blueScreen->info = [
 				'PHP ' . PHP_VERSION,
@@ -406,7 +397,7 @@ public static function getBlueScreen(): BlueScreen
 
 	public static function getBar(): Bar
 	{
-		if (!self::$bar) {
+		if (empty(self::$bar)) {
 			self::$bar = new Bar;
 			self::$bar->addPanel($info = new DefaultBarPanel('info'), 'Tracy:info');
 			$info->cpuUsage = self::$cpuUsage;
@@ -425,7 +416,7 @@ public static function setLogger(ILogger $logger): void
 
 	public static function getLogger(): ILogger
 	{
-		if (!self::$logger) {
+		if (empty(self::$logger)) {
 			self::$logger = new Logger(self::$logDirectory, self::$email, self::getBlueScreen());
 			self::$logger->directory = &self::$logDirectory; // back compatiblity
 			self::$logger->email = &self::$email;
@@ -450,7 +441,7 @@ public static function getStrategy()
 
 	public static function setSessionStorage(SessionStorage $storage): void
 	{
-		if (self::$sessionStorage) {
+		if (isset(self::$sessionStorage)) {
 			throw new \Exception('Storage is already set.');
 		}
 
@@ -461,7 +452,7 @@ public static function setSessionStorage(SessionStorage $storage): void
 	/** @internal */
 	public static function getSessionStorage(): SessionStorage
 	{
-		if (!self::$sessionStorage) {
+		if (empty(self::$sessionStorage)) {
 			self::$sessionStorage = @is_dir($dir = session_save_path())
 				|| @is_dir($dir = ini_get('upload_tmp_dir'))
 				|| @is_dir($dir = sys_get_temp_dir())
diff --git a/src/Tracy/Debugger/DeferredContent.php b/src/Tracy/Debugger/DeferredContent.php
index 038578eb7..ba3b11a72 100644
--- a/src/Tracy/Debugger/DeferredContent.php
+++ b/src/Tracy/Debugger/DeferredContent.php
@@ -15,14 +15,9 @@
  */
 final class DeferredContent
 {
-	/** @var SessionStorage */
-	private $sessionStorage;
-
-	/** @var string */
-	private $requestId;
-
-	/** @var bool */
-	private $useSession = false;
+	private SessionStorage $sessionStorage;
+	private string $requestId;
+	private bool $useSession = false;
 
 
 	public function __construct(SessionStorage $sessionStorage)
diff --git a/src/Tracy/Debugger/DevelopmentStrategy.php b/src/Tracy/Debugger/DevelopmentStrategy.php
index d6a20beeb..e43649943 100644
--- a/src/Tracy/Debugger/DevelopmentStrategy.php
+++ b/src/Tracy/Debugger/DevelopmentStrategy.php
@@ -17,14 +17,9 @@
  */
 final class DevelopmentStrategy
 {
-	/** @var Bar */
-	private $bar;
-
-	/** @var BlueScreen */
-	private $blueScreen;
-
-	/** @var DeferredContent */
-	private $defer;
+	private Bar $bar;
+	private BlueScreen $blueScreen;
+	private DeferredContent $defer;
 
 
 	public function __construct(Bar $bar, BlueScreen $blueScreen, DeferredContent $defer)
diff --git a/src/Tracy/Dumper/Describer.php b/src/Tracy/Dumper/Describer.php
index c370befd1..9458631db 100644
--- a/src/Tracy/Dumper/Describer.php
+++ b/src/Tracy/Dumper/Describer.php
@@ -24,38 +24,28 @@ final class Describer
 	// Number.MAX_SAFE_INTEGER
 	private const JsSafeInteger = 1 << 53 - 1;
 
-	/** @var int */
-	public $maxDepth = 7;
-
-	/** @var int */
-	public $maxLength = 150;
-
-	/** @var int */
-	public $maxItems = 100;
+	public int $maxDepth = 7;
+	public int $maxLength = 150;
+	public int $maxItems = 100;
 
 	/** @var Value[] */
-	public $snapshot = [];
-
-	/** @var bool */
-	public $debugInfo = false;
-
-	/** @var array */
-	public $keysToHide = [];
+	public array $snapshot = [];
+	public bool $debugInfo = false;
+	public array $keysToHide = [];
 
-	/** @var callable|null  fn(string $key, mixed $val): bool */
+	/** @var (callable(string, mixed): bool)|null */
 	public $scrubber;
 
-	/** @var bool */
-	public $location = false;
+	public bool $location = false;
 
 	/** @var callable[] */
-	public $resourceExposers;
+	public array $resourceExposers = [];
 
 	/** @var array<string,callable> */
-	public $objectExposers;
+	public array $objectExposers = [];
 
 	/** @var (int|\stdClass)[] */
-	public $references = [];
+	public array $references = [];
 
 
 	public function describe($var): \stdClass
diff --git a/src/Tracy/Dumper/Dumper.php b/src/Tracy/Dumper/Dumper.php
index d28b0f44c..ca024d2c8 100644
--- a/src/Tracy/Dumper/Dumper.php
+++ b/src/Tracy/Dumper/Dumper.php
@@ -45,10 +45,9 @@ class Dumper
 	public const HIDDEN_VALUE = Describer::HiddenValue;
 
 	/** @var Dumper\Value[] */
-	public static $liveSnapshot = [];
+	public static array $liveSnapshot = [];
 
-	/** @var array */
-	public static $terminalColors = [
+	public static ?array $terminalColors = [
 		'bool' => '1;33',
 		'null' => '1;33',
 		'number' => '1;32',
@@ -64,15 +63,13 @@ class Dumper
 		'indent' => '1;30',
 	];
 
-	/** @var array */
-	public static $resources = [
+	public static array $resources = [
 		'stream' => 'stream_get_meta_data',
 		'stream-context' => 'stream_context_get_options',
 		'curl' => 'curl_getinfo',
 	];
 
-	/** @var array */
-	public static $objectExporters = [
+	public static array $objectExporters = [
 		\Closure::class => [Exposer::class, 'exposeClosure'],
 		\UnitEnum::class => [Exposer::class, 'exposeEnum'],
 		\ArrayObject::class => [Exposer::class, 'exposeArrayObject'],
@@ -88,11 +85,8 @@ class Dumper
 		Ds\Map::class => [Exposer::class, 'exposeDsMap'],
 	];
 
-	/** @var Describer */
-	private $describer;
-
-	/** @var Renderer */
-	private $renderer;
+	private Describer $describer;
+	private Renderer $renderer;
 
 
 	/**
@@ -210,7 +204,7 @@ private function __construct(array $options = [])
 			: ($options[self::LAZY] ?? $renderer->lazy);
 		$renderer->sourceLocation = !(~$location & self::LOCATION_SOURCE);
 		$renderer->classLocation = !(~$location & self::LOCATION_CLASS);
-		$renderer->theme = $options[self::THEME] ?? $renderer->theme;
+		$renderer->theme = ($options[self::THEME] ?? $renderer->theme) ?: null;
 		$renderer->hash = $options[self::HASH] ?? true;
 	}
 
diff --git a/src/Tracy/Dumper/Renderer.php b/src/Tracy/Dumper/Renderer.php
index e8c78f5f1..42bda8a5d 100644
--- a/src/Tracy/Dumper/Renderer.php
+++ b/src/Tracy/Dumper/Renderer.php
@@ -20,41 +20,24 @@ final class Renderer
 {
 	private const TypeArrayKey = 'array';
 
-	/** @var int|bool */
-	public $collapseTop = 14;
+	public int|bool $collapseTop = 14;
+	public int $collapseSub = 7;
+	public bool $classLocation = false;
+	public bool $sourceLocation = false;
 
-	/** @var int */
-	public $collapseSub = 7;
-
-	/** @var bool */
-	public $classLocation = false;
-
-	/** @var bool */
-	public $sourceLocation = false;
-
-	/** @var bool|null  lazy-loading via JavaScript? true=full, false=none, null=collapsed parts */
-	public $lazy;
-
-	/** @var bool */
-	public $hash = true;
-
-	/** @var string */
-	public $theme = 'light';
-
-	/** @var bool */
-	public $collectingMode = false;
+	/** lazy-loading via JavaScript? true=full, false=none, null=collapsed parts */
+	public ?bool $lazy = null;
+	public bool $hash = true;
+	public ?string $theme = 'light';
+	public bool $collectingMode = false;
 
 	/** @var Value[] */
-	private $snapshot = [];
+	private array $snapshot = [];
 
 	/** @var Value[]|null */
-	private $snapshotSelection;
-
-	/** @var array */
-	private $parents = [];
-
-	/** @var array */
-	private $above = [];
+	private ?array $snapshotSelection = null;
+	private array $parents = [];
+	private array $above = [];
 
 
 	public function renderAsHtml(\stdClass $model): string
diff --git a/src/Tracy/Dumper/Value.php b/src/Tracy/Dumper/Value.php
index 3fa521556..25d178213 100644
--- a/src/Tracy/Dumper/Value.php
+++ b/src/Tracy/Dumper/Value.php
@@ -32,32 +32,15 @@ final class Value implements \JsonSerializable
 		PropertyDynamic = 3,
 		PropertyVirtual = 4;
 
-	/** @var string */
-	public $type;
-
-	/** @var string|int */
-	public $value;
-
-	/** @var ?int */
-	public $length;
-
-	/** @var ?int */
-	public $depth;
-
-	/** @var int|string */
-	public $id;
-
-	/** @var object */
-	public $holder;
-
-	/** @var ?array */
-	public $items;
-
-	/** @var ?\stdClass */
-	public $editor;
-
-	/** @var ?bool */
-	public $collapsed;
+	public string $type;
+	public string|int|null $value;
+	public ?int $length;
+	public ?int $depth = null;
+	public int|string|null $id = null;
+	public object $holder;
+	public ?array $items = null;
+	public ?\stdClass $editor = null;
+	public ?bool $collapsed = null;
 
 
 	public function __construct(string $type, $value = null, ?int $length = null)
diff --git a/src/Tracy/OutputDebugger/OutputDebugger.php b/src/Tracy/OutputDebugger/OutputDebugger.php
index 53692d2c2..4c8c74cf8 100644
--- a/src/Tracy/OutputDebugger/OutputDebugger.php
+++ b/src/Tracy/OutputDebugger/OutputDebugger.php
@@ -18,7 +18,7 @@ final class OutputDebugger
 	private const BOM = "\xEF\xBB\xBF";
 
 	/** @var array of [file, line, output, stack] */
-	private $list = [];
+	private array $list = [];
 
 
 	public static function enable(): void
diff --git a/src/Tracy/Session/FileSession.php b/src/Tracy/Session/FileSession.php
index f68b8d581..8e4172c19 100644
--- a/src/Tracy/Session/FileSession.php
+++ b/src/Tracy/Session/FileSession.php
@@ -15,20 +15,15 @@ class FileSession implements SessionStorage
 	private const FilePrefix = 'tracy-';
 	private const CookieLifetime = 31_557_600;
 
-	/** @var string */
-	public $cookieName = 'tracy-session';
+	public string $cookieName = 'tracy-session';
 
-	/** @var float probability that the clean() routine is started */
-	public $gcProbability = 0.001;
-
-	/** @var string */
-	private $dir;
+	/** probability that the clean() routine is started */
+	public float $gcProbability = 0.001;
+	private string $dir;
 
 	/** @var resource */
 	private $file;
-
-	/** @var array */
-	private $data = [];
+	private array $data = [];
 
 
 	public function __construct(string $dir)
diff --git a/tests/Tracy.Bridges/PsrToTracyLoggerAdapter.phpt b/tests/Tracy.Bridges/PsrToTracyLoggerAdapter.phpt
index 3bd85779a..6852a2eb0 100644
--- a/tests/Tracy.Bridges/PsrToTracyLoggerAdapter.phpt
+++ b/tests/Tracy.Bridges/PsrToTracyLoggerAdapter.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 class DummyPsrLogger extends Psr\Log\AbstractLogger
 {
 	/** @var array */
-	public $entries = [];
+	public array $entries = [];
 
 
 	public function log($level, $message, array $context = []): void
diff --git a/tests/Tracy.Bridges/TracyToPsrLoggerAdapter.phpt b/tests/Tracy.Bridges/TracyToPsrLoggerAdapter.phpt
index ef242b0ac..ce69a1cd4 100644
--- a/tests/Tracy.Bridges/TracyToPsrLoggerAdapter.phpt
+++ b/tests/Tracy.Bridges/TracyToPsrLoggerAdapter.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 class DummyTracyLogger implements ILogger
 {
 	/** @var array */
-	public $entries = [];
+	public array $entries = [];
 
 
 	public function log($value, $priority = self::INFO)
diff --git a/tests/Tracy/Dumper.toText().specials.phpt b/tests/Tracy/Dumper.toText().specials.phpt
index d92ecf3d3..ecda7d269 100644
--- a/tests/Tracy/Dumper.toText().specials.phpt
+++ b/tests/Tracy/Dumper.toText().specials.phpt
@@ -128,7 +128,7 @@ Assert::match(
 		   length: null
 		   depth: null
 		   id: null
-		   holder: null
+		   holder: unset
 		   items: null
 		   editor: null
 		   collapsed: null

From df64c1967b5ef59a3f6ca69fe830fe7d60d54cb5 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Thu, 16 Dec 2021 04:06:26 +0100
Subject: [PATCH 09/30] added PHP 8 typehints

---
 src/Bridges/Nette/MailSender.php            |  5 +--
 src/Bridges/Nette/TracyExtension.php        |  2 +-
 src/Bridges/Psr/PsrToTracyLoggerAdapter.php |  2 +-
 src/Tracy/BlueScreen/BlueScreen.php         |  8 +---
 src/Tracy/Debugger/Debugger.php             | 21 +++++-----
 src/Tracy/Debugger/DeferredContent.php      |  2 +-
 src/Tracy/Dumper/Describer.php              | 45 +++++++--------------
 src/Tracy/Dumper/Dumper.php                 | 13 +++---
 src/Tracy/Dumper/Exposer.php                | 11 ++---
 src/Tracy/Dumper/Renderer.php               | 23 +++--------
 src/Tracy/Dumper/Value.php                  |  2 +-
 src/Tracy/Helpers.php                       |  8 ++--
 src/Tracy/Logger/ILogger.php                |  2 +-
 src/Tracy/Logger/Logger.php                 | 10 ++---
 src/Tracy/functions.php                     |  6 +--
 15 files changed, 61 insertions(+), 99 deletions(-)

diff --git a/src/Bridges/Nette/MailSender.php b/src/Bridges/Nette/MailSender.php
index b6fde2130..bac96ae50 100644
--- a/src/Bridges/Nette/MailSender.php
+++ b/src/Bridges/Nette/MailSender.php
@@ -33,10 +33,7 @@ public function __construct(Nette\Mail\IMailer $mailer, ?string $fromEmail = nul
 	}
 
 
-	/**
-	 * @param  mixed  $message
-	 */
-	public function send($message, string $email): void
+	public function send(mixed $message, string $email): void
 	{
 		$host = preg_replace('#[^\w.-]+#', '', $_SERVER['SERVER_NAME'] ?? php_uname('n'));
 
diff --git a/src/Bridges/Nette/TracyExtension.php b/src/Bridges/Nette/TracyExtension.php
index a467f2acf..736071cc4 100644
--- a/src/Bridges/Nette/TracyExtension.php
+++ b/src/Bridges/Nette/TracyExtension.php
@@ -168,7 +168,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 	/**
 	 * @param  string|string[]  $value
 	 */
-	private function parseErrorSeverity($value): int
+	private function parseErrorSeverity(string|array $value): int
 	{
 		$value = implode('|', (array) $value);
 		$res = (int) @parse_ini_string('e = ' . $value)['e']; // @ may fail
diff --git a/src/Bridges/Psr/PsrToTracyLoggerAdapter.php b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
index 291b06084..ab9cc3bc3 100644
--- a/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
+++ b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
@@ -37,7 +37,7 @@ public function __construct(Psr\Log\LoggerInterface $psrLogger)
 	}
 
 
-	public function log($value, $level = self::INFO)
+	public function log(mixed $value, string $level = self::INFO)
 	{
 		if ($value instanceof \Throwable) {
 			$message = Tracy\Helpers::getClass($value) . ': ' . $value->getMessage() . ($value->getCode() ? ' #' . $value->getCode() : '') . ' in ' . $value->getFile() . ':' . $value->getLine();
diff --git a/src/Tracy/BlueScreen/BlueScreen.php b/src/Tracy/BlueScreen/BlueScreen.php
index c082bf486..b1df8ca8e 100644
--- a/src/Tracy/BlueScreen/BlueScreen.php
+++ b/src/Tracy/BlueScreen/BlueScreen.php
@@ -97,11 +97,7 @@ public function addFileGenerator(callable $generator): self
 	}
 
 
-	/**
-	 * @param \Fiber|\Generator $fiber
-	 * @return static
-	 */
-	public function addFiber($fiber): self
+	public function addFiber(\Fiber|\Generator $fiber): static
 	{
 		$this->fibers[$fiber] = true;
 		return $this;
@@ -147,7 +143,7 @@ public function renderToFile(\Throwable $exception, string $file): bool
 	}
 
 
-	private function renderTemplate(\Throwable $exception, string $template, $toScreen = true): void
+	private function renderTemplate(\Throwable $exception, string $template, bool $toScreen = true): void
 	{
 		[$generators, $fibers] = $this->findGeneratorsAndFibers($exception);
 		$headersSent = headers_sent($headersFile, $headersLine);
diff --git a/src/Tracy/Debugger/Debugger.php b/src/Tracy/Debugger/Debugger.php
index c3b4df966..4b34bbc19 100644
--- a/src/Tracy/Debugger/Debugger.php
+++ b/src/Tracy/Debugger/Debugger.php
@@ -161,7 +161,11 @@ final public function __construct()
 	 * @param  string  $logDirectory  error log directory
 	 * @param  string|array  $email  administrator email; enables email sending in production mode
 	 */
-	public static function enable($mode = null, ?string $logDirectory = null, $email = null): void
+	public static function enable(
+		bool|string|array|null $mode = null,
+		?string $logDirectory = null,
+		string|array|null $email = null,
+	): void
 	{
 		if ($mode !== null || self::$productionMode === null) {
 			self::$productionMode = is_bool($mode)
@@ -426,8 +430,8 @@ public static function getLogger(): ILogger
 	}
 
 
-	/** @return ProductionStrategy|DevelopmentStrategy @internal */
-	public static function getStrategy()
+	/** @internal */
+	public static function getStrategy(): ProductionStrategy|DevelopmentStrategy
 	{
 		if (empty(self::$strategy[self::$productionMode])) {
 			self::$strategy[self::$productionMode] = self::$productionMode
@@ -475,7 +479,7 @@ public static function getSessionStorage(): SessionStorage
 	 * @param  bool   $return  return output instead of printing it? (bypasses $productionMode)
 	 * @return mixed  variable itself or dump
 	 */
-	public static function dump($var, bool $return = false)
+	public static function dump(mixed $var, bool $return = false): mixed
 	{
 		if ($return) {
 			$options = [
@@ -522,10 +526,9 @@ public static function timer(?string $name = null): float
 	/**
 	 * Dumps information about a variable in Tracy Debug Bar.
 	 * @tracySkipLocation
-	 * @param  mixed  $var
 	 * @return mixed  variable itself
 	 */
-	public static function barDump($var, ?string $title = null, array $options = [])
+	public static function barDump(mixed $var, ?string $title = null, array $options = []): mixed
 	{
 		if (!self::$productionMode) {
 			static $panel;
@@ -547,10 +550,8 @@ public static function barDump($var, ?string $title = null, array $options = [])
 
 	/**
 	 * Logs message or exception.
-	 * @param  mixed  $message
-	 * @return mixed
 	 */
-	public static function log($message, string $level = ILogger::INFO)
+	public static function log(mixed $message, string $level = ILogger::INFO): mixed
 	{
 		return self::getLogger()->log($message, $level);
 	}
@@ -580,7 +581,7 @@ public static function mapSource(string $file, int $line): ?array
 	 * Detects debug mode by IP address.
 	 * @param  string|array  $list  IP addresses or computer names whitelist detection
 	 */
-	public static function detectDebugMode($list = null): bool
+	public static function detectDebugMode(string|array|null $list = null): bool
 	{
 		$addr = $_SERVER['REMOTE_ADDR'] ?? php_uname('n');
 		$secret = isset($_COOKIE[self::CookieSecret]) && is_string($_COOKIE[self::CookieSecret])
diff --git a/src/Tracy/Debugger/DeferredContent.php b/src/Tracy/Debugger/DeferredContent.php
index ba3b11a72..2ed27ffca 100644
--- a/src/Tracy/Debugger/DeferredContent.php
+++ b/src/Tracy/Debugger/DeferredContent.php
@@ -47,7 +47,7 @@ public function &getItems(string $key): array
 	}
 
 
-	public function addSetup(string $method, $argument): void
+	public function addSetup(string $method, mixed $argument): void
 	{
 		$argument = json_encode($argument, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_INVALID_UTF8_SUBSTITUTE);
 		$item = &$this->getItems('setup')[$this->requestId];
diff --git a/src/Tracy/Dumper/Describer.php b/src/Tracy/Dumper/Describer.php
index 9458631db..a392881ee 100644
--- a/src/Tracy/Dumper/Describer.php
+++ b/src/Tracy/Dumper/Describer.php
@@ -48,7 +48,7 @@ final class Describer
 	public array $references = [];
 
 
-	public function describe($var): \stdClass
+	public function describe(mixed $var): \stdClass
 	{
 		uksort($this->objectExposers, fn($a, $b): int => $b === '' || (class_exists($a, false) && is_subclass_of($a, $b)) ? -1 : 1);
 
@@ -67,10 +67,7 @@ public function describe($var): \stdClass
 	}
 
 
-	/**
-	 * @return mixed
-	 */
-	private function describeVar($var, int $depth = 0, ?int $refId = null)
+	private function describeVar(mixed $var, int $depth = 0, ?int $refId = null): mixed
 	{
 		if ($var === null || is_bool($var)) {
 			return $var;
@@ -81,10 +78,7 @@ private function describeVar($var, int $depth = 0, ?int $refId = null)
 	}
 
 
-	/**
-	 * @return Value|int
-	 */
-	private function describeInteger(int $num)
+	private function describeInteger(int $num): Value|int
 	{
 		return $num <= self::JsSafeInteger && $num >= -self::JsSafeInteger
 			? $num
@@ -92,10 +86,7 @@ private function describeInteger(int $num)
 	}
 
 
-	/**
-	 * @return Value|float
-	 */
-	private function describeDouble(float $num)
+	private function describeDouble(float $num): Value|float
 	{
 		if (!is_finite($num)) {
 			return new Value(Value::TypeNumber, (string) $num);
@@ -108,10 +99,7 @@ private function describeDouble(float $num)
 	}
 
 
-	/**
-	 * @return Value|string
-	 */
-	private function describeString(string $s, int $depth = 0)
+	private function describeString(string $s, int $depth = 0): Value|string
 	{
 		$encoded = Helpers::encodeString($s, $depth ? $this->maxLength : null);
 		if ($encoded === $s) {
@@ -124,10 +112,7 @@ private function describeString(string $s, int $depth = 0)
 	}
 
 
-	/**
-	 * @return Value|array
-	 */
-	private function describeArray(array $arr, int $depth = 0, ?int $refId = null)
+	private function describeArray(array $arr, int $depth = 0, ?int $refId = null): Value|array
 	{
 		if ($refId) {
 			$res = new Value(Value::TypeRef, 'p' . $refId);
@@ -231,10 +216,7 @@ private function describeResource($resource, int $depth = 0): Value
 	}
 
 
-	/**
-	 * @return Value|string
-	 */
-	public function describeKey(string $key)
+	public function describeKey(string $key): Value|string
 	{
 		if (preg_match('#^[\w!\#$%&*+./;<>?@^{|}~-]{1,50}$#D', $key) && !preg_match('#^(true|false|null)$#iD', $key)) {
 			return $key;
@@ -250,11 +232,12 @@ public function describeKey(string $key)
 	public function addPropertyTo(
 		Value $value,
 		string $k,
-		$v,
-		$type = Value::PropertyVirtual,
+		mixed $v,
+		int $type = Value::PropertyVirtual,
 		?int $refId = null,
 		?string $class = null,
-	) {
+	): void
+	{
 		if ($value->depth && $this->maxItems && count($value->items ?? []) >= $this->maxItems) {
 			$value->length = ($value->length ?? count($value->items)) + 1;
 			return;
@@ -288,7 +271,7 @@ private function exposeObject(object $obj, Value $value): ?array
 	}
 
 
-	private function isSensitive(string $key, $val, ?string $class = null): bool
+	private function isSensitive(string $key, mixed $val, ?string $class = null): bool
 	{
 		return $val instanceof \SensitiveParameterValue
 			|| ($this->scrubber !== null && ($this->scrubber)($key, $val, $class))
@@ -297,7 +280,7 @@ private function isSensitive(string $key, $val, ?string $class = null): bool
 	}
 
 
-	private static function hideValue($val): string
+	private static function hideValue(mixed $val): string
 	{
 		if ($val instanceof \SensitiveParameterValue) {
 			$val = $val->getValue();
@@ -307,7 +290,7 @@ private static function hideValue($val): string
 	}
 
 
-	public function getReferenceId($arr, $key): ?int
+	public function getReferenceId(array $arr, string|int $key): ?int
 	{
 		if ((!$rr = \ReflectionReference::fromArrayElement($arr, $key))) {
 			return null;
diff --git a/src/Tracy/Dumper/Dumper.php b/src/Tracy/Dumper/Dumper.php
index ca024d2c8..0cc1ae7b9 100644
--- a/src/Tracy/Dumper/Dumper.php
+++ b/src/Tracy/Dumper/Dumper.php
@@ -91,9 +91,8 @@ class Dumper
 
 	/**
 	 * Dumps variable to the output.
-	 * @return mixed  variable
 	 */
-	public static function dump($var, array $options = [])
+	public static function dump(mixed $var, array $options = []): mixed
 	{
 		if (Helpers::isCli()) {
 			$useColors = self::$terminalColors && Helpers::detectColors();
@@ -116,7 +115,7 @@ public static function dump($var, array $options = [])
 	/**
 	 * Dumps variable to HTML.
 	 */
-	public static function toHtml($var, array $options = [], $key = null): string
+	public static function toHtml(mixed $var, array $options = [], mixed $key = null): string
 	{
 		return (new self($options))->asHtml($var, $key);
 	}
@@ -125,7 +124,7 @@ public static function toHtml($var, array $options = [], $key = null): string
 	/**
 	 * Dumps variable to plain text.
 	 */
-	public static function toText($var, array $options = []): string
+	public static function toText(mixed $var, array $options = []): string
 	{
 		return (new self($options))->asTerminal($var);
 	}
@@ -134,7 +133,7 @@ public static function toText($var, array $options = []): string
 	/**
 	 * Dumps variable to x-terminal.
 	 */
-	public static function toTerminal($var, array $options = []): string
+	public static function toTerminal(mixed $var, array $options = []): string
 	{
 		return (new self($options))->asTerminal($var, self::$terminalColors);
 	}
@@ -212,7 +211,7 @@ private function __construct(array $options = [])
 	/**
 	 * Dumps variable to HTML.
 	 */
-	private function asHtml($var, $key = null): string
+	private function asHtml(mixed $var, mixed $key = null): string
 	{
 		if ($key === null) {
 			$model = $this->describer->describe($var);
@@ -228,7 +227,7 @@ private function asHtml($var, $key = null): string
 	/**
 	 * Dumps variable to x-terminal.
 	 */
-	private function asTerminal($var, array $colors = []): string
+	private function asTerminal(mixed $var, array $colors = []): string
 	{
 		$model = $this->describer->describe($var);
 		return $this->renderer->renderAsText($model, $colors);
diff --git a/src/Tracy/Dumper/Exposer.php b/src/Tracy/Dumper/Exposer.php
index 1d415ec15..36dbc6c5b 100644
--- a/src/Tracy/Dumper/Exposer.php
+++ b/src/Tracy/Dumper/Exposer.php
@@ -53,7 +53,7 @@ public static function exposeObject(object $obj, Value $value, Describer $descri
 	}
 
 
-	private static function getProperties($class): array
+	private static function getProperties(string $class): array
 	{
 		static $cache;
 		if (isset($cache[$class])) {
@@ -142,10 +142,11 @@ public static function exposeDOMNode(\DOMNode $obj, Value $value, Describer $des
 	}
 
 
-	/**
-	 * @param  \DOMNodeList|\DOMNamedNodeMap  $obj
-	 */
-	public static function exposeDOMNodeList($obj, Value $value, Describer $describer): void
+	public static function exposeDOMNodeList(
+		\DOMNodeList|\DOMNamedNodeMap $obj,
+		Value $value,
+		Describer $describer,
+	): void
 	{
 		$describer->addPropertyTo($value, 'length', $obj->length, Value::PropertyPublic);
 		$describer->addPropertyTo($value, 'items', iterator_to_array($obj));
diff --git a/src/Tracy/Dumper/Renderer.php b/src/Tracy/Dumper/Renderer.php
index 42bda8a5d..8f42c486a 100644
--- a/src/Tracy/Dumper/Renderer.php
+++ b/src/Tracy/Dumper/Renderer.php
@@ -113,11 +113,7 @@ public function renderAsText(\stdClass $model, array $colors = []): string
 	}
 
 
-	/**
-	 * @param  mixed  $value
-	 * @param  string|int|null  $keyType
-	 */
-	private function renderVar($value, int $depth = 0, $keyType = null): string
+	private function renderVar(mixed $value, int $depth = 0, string|int|null $keyType = null): string
 	{
 		switch (true) {
 			case $value === null:
@@ -164,11 +160,7 @@ private function renderVar($value, int $depth = 0, $keyType = null): string
 	}
 
 
-	/**
-	 * @param  string|Value  $str
-	 * @param  string|int|null  $keyType
-	 */
-	private function renderString($str, int $depth, $keyType): string
+	private function renderString(string|Value $str, int $depth, string|int|null $keyType): string
 	{
 		if ($keyType === self::TypeArrayKey) {
 			$indent = '<span class="tracy-dump-indent">   ' . str_repeat('|  ', $depth - 1) . ' </span>';
@@ -241,10 +233,7 @@ private function renderString($str, int $depth, $keyType): string
 	}
 
 
-	/**
-	 * @param  array|Value  $array
-	 */
-	private function renderArray($array, int $depth): string
+	private function renderArray(array|Value $array, int $depth): string
 	{
 		$out = '<span class="tracy-dump-array">array</span> (';
 
@@ -422,7 +411,7 @@ private function renderResource(Value $resource, int $depth): string
 	}
 
 
-	private function copySnapshot($value): void
+	private function copySnapshot(mixed $value): void
 	{
 		if ($this->collectingMode) {
 			return;
@@ -449,11 +438,11 @@ private function copySnapshot($value): void
 	}
 
 
-	public static function jsonEncode($snapshot): string
+	public static function jsonEncode(mixed $value): string
 	{
 		$old = @ini_set('serialize_precision', '-1'); // @ may be disabled
 		try {
-			return json_encode($snapshot, JSON_HEX_APOS | JSON_HEX_AMP | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+			return json_encode($value, JSON_HEX_APOS | JSON_HEX_AMP | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
 		} finally {
 			if ($old !== false) {
 				ini_set('serialize_precision', $old);
diff --git a/src/Tracy/Dumper/Value.php b/src/Tracy/Dumper/Value.php
index 25d178213..5fa6e44c6 100644
--- a/src/Tracy/Dumper/Value.php
+++ b/src/Tracy/Dumper/Value.php
@@ -43,7 +43,7 @@ final class Value implements \JsonSerializable
 	public ?bool $collapsed = null;
 
 
-	public function __construct(string $type, $value = null, ?int $length = null)
+	public function __construct(string $type, string|int|null $value = null, ?int $length = null)
 	{
 		$this->type = $type;
 		$this->value = $value;
diff --git a/src/Tracy/Helpers.php b/src/Tracy/Helpers.php
index 1fd045760..c51948a71 100644
--- a/src/Tracy/Helpers.php
+++ b/src/Tracy/Helpers.php
@@ -85,13 +85,13 @@ public static function formatHtml(string $mask): string
 	}
 
 
-	public static function escapeHtml($s): string
+	public static function escapeHtml(mixed $s): string
 	{
 		return htmlspecialchars((string) $s, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML5, 'UTF-8');
 	}
 
 
-	public static function findTrace(array $trace, $method, ?int &$index = null): ?array
+	public static function findTrace(array $trace, array|string $method, ?int &$index = null): ?array
 	{
 		$m = is_array($method) ? $method : explode('::', $method);
 		foreach ($trace as $i => $item) {
@@ -110,7 +110,7 @@ public static function findTrace(array $trace, $method, ?int &$index = null): ?a
 	}
 
 
-	public static function getClass($obj): string
+	public static function getClass(object $obj): string
 	{
 		return explode("\x00", $obj::class)[0];
 	}
@@ -579,7 +579,7 @@ public static function getExceptionChain(\Throwable $ex): array
 	}
 
 
-	public static function traverseValue($val, callable $callback, array &$skip = [], ?string $refId = null): void
+	public static function traverseValue(mixed $val, callable $callback, array &$skip = [], ?string $refId = null): void
 	{
 		if (is_object($val)) {
 			$id = spl_object_id($val);
diff --git a/src/Tracy/Logger/ILogger.php b/src/Tracy/Logger/ILogger.php
index 6df8b6017..de32dab75 100644
--- a/src/Tracy/Logger/ILogger.php
+++ b/src/Tracy/Logger/ILogger.php
@@ -23,5 +23,5 @@ interface ILogger
 		EXCEPTION = 'exception',
 		CRITICAL = 'critical';
 
-	function log($value, $level = self::INFO);
+	function log(mixed $value, string $level = self::INFO);
 }
diff --git a/src/Tracy/Logger/Logger.php b/src/Tracy/Logger/Logger.php
index 2a50a8e78..760de01e4 100644
--- a/src/Tracy/Logger/Logger.php
+++ b/src/Tracy/Logger/Logger.php
@@ -34,10 +34,7 @@ class Logger implements ILogger
 	private $blueScreen;
 
 
-	/**
-	 * @param  string|array|null  $email
-	 */
-	public function __construct(?string $directory, $email = null, ?BlueScreen $blueScreen = null)
+	public function __construct(?string $directory, string|array|null $email = null, ?BlueScreen $blueScreen = null)
 	{
 		$this->directory = $directory;
 		$this->email = $email;
@@ -48,11 +45,10 @@ public function __construct(?string $directory, $email = null, ?BlueScreen $blue
 
 	/**
 	 * Logs message or exception to file and sends email notification.
-	 * @param  mixed  $message
-	 * @param  string  $level  one of constant ILogger::INFO, WARNING, ERROR (sends email), EXCEPTION (sends email), CRITICAL (sends email)
+	 * For levels ERROR, EXCEPTION and CRITICAL it sends email.
 	 * @return string|null logged error filename
 	 */
-	public function log($message, $level = self::INFO)
+	public function log(mixed $message, string $level = self::INFO)
 	{
 		if (!$this->directory) {
 			throw new \LogicException('Logging directory is not specified.');
diff --git a/src/Tracy/functions.php b/src/Tracy/functions.php
index f110f228a..ab00b0d7a 100644
--- a/src/Tracy/functions.php
+++ b/src/Tracy/functions.php
@@ -12,7 +12,7 @@
 	 * Tracy\Debugger::dump() shortcut.
 	 * @tracySkipLocation
 	 */
-	function dump($var)
+	function dump(mixed $var): mixed
 	{
 		array_map([Tracy\Debugger::class, 'dump'], func_get_args());
 		return $var;
@@ -24,7 +24,7 @@ function dump($var)
 	 * Tracy\Debugger::dump() & exit shortcut.
 	 * @tracySkipLocation
 	 */
-	function dumpe($var): void
+	function dumpe(mixed $var): void
 	{
 		array_map([Tracy\Debugger::class, 'dump'], func_get_args());
 		if (!Tracy\Debugger::$productionMode) {
@@ -38,7 +38,7 @@ function dumpe($var): void
 	 * Tracy\Debugger::barDump() shortcut.
 	 * @tracySkipLocation
 	 */
-	function bdump($var)
+	function bdump(mixed $var): mixed
 	{
 		Tracy\Debugger::barDump(...func_get_args());
 		return $var;

From 8fd56c0ec5128b37c4d1c6ba1bc7404e7b776126 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Thu, 2 Mar 2023 12:18:31 +0100
Subject: [PATCH 10/30] used constructor promotion

---
 src/Bridges/Nette/TracyExtension.php        | 11 ++++-------
 src/Bridges/Psr/PsrToTracyLoggerAdapter.php |  8 +++-----
 src/Bridges/Psr/TracyToPsrLoggerAdapter.php |  8 +++-----
 src/Tracy/Debugger/DevelopmentStrategy.php  | 15 +++++----------
 4 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/Bridges/Nette/TracyExtension.php b/src/Bridges/Nette/TracyExtension.php
index 736071cc4..cb0142122 100644
--- a/src/Bridges/Nette/TracyExtension.php
+++ b/src/Bridges/Nette/TracyExtension.php
@@ -22,14 +22,11 @@ class TracyExtension extends Nette\DI\CompilerExtension
 {
 	private const ErrorSeverityPattern = 'E_(?:ALL|PARSE|STRICT|RECOVERABLE_ERROR|(?:CORE|COMPILE)_(?:ERROR|WARNING)|(?:USER_)?(?:ERROR|WARNING|NOTICE|DEPRECATED))';
 
-	private bool $debugMode;
-	private bool $cliMode;
 
-
-	public function __construct(bool $debugMode = false, bool $cliMode = false)
-	{
-		$this->debugMode = $debugMode;
-		$this->cliMode = $cliMode;
+	public function __construct(
+		private bool $debugMode = false,
+		private bool $cliMode = false,
+	) {
 	}
 
 
diff --git a/src/Bridges/Psr/PsrToTracyLoggerAdapter.php b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
index ab9cc3bc3..c1ba5956e 100644
--- a/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
+++ b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
@@ -28,12 +28,10 @@ class PsrToTracyLoggerAdapter implements Tracy\ILogger
 		Tracy\ILogger::CRITICAL => Psr\Log\LogLevel::CRITICAL,
 	];
 
-	private Psr\Log\LoggerInterface $psrLogger;
 
-
-	public function __construct(Psr\Log\LoggerInterface $psrLogger)
-	{
-		$this->psrLogger = $psrLogger;
+	public function __construct(
+		private Psr\Log\LoggerInterface $psrLogger,
+	) {
 	}
 
 
diff --git a/src/Bridges/Psr/TracyToPsrLoggerAdapter.php b/src/Bridges/Psr/TracyToPsrLoggerAdapter.php
index 3c52f3b9e..7b1f578e9 100644
--- a/src/Bridges/Psr/TracyToPsrLoggerAdapter.php
+++ b/src/Bridges/Psr/TracyToPsrLoggerAdapter.php
@@ -30,12 +30,10 @@ class TracyToPsrLoggerAdapter extends Psr\Log\AbstractLogger
 		Psr\Log\LogLevel::DEBUG => Tracy\ILogger::DEBUG,
 	];
 
-	private Tracy\ILogger $tracyLogger;
 
-
-	public function __construct(Tracy\ILogger $tracyLogger)
-	{
-		$this->tracyLogger = $tracyLogger;
+	public function __construct(
+		private Tracy\ILogger $tracyLogger,
+	) {
 	}
 
 
diff --git a/src/Tracy/Debugger/DevelopmentStrategy.php b/src/Tracy/Debugger/DevelopmentStrategy.php
index e43649943..d778027d3 100644
--- a/src/Tracy/Debugger/DevelopmentStrategy.php
+++ b/src/Tracy/Debugger/DevelopmentStrategy.php
@@ -17,16 +17,11 @@
  */
 final class DevelopmentStrategy
 {
-	private Bar $bar;
-	private BlueScreen $blueScreen;
-	private DeferredContent $defer;
-
-
-	public function __construct(Bar $bar, BlueScreen $blueScreen, DeferredContent $defer)
-	{
-		$this->bar = $bar;
-		$this->blueScreen = $blueScreen;
-		$this->defer = $defer;
+	public function __construct(
+		private Bar $bar,
+		private BlueScreen $blueScreen,
+		private DeferredContent $defer,
+	) {
 	}
 
 

From ec5276c0db1e9d0a66189a3c03f682445a9db289 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Mon, 9 May 2022 15:50:03 +0200
Subject: [PATCH 11/30] Dumper: added ArrayIterator exposer

needed to use get_mangled_object_vars()
---
 src/Tracy/Dumper/Dumper.php  | 1 +
 src/Tracy/Dumper/Exposer.php | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/Tracy/Dumper/Dumper.php b/src/Tracy/Dumper/Dumper.php
index 0cc1ae7b9..0939fb773 100644
--- a/src/Tracy/Dumper/Dumper.php
+++ b/src/Tracy/Dumper/Dumper.php
@@ -73,6 +73,7 @@ class Dumper
 		\Closure::class => [Exposer::class, 'exposeClosure'],
 		\UnitEnum::class => [Exposer::class, 'exposeEnum'],
 		\ArrayObject::class => [Exposer::class, 'exposeArrayObject'],
+		\ArrayIterator::class => [Exposer::class, 'exposeArrayIterator'],
 		\SplFileInfo::class => [Exposer::class, 'exposeSplFileInfo'],
 		\SplObjectStorage::class => [Exposer::class, 'exposeSplObjectStorage'],
 		\__PHP_Incomplete_Class::class => [Exposer::class, 'exposePhpIncompleteClass'],
diff --git a/src/Tracy/Dumper/Exposer.php b/src/Tracy/Dumper/Exposer.php
index 36dbc6c5b..590e53bff 100644
--- a/src/Tracy/Dumper/Exposer.php
+++ b/src/Tracy/Dumper/Exposer.php
@@ -132,6 +132,12 @@ public static function exposeArrayObject(\ArrayObject $obj, Value $value, Descri
 	}
 
 
+	public static function exposeArrayIterator(\ArrayIterator $obj, Value $value, Describer $describer): void
+	{
+		self::exposeObject((object) $obj->getArrayCopy(), $value, $describer);
+	}
+
+
 	public static function exposeDOMNode(\DOMNode $obj, Value $value, Describer $describer): void
 	{
 		$props = preg_match_all('#^\s*\[([^\]]+)\] =>#m', print_r($obj, true), $tmp) ? $tmp[1] : [];

From 905c3d0644191773258369aedd187ef7bfeacc3a Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Sun, 12 Dec 2021 07:21:06 +0100
Subject: [PATCH 12/30] used native PHP 8 features

---
 src/Bridges/Psr/PsrToTracyLoggerAdapter.php               | 2 +-
 src/Tracy/BlueScreen/BlueScreen.php                       | 8 ++++----
 src/Tracy/BlueScreen/assets/page.phtml                    | 2 +-
 .../BlueScreen/assets/section-exception-exception.phtml   | 2 +-
 src/Tracy/BlueScreen/assets/section-header.phtml          | 4 ++--
 src/Tracy/BlueScreen/assets/section-stack-callStack.phtml | 2 +-
 src/Tracy/Debugger/Debugger.php                           | 2 +-
 src/Tracy/Dumper/Describer.php                            | 4 ++--
 src/Tracy/Dumper/Exposer.php                              | 4 ++--
 src/Tracy/Helpers.php                                     | 6 ------
 src/Tracy/Logger/Logger.php                               | 2 +-
 tests/Tracy/Dumper.keysToHide.phpt                        | 2 +-
 tests/Tracy/Dumper.scrubber.phpt                          | 8 ++++----
 tests/Tracy/Dumper.toHtml().key.phpt                      | 2 +-
 tools/create-phar/create-phar.php                         | 4 ++--
 15 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/Bridges/Psr/PsrToTracyLoggerAdapter.php b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
index c1ba5956e..5d8b0430b 100644
--- a/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
+++ b/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
@@ -38,7 +38,7 @@ public function __construct(
 	public function log(mixed $value, string $level = self::INFO)
 	{
 		if ($value instanceof \Throwable) {
-			$message = Tracy\Helpers::getClass($value) . ': ' . $value->getMessage() . ($value->getCode() ? ' #' . $value->getCode() : '') . ' in ' . $value->getFile() . ':' . $value->getLine();
+			$message = get_debug_type($value) . ': ' . $value->getMessage() . ($value->getCode() ? ' #' . $value->getCode() : '') . ' in ' . $value->getFile() . ':' . $value->getLine();
 			$context = ['exception' => $value];
 
 		} elseif (!is_string($value)) {
diff --git a/src/Tracy/BlueScreen/BlueScreen.php b/src/Tracy/BlueScreen/BlueScreen.php
index b1df8ca8e..766831be9 100644
--- a/src/Tracy/BlueScreen/BlueScreen.php
+++ b/src/Tracy/BlueScreen/BlueScreen.php
@@ -148,12 +148,12 @@ private function renderTemplate(\Throwable $exception, string $template, bool $t
 		[$generators, $fibers] = $this->findGeneratorsAndFibers($exception);
 		$headersSent = headers_sent($headersFile, $headersLine);
 		$obStatus = Debugger::$obStatus;
-		$showEnvironment = $this->showEnvironment && (strpos($exception->getMessage(), 'Allowed memory size') === false);
+		$showEnvironment = $this->showEnvironment && (!str_contains($exception->getMessage(), 'Allowed memory size'));
 		$info = array_filter($this->info);
 		$source = Helpers::getSource();
 		$title = $exception instanceof \ErrorException
 			? Helpers::errorTypeToString($exception->getSeverity())
-			: Helpers::getClass($exception);
+			: get_debug_type($exception);
 		$lastError = $exception instanceof \ErrorException || $exception instanceof \Error
 			? null
 			: error_get_last();
@@ -272,7 +272,7 @@ private function renderActions(\Throwable $ex): array
 			];
 		}
 
-		$query = ($ex instanceof \ErrorException ? '' : Helpers::getClass($ex) . ' ')
+		$query = ($ex instanceof \ErrorException ? '' : get_debug_type($ex) . ' ')
 			. preg_replace('#\'.*\'|".*"#Us', '', $ex->getMessage());
 		$actions[] = [
 			'link' => 'https://www.google.com/search?sourceid=tracy&q=' . urlencode($query),
@@ -527,7 +527,7 @@ private function renderPhpInfo(): void
 		@phpinfo(INFO_CONFIGURATION | INFO_MODULES); // @ phpinfo may be disabled
 		$info = ob_get_clean();
 
-		if (strpos($license, '<body') === false) {
+		if (!str_contains($license, '<body')) {
 			echo '<pre class="tracy-dump tracy-light">', Helpers::escapeHtml($info), '</pre>';
 		} else {
 			$info = str_replace('<table', '<table class="tracy-sortable"', $info);
diff --git a/src/Tracy/BlueScreen/assets/page.phtml b/src/Tracy/BlueScreen/assets/page.phtml
index 100bd670d..e12bba35a 100644
--- a/src/Tracy/BlueScreen/assets/page.phtml
+++ b/src/Tracy/BlueScreen/assets/page.phtml
@@ -25,7 +25,7 @@ $chain = Helpers::getExceptionChain($exception);
 	<!-- in <?= str_replace('--', '- ', Helpers::escapeHtml($exception->getFile() . ':' . $exception->getLine())) ?> -->
 <?php if (count($chain) > 1): ?>
 <!--<?php foreach (array_slice($chain, 1) as $ex) {
-	echo str_replace('--', '- ', Helpers::escapeHtml("\n\tcaused by " . Helpers::getClass($ex) . ': ' . $ex->getMessage() . ($ex->getCode() ? ' #' . $ex->getCode() : '')));
+	echo str_replace('--', '- ', Helpers::escapeHtml("\n\tcaused by " . get_debug_type($ex) . ': ' . $ex->getMessage() . ($ex->getCode() ? ' #' . $ex->getCode() : '')));
 } ?> -->
 <?php endif ?>
 
diff --git a/src/Tracy/BlueScreen/assets/section-exception-exception.phtml b/src/Tracy/BlueScreen/assets/section-exception-exception.phtml
index 82af273bc..104edd4e3 100644
--- a/src/Tracy/BlueScreen/assets/section-exception-exception.phtml
+++ b/src/Tracy/BlueScreen/assets/section-exception-exception.phtml
@@ -9,7 +9,7 @@ namespace Tracy;
  * @var callable $dump
  */
 
-if (count((array) $ex) <= count((array) new \Exception)) {
+if (count(get_mangled_object_vars($ex)) <= count(get_mangled_object_vars(new \Exception))) {
 	return;
 }
 ?>
diff --git a/src/Tracy/BlueScreen/assets/section-header.phtml b/src/Tracy/BlueScreen/assets/section-header.phtml
index 8be19a997..a6f049473 100644
--- a/src/Tracy/BlueScreen/assets/section-header.phtml
+++ b/src/Tracy/BlueScreen/assets/section-header.phtml
@@ -13,7 +13,7 @@ namespace Tracy;
 
 $title = $ex instanceof \ErrorException
 	? Helpers::errorTypeToString($ex->getSeverity())
-	: Helpers::getClass($ex);
+	: get_debug_type($ex);
 $code = $ex->getCode() ? ' #' . $ex->getCode() : '';
 
 ?>
@@ -30,6 +30,6 @@ $code = $ex->getCode() ? ' #' . $ex->getCode() : '';
 
 <?php if ($ex->getPrevious()): ?>
 <div class="tracy-caused">
-	<a href="#tracyCaused<?= count($exceptions) + 1 ?>">Caused by <?= Helpers::escapeHtml(Helpers::getClass($ex->getPrevious())) ?></a>
+	<a href="#tracyCaused<?= count($exceptions) + 1 ?>">Caused by <?= Helpers::escapeHtml(get_debug_type($ex->getPrevious())) ?></a>
 </div>
 <?php endif ?>
diff --git a/src/Tracy/BlueScreen/assets/section-stack-callStack.phtml b/src/Tracy/BlueScreen/assets/section-stack-callStack.phtml
index fa94d4e51..9b9cbe639 100644
--- a/src/Tracy/BlueScreen/assets/section-stack-callStack.phtml
+++ b/src/Tracy/BlueScreen/assets/section-stack-callStack.phtml
@@ -72,7 +72,7 @@ if (!$stack) {
 			try {
 				$r = isset($row['class']) ? new \ReflectionMethod($row['class'], $row['function']) : new \ReflectionFunction($row['function']);
 				$params = $r->getParameters();
-			} catch (\Exception $e) {
+			} catch (\Exception) {
 				$params = [];
 			}
 			foreach ($row['args'] as $k => $v) {
diff --git a/src/Tracy/Debugger/Debugger.php b/src/Tracy/Debugger/Debugger.php
index 4b34bbc19..ec98af32e 100644
--- a/src/Tracy/Debugger/Debugger.php
+++ b/src/Tracy/Debugger/Debugger.php
@@ -308,7 +308,7 @@ public static function exceptionHandler(\Throwable $exception): void
 		self::$obStatus = ob_get_status(true);
 
 		if (!headers_sent()) {
-			http_response_code(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE ') !== false ? 503 : 500);
+			http_response_code(isset($_SERVER['HTTP_USER_AGENT']) && str_contains($_SERVER['HTTP_USER_AGENT'], 'MSIE ') ? 503 : 500);
 		}
 
 		Helpers::improveException($exception);
diff --git a/src/Tracy/Dumper/Describer.php b/src/Tracy/Dumper/Describer.php
index a392881ee..8126662e4 100644
--- a/src/Tracy/Dumper/Describer.php
+++ b/src/Tracy/Dumper/Describer.php
@@ -167,7 +167,7 @@ private function describeObject(object $obj, int $depth = 0): Value
 			return new Value(Value::TypeRef, $id);
 		}
 
-		$value = new Value(Value::TypeObject, Helpers::getClass($obj));
+		$value = new Value(Value::TypeObject, get_debug_type($obj));
 		$value->id = $id;
 		$value->depth = $depth;
 		$value->holder = $obj; // to be not released by garbage collector in collecting mode
@@ -286,7 +286,7 @@ private static function hideValue(mixed $val): string
 			$val = $val->getValue();
 		}
 
-		return self::HiddenValue . ' (' . (is_object($val) ? Helpers::getClass($val) : gettype($val)) . ')';
+		return self::HiddenValue . ' (' . get_debug_type($val) . ')';
 	}
 
 
diff --git a/src/Tracy/Dumper/Exposer.php b/src/Tracy/Dumper/Exposer.php
index 590e53bff..b4812da93 100644
--- a/src/Tracy/Dumper/Exposer.php
+++ b/src/Tracy/Dumper/Exposer.php
@@ -19,7 +19,7 @@ final class Exposer
 {
 	public static function exposeObject(object $obj, Value $value, Describer $describer): void
 	{
-		$values = (array) $obj;
+		$values = get_mangled_object_vars($obj);
 		$props = self::getProperties($obj::class);
 
 		foreach (array_diff_key($values, $props) as $k => $v) {
@@ -208,7 +208,7 @@ public static function exposePhpIncompleteClass(
 		Describer $describer,
 	): void
 	{
-		$values = (array) $obj;
+		$values = get_mangled_object_vars($obj);
 		$class = $values['__PHP_Incomplete_Class_Name'];
 		unset($values['__PHP_Incomplete_Class_Name']);
 		foreach ($values as $k => $v) {
diff --git a/src/Tracy/Helpers.php b/src/Tracy/Helpers.php
index c51948a71..dc27bdfce 100644
--- a/src/Tracy/Helpers.php
+++ b/src/Tracy/Helpers.php
@@ -110,12 +110,6 @@ public static function findTrace(array $trace, array|string $method, ?int &$inde
 	}
 
 
-	public static function getClass(object $obj): string
-	{
-		return explode("\x00", $obj::class)[0];
-	}
-
-
 	/** @internal */
 	public static function fixStack(\Throwable $exception): \Throwable
 	{
diff --git a/src/Tracy/Logger/Logger.php b/src/Tracy/Logger/Logger.php
index 760de01e4..4ef677798 100644
--- a/src/Tracy/Logger/Logger.php
+++ b/src/Tracy/Logger/Logger.php
@@ -87,7 +87,7 @@ public static function formatMessage($message): string
 			foreach (Helpers::getExceptionChain($message) as $exception) {
 				$tmp[] = ($exception instanceof \ErrorException
 					? Helpers::errorTypeToString($exception->getSeverity()) . ': ' . $exception->getMessage()
-					: Helpers::getClass($exception) . ': ' . $exception->getMessage() . ($exception->getCode() ? ' #' . $exception->getCode() : '')
+					: get_debug_type($exception) . ': ' . $exception->getMessage() . ($exception->getCode() ? ' #' . $exception->getCode() : '')
 				) . ' in ' . $exception->getFile() . ':' . $exception->getLine();
 			}
 
diff --git a/tests/Tracy/Dumper.keysToHide.phpt b/tests/Tracy/Dumper.keysToHide.phpt
index a6a826171..613d884c3 100644
--- a/tests/Tracy/Dumper.keysToHide.phpt
+++ b/tests/Tracy/Dumper.keysToHide.phpt
@@ -25,7 +25,7 @@ $obj = (object) [
 Assert::match(
 	<<<'XX'
 		stdClass #%d%
-		   a: ***** (integer)
+		   a: ***** (int)
 		   password: ***** (string)
 		   PASSWORD: ***** (string)
 		   Pin: ***** (string)
diff --git a/tests/Tracy/Dumper.scrubber.phpt b/tests/Tracy/Dumper.scrubber.phpt
index 567d1910b..40f63280a 100644
--- a/tests/Tracy/Dumper.scrubber.phpt
+++ b/tests/Tracy/Dumper.scrubber.phpt
@@ -33,13 +33,13 @@ $expect1 = <<<'XX'
 	   PASSWORD: 'secret2'
 	   Pin: ***** (string)
 	   foo: ***** (string)
-	   q: ***** (integer)
+	   q: ***** (int)
 	   inner: array (5)
 	   |  'a' => 123
 	   |  'password' => 'secret4'
 	   |  'PASSWORD' => 'secret5'
 	   |  'Pin' => ***** (string)
-	   |  'bar' => ***** (integer)
+	   |  'bar' => ***** (int)
 	XX;
 
 Assert::match($expect1, Dumper::toText($obj, [Dumper::SCRUBBER => $scrubber]));
@@ -52,13 +52,13 @@ $expect2 = <<<'XX'
 	   PASSWORD: ***** (string)
 	   Pin: ***** (string)
 	   foo: ***** (string)
-	   q: ***** (integer)
+	   q: ***** (int)
 	   inner: array (5)
 	   |  'a' => 123
 	   |  'password' => ***** (string)
 	   |  'PASSWORD' => ***** (string)
 	   |  'Pin' => ***** (string)
-	   |  'bar' => ***** (integer)
+	   |  'bar' => ***** (int)
 	XX;
 Assert::match($expect2, Dumper::toText($obj, [Dumper::SCRUBBER => $scrubber, Dumper::KEYS_TO_HIDE => ['password']]));
 
diff --git a/tests/Tracy/Dumper.toHtml().key.phpt b/tests/Tracy/Dumper.toHtml().key.phpt
index 07618db8e..6c4f40e0d 100644
--- a/tests/Tracy/Dumper.toHtml().key.phpt
+++ b/tests/Tracy/Dumper.toHtml().key.phpt
@@ -15,6 +15,6 @@ Assert::match(
 );
 
 Assert::match(
-	'<pre class="tracy-dump tracy-light"><span class="tracy-dump-virtual">***** (integer)</span></pre>',
+	'<pre class="tracy-dump tracy-light"><span class="tracy-dump-virtual">***** (int)</span></pre>',
 	Dumper::toHtml(123, [Dumper::KEYS_TO_HIDE => ['password', 'pin']], 'password'),
 );
diff --git a/tools/create-phar/create-phar.php b/tools/create-phar/create-phar.php
index f1c1af0c4..58af56d35 100644
--- a/tools/create-phar/create-phar.php
+++ b/tools/create-phar/create-phar.php
@@ -47,7 +47,7 @@ function compressCss(string $s): string
 	echo "adding: {$iterator->getSubPathname()}\n";
 
 	$s = file_get_contents($file->getPathname());
-	if (strpos($s, '@tracySkipLocation') === false) {
+	if (!str_contains($s, '@tracySkipLocation')) {
 		$s = php_strip_whitespace($file->getPathname());
 	}
 
@@ -61,7 +61,7 @@ function compressCss(string $s): string
 		$s = preg_replace_callback('#(<(script|style).*(?<![?=])>)(.*)(</)#Uis', function ($m): string {
 			[, $begin, $type, $s, $end] = $m;
 
-			if ($s === '' || strpos($s, '<?') !== false) {
+			if ($s === '' || str_contains($s, '<?')) {
 				return $m[0];
 
 			} elseif ($type === 'script') {

From f4c3cbcb61cb8f9b5c8729966af5f1a59007ea03 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Fri, 6 May 2022 18:17:45 +0200
Subject: [PATCH 13/30] CSP: requires 'script-dynamic'

---
 readme.md                   | 8 ++++----
 src/Tracy/Bar/assets/bar.js | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/readme.md b/readme.md
index 84dfb1825..799c0435d 100644
--- a/readme.md
+++ b/readme.md
@@ -49,7 +49,7 @@ Alternatively, you can download the whole package or [tracy.phar](https://github
 
 | Tracy     | compatible with PHP | compatible with browsers
 |-----------|---------------|----------
-| Tracy 2.10| PHP 8.0 – 8.2 | Chrome 64+, Firefox 69+, Safari 13.1+ and iOS Safari 13.4+
+| Tracy 2.10| PHP 8.0 – 8.2 | Chrome 64+, Firefox 69+, Safari 15.4+ and iOS Safari 15.4+
 | Tracy 2.9 | PHP 7.2 – 8.2 | Chrome 64+, Firefox 69+, Safari 13.1+ and iOS Safari 13.4+
 | Tracy 2.8 | PHP 7.2 – 8.1 | Chrome 55+, Firefox 53+, Safari 11+ and iOS Safari 11+
 | Tracy 2.7 | PHP 7.1 – 8.0 | Chrome 55+, Firefox 53+, MS Edge 16+, Safari 11+ and iOS Safari 11+
@@ -144,7 +144,7 @@ In order to detect misspellings when assigning to an object, we use [trait Nette
 Content Security Policy
 -----------------------
 
-If your site uses Content Security Policy, you'll need to add `'nonce-<value>'` to `script-src` for Tracy to work properly. Some 3rd plugins may require additional directives.
+If your site uses Content Security Policy, you'll need to add `'nonce-<value>'` and `'strict-dynamic'` to `script-src` for Tracy to work properly. Some 3rd plugins may require additional directives.
 Nonce is not supported in the `style-src` directive, if you use this directive you need to add `'unsafe-inline'`, but this should be avoided in production mode.
 
 Configuration example for [Nette Framework](https://nette.org):
@@ -152,14 +152,14 @@ Configuration example for [Nette Framework](https://nette.org):
 ```neon
 http:
 	csp:
-		script-src: nonce
+		script-src: [nonce, strict-dynamic]
 ```
 
 Example in pure PHP:
 
 ```php
 $nonce = base64_encode(random_bytes(20));
-header("Content-Security-Policy: script-src 'nonce-$nonce';");
+header("Content-Security-Policy: script-src 'nonce-$nonce' 'strict-dynamic';");
 ```
 
 
diff --git a/src/Tracy/Bar/assets/bar.js b/src/Tracy/Bar/assets/bar.js
index 50f36902c..c37a48809 100644
--- a/src/Tracy/Bar/assets/bar.js
+++ b/src/Tracy/Bar/assets/bar.js
@@ -2,8 +2,7 @@
  * This file is part of the Tracy (https://tracy.nette.org)
  */
 
-let nonce = document.currentScript.getAttribute('nonce') || document.currentScript.nonce,
-	requestId = document.currentScript.dataset.id,
+let requestId = document.currentScript.dataset.id,
 	ajaxCounter = 1,
 	baseUrl = location.href.split('#')[0];
 
@@ -525,7 +524,6 @@ class Debug
 		}
 		Debug.scriptElem = document.createElement('script');
 		Debug.scriptElem.src = url;
-		Debug.scriptElem.setAttribute('nonce', nonce);
 		(document.body || document.documentElement).appendChild(Debug.scriptElem);
 	}
 }
@@ -537,7 +535,6 @@ function evalScripts(elem) {
 			let document = script.ownerDocument;
 			let dolly = document.createElement('script');
 			dolly.textContent = script.textContent;
-			dolly.setAttribute('nonce', nonce);
 			(document.body || document.documentElement).appendChild(dolly);
 			script.tracyEvaluated = true;
 		}

From ae32c0f8cd99f91e65815017b02e5592abd54790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radovan=20Kep=C3=A1k?= <radovan@kepakovi.cz>
Date: Sat, 1 Jan 2022 11:19:11 +0100
Subject: [PATCH 14/30] Debugger::timer: switch from microtime to hrtime

hrtime is faster on virtual machines, due microtime use system call that need to change context from user to kernel (PHP7.3+)
---
 src/Tracy/Debugger/Debugger.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Tracy/Debugger/Debugger.php b/src/Tracy/Debugger/Debugger.php
index ec98af32e..4d2c43877 100644
--- a/src/Tracy/Debugger/Debugger.php
+++ b/src/Tracy/Debugger/Debugger.php
@@ -516,10 +516,10 @@ public static function dump(mixed $var, bool $return = false): mixed
 	public static function timer(?string $name = null): float
 	{
 		static $time = [];
-		$now = microtime(true);
+		$now = hrtime(true);
 		$delta = isset($time[$name]) ? $now - $time[$name] : 0;
 		$time[$name] = $now;
-		return $delta;
+		return $delta / 1e9;
 	}
 
 

From df85dcb4d2b9bb9fd7e5727452d374fe2c7ef93c Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Mon, 27 Feb 2023 20:10:52 +0100
Subject: [PATCH 15/30] BlueScreen: added support for sensitive markers
 /*sensitive{*/ and /*}*/ [Closes #426]

---
 src/Tracy/BlueScreen/BlueScreen.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Tracy/BlueScreen/BlueScreen.php b/src/Tracy/BlueScreen/BlueScreen.php
index 766831be9..e9bdce188 100644
--- a/src/Tracy/BlueScreen/BlueScreen.php
+++ b/src/Tracy/BlueScreen/BlueScreen.php
@@ -338,6 +338,7 @@ public static function highlightPhp(string $source, int $line, int $lines = 15,
 
 		$source = preg_replace('#(__halt_compiler\s*\(\)\s*;).*#is', '$1', $source);
 		$source = str_replace(["\r\n", "\r"], "\n", $source);
+		$source = preg_replace('#/\*sensitive\{\*/.*?/\*\}\*/#s', Dumper\Describer::HiddenValue, $source);
 		$source = explode("\n", highlight_string($source, true));
 		$out = $source[0]; // <code><span color=highlight.html>
 		$source = str_replace('<br />', "\n", $source[1]);

From 960e86ca8e96f077e7ff136d20d308212c3bfdbd Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 7 Mar 2023 01:01:09 +0100
Subject: [PATCH 16/30] Describer::addPropertyTo() added $described

---
 src/Tracy/Dumper/Describer.php |  3 ++-
 src/Tracy/Dumper/Exposer.php   | 13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Tracy/Dumper/Describer.php b/src/Tracy/Dumper/Describer.php
index 8126662e4..cd057e462 100644
--- a/src/Tracy/Dumper/Describer.php
+++ b/src/Tracy/Dumper/Describer.php
@@ -236,6 +236,7 @@ public function addPropertyTo(
 		int $type = Value::PropertyVirtual,
 		?int $refId = null,
 		?string $class = null,
+		?Value $described = null,
 	): void
 	{
 		if ($value->depth && $this->maxItems && count($value->items ?? []) >= $this->maxItems) {
@@ -248,7 +249,7 @@ public function addPropertyTo(
 			$this->describeKey($k),
 			$type !== Value::PropertyVirtual && $this->isSensitive($k, $v, $class)
 				? new Value(Value::TypeText, self::hideValue($v))
-				: $this->describeVar($v, $value->depth + 1, $refId),
+				: ($described ?? $this->describeVar($v, $value->depth + 1, $refId)),
 			$type === Value::PropertyPrivate ? $class : $type,
 		] + ($refId ? [3 => $refId] : []);
 	}
diff --git a/src/Tracy/Dumper/Exposer.php b/src/Tracy/Dumper/Exposer.php
index b4812da93..2472d52c3 100644
--- a/src/Tracy/Dumper/Exposer.php
+++ b/src/Tracy/Dumper/Exposer.php
@@ -43,11 +43,14 @@ public static function exposeObject(object $obj, Value $value, Describer $descri
 					$class,
 				);
 			} else {
-				$value->items[] = [
+				$describer->addPropertyTo(
+					$value,
 					$name,
-					new Value(Value::TypeText, 'unset'),
-					$type === Value::PropertyPrivate ? $class : $type,
-				];
+					null,
+					$type,
+					class: $class,
+					described: new Value(Value::TypeText, 'unset'),
+				);
 			}
 		}
 	}
@@ -107,7 +110,7 @@ public static function exposeClosure(\Closure $obj, Value $value, Describer $des
 		if ($uses) {
 			$useValue->value = implode(', ', $uses);
 			$useValue->collapsed = true;
-			$value->items[] = ['use', $useValue];
+			$describer->addPropertyTo($value, 'use', null, described: $useValue);
 		}
 	}
 

From 1363c8236520fd11afa16b27d29c478d079a6f7d Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 7 Mar 2023 01:01:09 +0100
Subject: [PATCH 17/30] Dumper: added support for enum/flags properties

---
 src/Tracy/Dumper/Describer.php                |  18 +++
 src/Tracy/Dumper/Dumper.php                   |  10 ++
 src/Tracy/Dumper/Exposer.php                  |   5 +-
 src/Tracy/Helpers.php                         |  25 +++++
 ...Dumper.toText().enumProperty.PhpToken.phpt |  54 +++++++++
 tests/Tracy/Dumper.toText().enumProperty.phpt | 105 ++++++++++++++++++
 6 files changed, 215 insertions(+), 2 deletions(-)
 create mode 100644 tests/Tracy/Dumper.toText().enumProperty.PhpToken.phpt
 create mode 100644 tests/Tracy/Dumper.toText().enumProperty.phpt

diff --git a/src/Tracy/Dumper/Describer.php b/src/Tracy/Dumper/Describer.php
index cd057e462..be0d6e1c2 100644
--- a/src/Tracy/Dumper/Describer.php
+++ b/src/Tracy/Dumper/Describer.php
@@ -44,6 +44,9 @@ final class Describer
 	/** @var array<string,callable> */
 	public array $objectExposers = [];
 
+	/** @var array<string, array{bool, string[]}> */
+	public array $enumProperties = [];
+
 	/** @var (int|\stdClass)[] */
 	public array $references = [];
 
@@ -291,6 +294,21 @@ private static function hideValue(mixed $val): string
 	}
 
 
+	public function describeEnumProperty(string $class, string $property, mixed $value): ?Value
+	{
+		[$set, $constants] = $this->enumProperties["$class::$property"] ?? null;
+		if (!is_int($value)
+			|| !$constants
+			|| !($constants = Helpers::decomposeFlags($value, $set, $constants))
+		) {
+			return null;
+		}
+
+		$constants = array_map(fn(string $const): string => str_replace("$class::", 'self::', $const), $constants);
+		return new Value(Value::TypeNumber, implode(' | ', $constants) . " ($value)");
+	}
+
+
 	public function getReferenceId(array $arr, string|int $key): ?int
 	{
 		if ((!$rr = \ReflectionReference::fromArrayElement($arr, $key))) {
diff --git a/src/Tracy/Dumper/Dumper.php b/src/Tracy/Dumper/Dumper.php
index 0939fb773..06bece26a 100644
--- a/src/Tracy/Dumper/Dumper.php
+++ b/src/Tracy/Dumper/Dumper.php
@@ -86,6 +86,9 @@ class Dumper
 		Ds\Map::class => [Exposer::class, 'exposeDsMap'],
 	];
 
+	/** @var array<string, array{bool, string[]}> */
+	private static array $enumProperties = [];
+
 	private Describer $describer;
 	private Renderer $renderer;
 
@@ -181,6 +184,7 @@ private function __construct(array $options = [])
 		$describer->keysToHide = array_flip(array_map('strtolower', $options[self::KEYS_TO_HIDE] ?? []));
 		$describer->resourceExposers = ($options['resourceExporters'] ?? []) + self::$resources;
 		$describer->objectExposers = ($options[self::OBJECT_EXPORTERS] ?? []) + self::$objectExporters;
+		$describer->enumProperties = self::$enumProperties;
 		$describer->location = (bool) $location;
 		if ($options[self::LIVE] ?? false) {
 			$tmp = &self::$liveSnapshot;
@@ -241,4 +245,10 @@ public static function formatSnapshotAttribute(array &$snapshot): string
 		$snapshot = [];
 		return $res;
 	}
+
+
+	public static function addEnumProperty(string $class, string $property, array $constants, bool $set = false): void
+	{
+		self::$enumProperties["$class::$property"] = [$set, $constants];
+	}
 }
diff --git a/src/Tracy/Dumper/Exposer.php b/src/Tracy/Dumper/Exposer.php
index 2472d52c3..0e72a4242 100644
--- a/src/Tracy/Dumper/Exposer.php
+++ b/src/Tracy/Dumper/Exposer.php
@@ -41,6 +41,7 @@ public static function exposeObject(object $obj, Value $value, Describer $descri
 					$type,
 					$describer->getReferenceId($values, $k),
 					$class,
+					$describer->describeEnumProperty($class, $name, $values[$k]),
 				);
 			} else {
 				$describer->addPropertyTo(
@@ -241,7 +242,7 @@ public static function exposeDsCollection(
 	): void
 	{
 		foreach ($obj as $k => $v) {
-			$describer->addPropertyTo($value, (string) $k, $v, Value::PropertyVirtual);
+			$describer->addPropertyTo($value, (string) $k, $v);
 		}
 	}
 
@@ -254,7 +255,7 @@ public static function exposeDsMap(
 	{
 		$i = 0;
 		foreach ($obj as $k => $v) {
-			$describer->addPropertyTo($value, (string) $i++, new Ds\Pair($k, $v), Value::PropertyVirtual);
+			$describer->addPropertyTo($value, (string) $i++, new Ds\Pair($k, $v));
 		}
 	}
 }
diff --git a/src/Tracy/Helpers.php b/src/Tracy/Helpers.php
index dc27bdfce..93811b4a4 100644
--- a/src/Tracy/Helpers.php
+++ b/src/Tracy/Helpers.php
@@ -597,4 +597,29 @@ public static function traverseValue(mixed $val, callable $callback, array &$ski
 			}
 		}
 	}
+
+
+	/** @internal */
+	public static function decomposeFlags(int $flags, bool $set, array $constants): ?array
+	{
+		$res = null;
+		foreach ($constants as $constant) {
+			if (defined($constant)) {
+				$v = constant($constant);
+				if ($set) {
+					if ($v && ($flags & $v) === $v) {
+						$res[] = $constant;
+						$flags &= ~$v;
+					}
+				} elseif ($flags === $v) {
+					return [$constant];
+				}
+			}
+		}
+
+		if ($flags && $res && $set) {
+			$res[] = (string) $flags;
+		}
+		return $res;
+	}
 }
diff --git a/tests/Tracy/Dumper.toText().enumProperty.PhpToken.phpt b/tests/Tracy/Dumper.toText().enumProperty.PhpToken.phpt
new file mode 100644
index 000000000..af0415f49
--- /dev/null
+++ b/tests/Tracy/Dumper.toText().enumProperty.PhpToken.phpt
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Test: Tracy\Dumper::toText() enum/flags property & PhpToken
+ */
+
+declare(strict_types=1);
+
+use Tester\Assert;
+use Tracy\Dumper;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+Dumper::addEnumProperty(PhpToken::class, 'id', array_keys(get_defined_constants(true)['tokenizer']));
+
+$tokens = PhpToken::tokenize('<?php echo(10);');
+
+Assert::match(
+	<<<'XX'
+		array (6)
+		   0 => PhpToken #%d%
+		   |  id: T_OPEN_TAG (%d%)
+		   |  text: '<?php '
+		   |  line: 1
+		   |  pos: 0
+		   1 => PhpToken #%d%
+		   |  id: T_ECHO (%d%)
+		   |  text: 'echo'
+		   |  line: 1
+		   |  pos: 6
+		   2 => PhpToken #%d%
+		   |  id: 40
+		   |  text: '('
+		   |  line: 1
+		   |  pos: 10
+		   3 => PhpToken #%d%
+		   |  id: T_LNUMBER (%d%)
+		   |  text: '10'
+		   |  line: 1
+		   |  pos: 11
+		   4 => PhpToken #%d%
+		   |  id: 41
+		   |  text: ')'
+		   |  line: 1
+		   |  pos: 13
+		   5 => PhpToken #%d%
+		   |  id: 59
+		   |  text: ';'
+		   |  line: 1
+		   |  pos: 14
+		XX,
+	Dumper::toText($tokens),
+);
diff --git a/tests/Tracy/Dumper.toText().enumProperty.phpt b/tests/Tracy/Dumper.toText().enumProperty.phpt
new file mode 100644
index 000000000..dce593b1b
--- /dev/null
+++ b/tests/Tracy/Dumper.toText().enumProperty.phpt
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * Test: Tracy\Dumper::toText() enum/flags property
+ */
+
+declare(strict_types=1);
+
+use Tester\Assert;
+use Tracy\Dumper;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class Flags
+{
+	public const Null = 0;
+	public const A = 1 << 0;
+	public const B = 1 << 1;
+	public const C = 1 << 2;
+	public const All = self::A | self::B | self::C;
+
+	public int $flag;
+	public int $flags;
+}
+
+class Child extends Flags
+{
+}
+
+
+Dumper::addEnumProperty(Flags::class, 'flag', ['Flags::A', 'Flags::B', 'Flags::C', 'Flags::Null']);
+Dumper::addEnumProperty(Flags::class, 'flags', ['Flags::All', 'Flags::A', 'Flags::B', 'Flags::C', 'Flags::Null'], set: true);
+
+// valid
+$child = new Child;
+$child->flag = $child::B;
+$child->flags = $child::A | $child::B;
+
+Assert::match(
+	<<<'XX'
+		Child #%d%
+		   flag: self::B (2)
+		   flags: self::A | self::B (3)
+		XX,
+	Dumper::toText($child),
+);
+
+
+// all
+$child = new Child;
+$child->flags = $child::All;
+
+Assert::match(
+	<<<'XX'
+		Child #%d%
+		   flag: unset
+		   flags: self::All (7)
+		XX,
+	Dumper::toText($child),
+);
+
+
+// null
+$child = new Child;
+$child->flag = 0;
+$child->flags = 0;
+
+Assert::match(
+	<<<'XX'
+		Child #%d%
+		   flag: self::Null (0)
+		   flags: 0
+		XX,
+	Dumper::toText($child),
+);
+
+
+// invalid
+$child = new Child;
+$child->flag = 16;
+$child->flags = 16;
+
+Assert::match(
+	<<<'XX'
+		Child #%d%
+		   flag: 16
+		   flags: 16
+		XX,
+	Dumper::toText($child),
+);
+
+
+// mixed
+$child = new Child;
+$child->flags = $child::B | $child::A | 16;
+
+Assert::match(
+	<<<'XX'
+		Child #%d%
+		   flag: unset
+		   flags: self::A | self::B | 16 (19)
+		XX,
+	Dumper::toText($child),
+);

From d97a773e6e2670ba9d3f6ec6c32c41545a2de3be Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Wed, 8 Mar 2023 05:16:20 +0100
Subject: [PATCH 18/30] BlueScreen: simplified HTML comment escaping

---
 src/Tracy/BlueScreen/assets/page.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Tracy/BlueScreen/assets/page.phtml b/src/Tracy/BlueScreen/assets/page.phtml
index e12bba35a..59d01aae7 100644
--- a/src/Tracy/BlueScreen/assets/page.phtml
+++ b/src/Tracy/BlueScreen/assets/page.phtml
@@ -22,10 +22,10 @@ $chain = Helpers::getExceptionChain($exception);
 	<meta name="generator" content="Tracy by Nette Framework">
 
 	<title><?= Helpers::escapeHtml($title . ': ' . $exception->getMessage() . $code) ?></title>
-	<!-- in <?= str_replace('--', '- ', Helpers::escapeHtml($exception->getFile() . ':' . $exception->getLine())) ?> -->
+	<!-- in <?= Helpers::escapeHtml($exception->getFile() . ':' . $exception->getLine()) ?> -->
 <?php if (count($chain) > 1): ?>
 <!--<?php foreach (array_slice($chain, 1) as $ex) {
-	echo str_replace('--', '- ', Helpers::escapeHtml("\n\tcaused by " . get_debug_type($ex) . ': ' . $ex->getMessage() . ($ex->getCode() ? ' #' . $ex->getCode() : '')));
+	echo Helpers::escapeHtml("\n\tcaused by " . get_debug_type($ex) . ': ' . $ex->getMessage() . ($ex->getCode() ? ' #' . $ex->getCode() : ''));
 } ?> -->
 <?php endif ?>
 

From c50307fdd25330108c6320ace3d6d8f30ed9e9f9 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Wed, 8 Mar 2023 05:15:25 +0100
Subject: [PATCH 19/30] BlueScreen: added source to header

---
 src/Tracy/BlueScreen/assets/page.phtml                        | 2 ++
 tests/Tracy/expected/Debugger.E_ERROR.html.expect             | 1 +
 tests/Tracy/expected/Debugger.error-in-eval.expect            | 1 +
 tests/Tracy/expected/Debugger.exception.fiber.html.expect     | 1 +
 tests/Tracy/expected/Debugger.exception.generator.html.expect | 1 +
 tests/Tracy/expected/Debugger.exception.html.expect           | 1 +
 tests/Tracy/expected/Debugger.strict.html.expect              | 1 +
 7 files changed, 8 insertions(+)

diff --git a/src/Tracy/BlueScreen/assets/page.phtml b/src/Tracy/BlueScreen/assets/page.phtml
index 59d01aae7..0dff01fbb 100644
--- a/src/Tracy/BlueScreen/assets/page.phtml
+++ b/src/Tracy/BlueScreen/assets/page.phtml
@@ -9,6 +9,7 @@ namespace Tracy;
  * @var string $title
  * @var ?string $nonce
  * @var string $css
+ * @var string $source
  */
 
 $code = $exception->getCode() ? ' #' . $exception->getCode() : '';
@@ -28,6 +29,7 @@ $chain = Helpers::getExceptionChain($exception);
 	echo Helpers::escapeHtml("\n\tcaused by " . get_debug_type($ex) . ': ' . $ex->getMessage() . ($ex->getCode() ? ' #' . $ex->getCode() : ''));
 } ?> -->
 <?php endif ?>
+	<!-- <?= Helpers::escapeHtml($source) ?> -->
 
 	<style class="tracy-debug">
 	<?= str_replace('</', '<\/', $css) ?>
diff --git a/tests/Tracy/expected/Debugger.E_ERROR.html.expect b/tests/Tracy/expected/Debugger.E_ERROR.html.expect
index 0d7ca158f..1d359a115 100644
--- a/tests/Tracy/expected/Debugger.E_ERROR.html.expect
+++ b/tests/Tracy/expected/Debugger.E_ERROR.html.expect
@@ -7,6 +7,7 @@
 
 	<title>Error: Call to undefined function missing_function()</title>
 	<!-- in %a%:%d% -->
+	<!-- %a% -->
 
 	%A%
 </head>
diff --git a/tests/Tracy/expected/Debugger.error-in-eval.expect b/tests/Tracy/expected/Debugger.error-in-eval.expect
index 8ab62f0d6..e67703bf7 100644
--- a/tests/Tracy/expected/Debugger.error-in-eval.expect
+++ b/tests/Tracy/expected/Debugger.error-in-eval.expect
@@ -7,6 +7,7 @@
 
 	<title>User Error: The my error</title>
 	<!-- in %a%:%d% -->
+	<!-- %a% -->
 
 	%A%
 </head>
diff --git a/tests/Tracy/expected/Debugger.exception.fiber.html.expect b/tests/Tracy/expected/Debugger.exception.fiber.html.expect
index dcc968709..c144219e9 100644
--- a/tests/Tracy/expected/Debugger.exception.fiber.html.expect
+++ b/tests/Tracy/expected/Debugger.exception.fiber.html.expect
@@ -7,6 +7,7 @@
 
 	<title>Exception: The my exception #123</title>
 	<!-- in %a%:%d% -->
+	<!-- %a% -->
 
 	%A%
 </head>
diff --git a/tests/Tracy/expected/Debugger.exception.generator.html.expect b/tests/Tracy/expected/Debugger.exception.generator.html.expect
index 52b76ed70..a627d292a 100644
--- a/tests/Tracy/expected/Debugger.exception.generator.html.expect
+++ b/tests/Tracy/expected/Debugger.exception.generator.html.expect
@@ -7,6 +7,7 @@
 
 	<title>Exception: The my exception #123</title>
 	<!-- in %a%:%d% -->
+	<!-- %a% -->
 
 	%A%
 </head>
diff --git a/tests/Tracy/expected/Debugger.exception.html.expect b/tests/Tracy/expected/Debugger.exception.html.expect
index de5d158ae..587011e03 100644
--- a/tests/Tracy/expected/Debugger.exception.html.expect
+++ b/tests/Tracy/expected/Debugger.exception.html.expect
@@ -7,6 +7,7 @@
 
 	<title>Exception: The my exception #123</title>
 	<!-- in %a%:%d% -->
+	<!-- %a% -->
 
 	%A%
 </head>
diff --git a/tests/Tracy/expected/Debugger.strict.html.expect b/tests/Tracy/expected/Debugger.strict.html.expect
index ec235bac5..5af044ab2 100644
--- a/tests/Tracy/expected/Debugger.strict.html.expect
+++ b/tests/Tracy/expected/Debugger.strict.html.expect
@@ -7,6 +7,7 @@
 
 	<title>Notice: Only variables should be assigned by reference</title>
 	<!-- in %a%:%d% -->
+	<!-- %a% -->
 
 	%A%
 </head>

From f8752218badc789e4aadecdbc4281dbc811af508 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 28 Feb 2023 14:08:09 +0100
Subject: [PATCH 20/30] Released version 2.10.0

---
 src/Tracy/Debugger/Debugger.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tracy/Debugger/Debugger.php b/src/Tracy/Debugger/Debugger.php
index 4d2c43877..63a5a4d8f 100644
--- a/src/Tracy/Debugger/Debugger.php
+++ b/src/Tracy/Debugger/Debugger.php
@@ -17,7 +17,7 @@
  */
 class Debugger
 {
-	public const VERSION = '2.10-dev';
+	public const VERSION = '2.10.0';
 
 	/** server modes for Debugger::enable() */
 	public const

From 5788ef009ea68eb3f05e1ce3ee9bcd665d754b5f Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Fri, 10 Dec 2021 05:33:06 +0100
Subject: [PATCH 21/30] opened 3.0-dev

---
 composer.json                   | 4 ++--
 readme.md                       | 1 +
 src/Tracy/Debugger/Debugger.php | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index ff94363c2..bdfd6859b 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
 		}
 	],
 	"require": {
-		"php": ">=8.0 <8.3",
+		"php": ">=7.2 <8.3",
 		"ext-session": "*",
 		"ext-json": "*"
 	},
@@ -42,7 +42,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.10-dev"
+			"dev-master": "3.0-dev"
 		}
 	}
 }
diff --git a/readme.md b/readme.md
index 799c0435d..8d7c80c14 100644
--- a/readme.md
+++ b/readme.md
@@ -49,6 +49,7 @@ Alternatively, you can download the whole package or [tracy.phar](https://github
 
 | Tracy     | compatible with PHP | compatible with browsers
 |-----------|---------------|----------
+| Tracy 3.0 | PHP 8.0 – 8.2 | Chrome 64+, Firefox 69+, Safari 15.4+ and iOS Safari 15.4+
 | Tracy 2.10| PHP 8.0 – 8.2 | Chrome 64+, Firefox 69+, Safari 15.4+ and iOS Safari 15.4+
 | Tracy 2.9 | PHP 7.2 – 8.2 | Chrome 64+, Firefox 69+, Safari 13.1+ and iOS Safari 13.4+
 | Tracy 2.8 | PHP 7.2 – 8.1 | Chrome 55+, Firefox 53+, Safari 11+ and iOS Safari 11+
diff --git a/src/Tracy/Debugger/Debugger.php b/src/Tracy/Debugger/Debugger.php
index 63a5a4d8f..22d516f56 100644
--- a/src/Tracy/Debugger/Debugger.php
+++ b/src/Tracy/Debugger/Debugger.php
@@ -17,7 +17,7 @@
  */
 class Debugger
 {
-	public const VERSION = '2.10.0';
+	public const VERSION = '3.0-dev';
 
 	/** server modes for Debugger::enable() */
 	public const

From c358afd3541b687c2d75f41e7a4f6f22424cf2d5 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Mon, 5 Dec 2022 01:21:34 +0100
Subject: [PATCH 22/30] uses PascalCase constants

---
 src/Bridges/Nette/TracyExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bridges/Nette/TracyExtension.php b/src/Bridges/Nette/TracyExtension.php
index cb0142122..9d4df697c 100644
--- a/src/Bridges/Nette/TracyExtension.php
+++ b/src/Bridges/Nette/TracyExtension.php
@@ -124,7 +124,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 		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);
 				}

From 4fd42f8f37c4da68ff0fd3468884be59438aaa62 Mon Sep 17 00:00:00 2001
From: Chris <7539871+paxperscientiam@users.noreply.github.com>
Date: Sun, 20 Mar 2022 17:53:42 -0400
Subject: [PATCH 23/30] readme: added PSR3 adapter for monolog/monolog example

---
 readme.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/readme.md b/readme.md
index 8d7c80c14..8ffc9a978 100644
--- a/readme.md
+++ b/readme.md
@@ -265,6 +265,23 @@ If you use the Nette Framework, you can set this and others in the configuration
 To protect your e-mail box from flood, Tracy sends **only one message** and creates a file `email-sent`. When a developer receives the e-mail notification, he checks the log, corrects his application and deletes the `email-sent` monitoring file. This activates the e-mail sending again.
 
 
+Monolog integration
+-------------------
+
+This package provides a PSR-3 adapter, allowing for integration of [monolog/monolog](https://github.com/Seldaek/monolog).
+
+```php
+$monolog = new Monolog\Logger('main-channel');
+$monolog->pushHandler(new Monolog\Handler\StreamHandler($logFilePath, Monolog\Logger::DEBUG));
+
+$tracyLogger = new Tracy\Bridges\Psr\PsrToTracyLoggerAdapter($monolog);
+Debugger::setLogger($tracyLogger);
+Debugger::enable();
+
+Debugger::log('info'); // writes: [<TIMESTAMP>] main-channel.INFO: info [] []
+Debugger::log('warning', Debugger::WARNING); // writes: [<TIMESTAMP>] main-channel.WARNING: warning [] []
+```
+
 Variable dumping
 ----------------
 

From 133f8c91e0100d0f81fcdb8716752cfa9c0dd738 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Mon, 20 Dec 2021 13:36:00 +0100
Subject: [PATCH 24/30] removed bridge for Latte

---
 src/Bridges/Nette/Bridge.php | 72 +-----------------------------------
 1 file changed, 1 insertion(+), 71 deletions(-)

diff --git a/src/Bridges/Nette/Bridge.php b/src/Bridges/Nette/Bridge.php
index 1819ab024..41d68033a 100644
--- a/src/Bridges/Nette/Bridge.php
+++ b/src/Bridges/Nette/Bridge.php
@@ -9,7 +9,6 @@
 
 namespace Tracy\Bridges\Nette;
 
-use Latte;
 use Nette;
 use Tracy;
 use Tracy\BlueScreen;
@@ -17,87 +16,18 @@
 
 
 /**
- * Bridge for NEON & Latte.
+ * Bridge for NEON.
  */
 class Bridge
 {
 	public static function initialize(): void
 	{
 		$blueScreen = Tracy\Debugger::getBlueScreen();
-		if (!class_exists(Latte\Bridges\Tracy\BlueScreenPanel::class)) {
-			$blueScreen->addPanel([self::class, 'renderLatteError']);
-			$blueScreen->addAction([self::class, 'renderLatteUnknownMacro']);
-			$blueScreen->addFileGenerator(fn(string $file) => substr($file, -6) === '.latte'
-					? "{block content}\n\$END\$"
-					: null);
-			Tracy\Debugger::addSourceMapper([self::class, 'mapLatteSourceCode']);
-		}
-
 		$blueScreen->addAction([self::class, 'renderMemberAccessException']);
 		$blueScreen->addPanel([self::class, 'renderNeonError']);
 	}
 
 
-	public static function renderLatteError(?\Throwable $e): ?array
-	{
-		if ($e instanceof Latte\CompileException && $e->sourceName) {
-			return [
-				'tab' => 'Template',
-				'panel' => (preg_match('#\n|\?#', $e->sourceName)
-						? ''
-						: '<p>'
-							. (@is_file($e->sourceName) // @ - may trigger error
-								? '<b>File:</b> ' . Helpers::editorLink($e->sourceName, $e->sourceLine)
-								: '<b>' . htmlspecialchars($e->sourceName . ($e->sourceLine ? ':' . $e->sourceLine : '')) . '</b>')
-							. '</p>')
-					. BlueScreen::highlightFile($e->sourceCode, $e->sourceLine, 15, 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) {

From 22f4af82341e268b7bd9a074ae581fead0ae6b8d Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Thu, 3 Feb 2022 17:37:54 +0100
Subject: [PATCH 25/30] Logger: added typehints

---
 src/Tracy/Logger/Logger.php | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/Tracy/Logger/Logger.php b/src/Tracy/Logger/Logger.php
index 4ef677798..7c9e65bc5 100644
--- a/src/Tracy/Logger/Logger.php
+++ b/src/Tracy/Logger/Logger.php
@@ -15,23 +15,22 @@
  */
 class Logger implements ILogger
 {
-	/** @var string|null name of the directory where errors should be logged */
-	public $directory;
+	/** name of the directory where errors should be logged */
+	public ?string $directory = null;
 
-	/** @var string|array|null email or emails to which send error notifications */
-	public $email;
+	/** email or emails to which send error notifications */
+	public string|array|null $email = null;
 
-	/** @var string|null sender of email notifications */
-	public $fromEmail;
+	/** sender of email notifications */
+	public ?string $fromEmail = null;
 
-	/** @var mixed interval for sending email is 2 days */
-	public $emailSnooze = '2 days';
+	/** interval for sending email is 2 days */
+	public mixed $emailSnooze = '2 days';
 
 	/** @var callable handler for sending emails */
 	public $mailer;
 
-	/** @var BlueScreen|null */
-	private $blueScreen;
+	private ?BlueScreen $blueScreen = null;
 
 
 	public function __construct(?string $directory, string|array|null $email = null, ?BlueScreen $blueScreen = null)
@@ -78,10 +77,7 @@ public function log(mixed $message, string $level = self::INFO)
 	}
 
 
-	/**
-	 * @param  mixed  $message
-	 */
-	public static function formatMessage($message): string
+	public static function formatMessage(mixed $message): string
 	{
 		if ($message instanceof \Throwable) {
 			foreach (Helpers::getExceptionChain($message) as $exception) {
@@ -101,10 +97,7 @@ public static function formatMessage($message): string
 	}
 
 
-	/**
-	 * @param  mixed  $message
-	 */
-	public static function formatLogLine($message, ?string $exceptionFile = null): string
+	public static function formatLogLine(mixed $message, ?string $exceptionFile = null): string
 	{
 		return implode(' ', [
 			date('[Y-m-d H-i-s]'),
@@ -152,10 +145,7 @@ protected function logException(\Throwable $exception, ?string $file = null): st
 	}
 
 
-	/**
-	 * @param  mixed  $message
-	 */
-	protected function sendEmail($message): void
+	protected function sendEmail(mixed $message): void
 	{
 		$snooze = is_numeric($this->emailSnooze)
 			? $this->emailSnooze
@@ -174,10 +164,9 @@ protected function sendEmail($message): void
 
 	/**
 	 * Default mailer.
-	 * @param  mixed  $message
 	 * @internal
 	 */
-	public function defaultMailer($message, string $email): void
+	public function defaultMailer(mixed $message, string $email): void
 	{
 		$host = preg_replace('#[^\w.-]+#', '', $_SERVER['SERVER_NAME'] ?? php_uname('n'));
 		$parts = str_replace(

From 02641ee352201868b3199814a577c635bd9238a9 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 31 May 2022 21:35:38 +0200
Subject: [PATCH 26/30] shadow dom for dumper [WIP]

---
 examples/assets/style.css                 |  4 +-
 src/Tracy/BlueScreen/assets/bluescreen.js |  5 ++-
 src/Tracy/Debugger/Debugger.php           |  8 ++--
 src/Tracy/Dumper/Dumper.php               | 11 +++---
 src/Tracy/Dumper/assets/dumper-dark.css   |  9 ++++-
 src/Tracy/Dumper/assets/dumper-light.css  |  9 ++++-
 src/Tracy/Dumper/assets/dumper.js         | 47 +++++++++++++++++------
 src/Tracy/assets/table-sort.js            |  5 ++-
 src/Tracy/assets/tabs.js                  |  5 ++-
 src/Tracy/assets/toggle.js                | 11 +++---
 10 files changed, 76 insertions(+), 38 deletions(-)

diff --git a/examples/assets/style.css b/examples/assets/style.css
index 6a75aeacc..ebc3b9e89 100644
--- a/examples/assets/style.css
+++ b/examples/assets/style.css
@@ -22,10 +22,8 @@ h2 {
 	font-size: 140%;
 }
 
-pre.tracy-dump {
+tracy-dump {
 	border: 1px solid silver;
-	padding: 1em;
-	margin: 1em 0;
 }
 
 a {
diff --git a/src/Tracy/BlueScreen/assets/bluescreen.js b/src/Tracy/BlueScreen/assets/bluescreen.js
index 7a1b5b68f..42985fad7 100644
--- a/src/Tracy/BlueScreen/assets/bluescreen.js
+++ b/src/Tracy/BlueScreen/assets/bluescreen.js
@@ -15,10 +15,11 @@ class BlueScreen
 		}
 
 		blueScreen.addEventListener('tracy-toggle', (e) => {
-			if (e.target.matches('#tracy-bs-toggle')) { // blue screen toggle
+	  		let target = e.composedPath()[0];
+			if (target.matches('#tracy-bs-toggle')) { // blue screen toggle
 				document.documentElement.classList.toggle('tracy-bs-visible', !e.detail.collapsed);
 
-			} else if (!e.target.matches('.tracy-dump *') && e.detail.originalEvent) { // panel toggle
+			} else if (!target.matches('.tracy-dump *') && e.detail.originalEvent) { // panel toggle
 				e.detail.relatedTarget.classList.toggle('tracy-panel-fadein', !e.detail.collapsed);
 			}
 		});
diff --git a/src/Tracy/Debugger/Debugger.php b/src/Tracy/Debugger/Debugger.php
index 22d516f56..1c2fec8cf 100644
--- a/src/Tracy/Debugger/Debugger.php
+++ b/src/Tracy/Debugger/Debugger.php
@@ -492,8 +492,10 @@ public static function dump(mixed $var, bool $return = false): mixed
 				: Helpers::capture(fn() => Dumper::dump($var, $options));
 
 		} elseif (!self::$productionMode) {
-			$html = Helpers::isHtmlMode();
-			echo $html ? '<tracy-div>' : '';
+			if ($html = Helpers::isHtmlMode()) {
+				Dumper::renderAssets();
+				echo '<tracy-dump>';
+			}
 			Dumper::dump($var, [
 				Dumper::DEPTH => self::$maxDepth,
 				Dumper::TRUNCATE => self::$maxLength,
@@ -502,7 +504,7 @@ public static function dump(mixed $var, bool $return = false): mixed
 				Dumper::THEME => self::$dumpTheme,
 				Dumper::KEYS_TO_HIDE => self::$keysToHide,
 			]);
-			echo $html ? '</tracy-div>' : '';
+			echo $html ? '</tracy-dump>' : '';
 		}
 
 		return $var;
diff --git a/src/Tracy/Dumper/Dumper.php b/src/Tracy/Dumper/Dumper.php
index 06bece26a..8c1cfb0ce 100644
--- a/src/Tracy/Dumper/Dumper.php
+++ b/src/Tracy/Dumper/Dumper.php
@@ -105,7 +105,6 @@ public static function dump(mixed $var, array $options = []): mixed
 
 		} elseif (Helpers::isHtmlMode()) {
 			$options[self::LOCATION] ??= true;
-			self::renderAssets();
 			echo self::toHtml($var, $options);
 
 		} else {
@@ -155,18 +154,18 @@ public static function renderAssets(): void
 
 		$sent = true;
 
+		echo '<template class=tracy-dump-template>';
 		$nonce = Helpers::getNonce();
 		$nonceAttr = $nonce ? ' nonce="' . Helpers::escapeHtml($nonce) . '"' : '';
 		$s = file_get_contents(__DIR__ . '/../assets/toggle.css')
 			. file_get_contents(__DIR__ . '/assets/dumper-light.css')
 			. file_get_contents(__DIR__ . '/assets/dumper-dark.css');
 		echo "<style{$nonceAttr}>", str_replace('</', '<\/', Helpers::minifyCss($s)), "</style>\n";
+		echo "</template>\n";
 
-		if (!Debugger::isEnabled()) {
-			$s = '(function(){' . file_get_contents(__DIR__ . '/../assets/toggle.js') . '})();'
-				. '(function(){' . file_get_contents(__DIR__ . '/../Dumper/assets/dumper.js') . '})();';
-			echo "<script{$nonceAttr}>", str_replace(['<!--', '</s'], ['<\!--', '<\/s'], Helpers::minifyJs($s)), "</script>\n";
-		}
+		$s = '(function(){' . file_get_contents(__DIR__ . '/../assets/toggle.js') . '})();'
+			. '(function(){' . file_get_contents(__DIR__ . '/../Dumper/assets/dumper.js') . '})();';
+		echo "<script{$nonceAttr}>", str_replace(['<!--', '</s'], ['<\!--', '<\/s'], Helpers::minifyJs($s)), "</script>\n";
 	}
 
 
diff --git a/src/Tracy/Dumper/assets/dumper-dark.css b/src/Tracy/Dumper/assets/dumper-dark.css
index 349159e71..9ac171590 100644
--- a/src/Tracy/Dumper/assets/dumper-dark.css
+++ b/src/Tracy/Dumper/assets/dumper-dark.css
@@ -2,13 +2,18 @@
  * This file is part of the Tracy (https://tracy.nette.org)
  */
 
+:host {
+	display: block;
+	margin: 1em 0;
+	border-radius: 4px;
+}
+
 .tracy-dump.tracy-dark {
 	text-align: left;
 	color: #f8f8f2;
 	background: #29292e;
-	border-radius: 4px;
+	margin: 0;
 	padding: 1em;
-	margin: 1em 0;
 	word-break: break-all;
 	white-space: pre-wrap;
 }
diff --git a/src/Tracy/Dumper/assets/dumper-light.css b/src/Tracy/Dumper/assets/dumper-light.css
index 963dfb8c4..e96501625 100644
--- a/src/Tracy/Dumper/assets/dumper-light.css
+++ b/src/Tracy/Dumper/assets/dumper-light.css
@@ -2,13 +2,18 @@
  * This file is part of the Tracy (https://tracy.nette.org)
  */
 
+:host {
+	display: block;
+	margin: 1em 0;
+	border-radius: 4px;
+}
+
 .tracy-dump.tracy-light {
 	text-align: left;
 	color: #444;
 	background: #fdf9e2;
-	border-radius: 4px;
+	margin: 0;
 	padding: 1em;
-	margin: 1em 0;
 	word-break: break-all;
 	white-space: pre-wrap;
 }
diff --git a/src/Tracy/Dumper/assets/dumper.js b/src/Tracy/Dumper/assets/dumper.js
index 9ee7246ca..d25d676e9 100644
--- a/src/Tracy/Dumper/assets/dumper.js
+++ b/src/Tracy/Dumper/assets/dumper.js
@@ -48,8 +48,9 @@ class Dumper
 
 		document.documentElement.addEventListener('click', (e) => {
 			let el;
+	  		let target = e.composedPath()[0];
 			// enables <span data-tracy-href=""> & ctrl key
-			if (e.ctrlKey && (el = e.target.closest('[data-tracy-href]'))) {
+			if (e.ctrlKey && (el = target.closest('[data-tracy-href]'))) {
 				location.href = el.getAttribute('data-tracy-href');
 				return false;
 			}
@@ -59,7 +60,7 @@ class Dumper
 		document.documentElement.addEventListener('tracy-beforetoggle', (e) => {
 			let el;
 			// initializes lazy <span data-tracy-dump> inside <pre data-tracy-snapshot>
-			if ((el = e.target.closest('[data-tracy-snapshot]'))) {
+			if ((el = target.closest('[data-tracy-snapshot]'))) {
 				let snapshot = JSON.parse(el.getAttribute('data-tracy-snapshot'));
 				el.removeAttribute('data-tracy-snapshot');
 				el.querySelectorAll('[data-tracy-dump]').forEach((toggler) => {
@@ -73,7 +74,8 @@ class Dumper
 		});
 
 		document.documentElement.addEventListener('tracy-toggle', (e) => {
-			if (!e.target.matches('.tracy-dump *')) {
+	  		let target = e.composedPath()[0];
+			if (!target.matches('.tracy-dump *')) {
 				return;
 			}
 
@@ -86,12 +88,12 @@ class Dumper
 
 			} else if (origE && origE.altKey && cont.querySelector('.tracy-toggle')) { // triggered by alt key
 				if (e.detail.collapsed) { // reopen
-					e.target.classList.toggle('tracy-collapsed', false);
+					target.classList.toggle('tracy-collapsed', false);
 					cont.classList.toggle('tracy-collapsed', false);
 					e.detail.collapsed = false;
 				}
 
-				let expand = e.target.tracyAltExpand = !e.target.tracyAltExpand;
+				let expand = target.tracyAltExpand = !target.tracyAltExpand;
 				toggleChildren(cont, expand ? {} : false);
 			}
 
@@ -100,33 +102,36 @@ class Dumper
 
 		document.documentElement.addEventListener('animationend', (e) => {
 			if (e.animationName === 'tracy-dump-flash') {
-				e.target.classList.toggle('tracy-dump-flash', false);
+		  		let target = e.composedPath()[0];
+				target.classList.toggle('tracy-dump-flash', false);
 			}
 		});
 
 		document.addEventListener('mouseover', (e) => {
-			if (!e.target.matches('.tracy-dump *')) {
+	  		let target = e.composedPath()[0];
+			if (!target.matches('.tracy-dump *')) {
 				return;
 			}
 
 			let el;
 
-			if (e.target.matches('.tracy-dump-hash') && (el = e.target.closest('tracy-div'))) {
+			if (target.matches('.tracy-dump-hash') && (el = target.closest('tracy-div'))) {
 				el.querySelectorAll('.tracy-dump-hash').forEach((el) => {
-					if (el.textContent === e.target.textContent) {
+					if (el.textContent === target.textContent) {
 						el.classList.add('tracy-dump-highlight');
 					}
 				});
 				return;
 			}
 
-			if ((el = e.target.closest('.tracy-toggle')) && !el.title) {
+			if ((el = target.closest('.tracy-toggle')) && !el.title) {
 				el.title = HINT_ALT;
 			}
 		});
 
 		document.addEventListener('mouseout', (e) => {
-			if (e.target.matches('.tracy-dump-hash')) {
+	  		let target = e.composedPath()[0];
+			if (target.matches('.tracy-dump-hash')) {
 				document.querySelectorAll('.tracy-dump-hash.tracy-dump-highlight').forEach((el) => {
 					el.classList.remove('tracy-dump-highlight');
 				});
@@ -379,6 +384,26 @@ function toggleChildren(cont, usedIds) {
 function UnknownEntityException() {}
 
 
+class TracyDumpElement extends HTMLElement {
+	constructor() {
+		super();
+		let templateContent = document.querySelector('.tracy-dump-template').content;
+		this.attachShadow({mode: 'open'});
+		this.shadowRoot.appendChild(templateContent.cloneNode(true));
+	}
+
+	connectedCallback() {
+		setTimeout(() => {
+			while (this.firstElementChild) {
+				this.shadowRoot.appendChild(this.firstElementChild);
+			}
+		});
+	}
+}
+
+window.customElements.define('tracy-dump', TracyDumpElement);
+
+
 let Tracy = window.Tracy = window.Tracy || {};
 Tracy.Dumper = Tracy.Dumper || Dumper;
 
diff --git a/src/Tracy/assets/table-sort.js b/src/Tracy/assets/table-sort.js
index 3a6ac2697..7ccff503b 100644
--- a/src/Tracy/assets/table-sort.js
+++ b/src/Tracy/assets/table-sort.js
@@ -7,8 +7,9 @@ class TableSort
 {
 	static init() {
 		document.documentElement.addEventListener('click', (e) => {
-			if (e.target.matches('.tracy-sortable > :first-child > tr:first-child *')) {
-				TableSort.sort(e.target.closest('td,th'));
+	  		let target = e.composedPath()[0];
+			if (target.matches('.tracy-sortable > :first-child > tr:first-child *')) {
+				TableSort.sort(target.closest('td,th'));
 			}
 		});
 
diff --git a/src/Tracy/assets/tabs.js b/src/Tracy/assets/tabs.js
index 9e0a55a60..adffbaa60 100644
--- a/src/Tracy/assets/tabs.js
+++ b/src/Tracy/assets/tabs.js
@@ -8,10 +8,11 @@ class Tabs
 	static init() {
 		document.documentElement.addEventListener('click', (e) => {
 			let label, context;
+	  		let target = e.composedPath()[0];
 			if (
 				!e.shiftKey && !e.ctrlKey && !e.metaKey
-				&& (label = e.target.closest('.tracy-tab-label'))
-				&& (context = e.target.closest('.tracy-tabs'))
+				&& (label = target.closest('.tracy-tab-label'))
+				&& (context = target.closest('.tracy-tabs'))
 			) {
 				Tabs.toggle(context, label);
 				e.preventDefault();
diff --git a/src/Tracy/assets/toggle.js b/src/Tracy/assets/toggle.js
index 718aa7567..ac8f3ae88 100644
--- a/src/Tracy/assets/toggle.js
+++ b/src/Tracy/assets/toggle.js
@@ -14,10 +14,10 @@ class Toggle
 		});
 
 		document.documentElement.addEventListener('click', (e) => {
-			let el;
+	  		let target = e.composedPath()[0];
+			let el = target.closest('.tracy-toggle');
 			if (
-				!e.shiftKey && !e.ctrlKey && !e.metaKey
-				&& (el = e.target.closest('.tracy-toggle'))
+				el && !e.shiftKey && !e.ctrlKey && !e.metaKey
 				&& Math.pow(start[0] - e.clientX, 2) + Math.pow(start[1] - e.clientY, 2) < MOVE_THRESHOLD
 			) {
 				Toggle.toggle(el, undefined, e);
@@ -69,8 +69,9 @@ class Toggle
 	static persist(baseEl, restore) {
 		let saved = [];
 		baseEl.addEventListener('tracy-toggle', (e) => {
-			if (saved.indexOf(e.target) < 0) {
-				saved.push(e.target);
+	  		let target = e.composedPath()[0];
+			if (saved.indexOf(target) < 0) {
+				saved.push(target);
 			}
 		});
 

From 93c74fc33546fc212a0a54bffce5da1cf33b5694 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Wed, 1 Jun 2022 02:38:37 +0200
Subject: [PATCH 27/30] shadow dom for bar [WIP]

---
 src/Tracy/Bar/assets/bar.css |  81 ++++-----
 src/Tracy/Bar/assets/bar.js  |  38 ++--
 src/Tracy/assets/reset.css   | 339 ++++++++---------------------------
 3 files changed, 136 insertions(+), 322 deletions(-)

diff --git a/src/Tracy/Bar/assets/bar.css b/src/Tracy/Bar/assets/bar.css
index 80cf43af0..70c2f70e5 100644
--- a/src/Tracy/Bar/assets/bar.css
+++ b/src/Tracy/Bar/assets/bar.css
@@ -12,63 +12,64 @@ body#tracy-debug { /* in popup window */
 	display: block;
 }
 
-#tracy-debug:not(body) {
+:host {
 	position: absolute;
 	left: 0;
 	top: 0;
+	margin: 0;
 }
 
-#tracy-debug a {
+a {
 	color: #125EAE;
 	text-decoration: none;
 }
 
-#tracy-debug a:hover,
-#tracy-debug a:focus {
+a:hover,
+a:focus {
 	background-color: #125EAE;
 	color: white;
 }
 
-#tracy-debug h2,
-#tracy-debug h3,
-#tracy-debug p {
+h2,
+h3,
+p {
 	margin: .4em 0;
 }
 
-#tracy-debug table {
+table {
 	background: #FDF5CE;
 	width: 100%;
 }
 
-#tracy-debug tr:nth-child(2n) td {
+tr:nth-child(2n) td {
 	background: rgba(0, 0, 0, 0.02);
 }
 
-#tracy-debug td,
-#tracy-debug th {
+td,
+th {
 	border: 1px solid #E6DFBF;
 	padding: 2px 5px;
 	vertical-align: top;
 	text-align: left;
 }
 
-#tracy-debug th {
+th {
 	background: #F4F3F1;
 	color: #655E5E;
 	font-size: 90%;
 	font-weight: bold;
 }
 
-#tracy-debug pre,
-#tracy-debug code {
+pre,
+code {
 	font: 9pt/1.5 Consolas, monospace;
 }
 
-#tracy-debug table .tracy-right {
+table .tracy-right {
 	text-align: right;
 }
 
-#tracy-debug svg {
+svg {
 	display: inline;
 }
 
@@ -168,7 +169,7 @@ body#tracy-debug { /* in popup window */
 
 
 /* panels */
-#tracy-debug .tracy-panel {
+.tracy-panel {
 	display: none;
 	font: normal normal 12px/1.5 sans-serif;
 	background: white;
@@ -176,11 +177,11 @@ body#tracy-debug { /* in popup window */
 	text-align: left;
 }
 
-body#tracy-debug .tracy-panel { /* in popup window */
+body.tracy-panel { /* in popup window */
 	display: block;
 }
 
-#tracy-debug h1 {
+h1 {
 	font: normal normal 23px/1.4 Tahoma, sans-serif;
 	color: #575753;
 	margin: -5px -5px 5px;
@@ -188,29 +189,29 @@ body#tracy-debug .tracy-panel { /* in popup window */
 	word-wrap: break-word;
 }
 
-#tracy-debug .tracy-inner {
+.tracy-inner {
 	overflow: auto;
 	flex: 1;
 }
 
-#tracy-debug .tracy-panel .tracy-icons {
+.tracy-panel .tracy-icons {
 	display: none;
 }
 
-#tracy-debug .tracy-panel-ajax h1::after,
-#tracy-debug .tracy-panel-redirect h1::after {
+.tracy-panel-ajax h1::after,
+.tracy-panel-redirect h1::after {
 	content: 'ajax';
 	float: right;
 	font-size: 65%;
 	margin: 0 .3em;
 }
 
-#tracy-debug .tracy-panel-redirect h1::after {
+.tracy-panel-redirect h1::after {
 	content: 'redirect';
 }
 
-#tracy-debug .tracy-mode-peek,
-#tracy-debug .tracy-mode-float {
+.tracy-mode-peek,
+.tracy-mode-float {
 	position: fixed;
 	flex-direction: column;
 	padding: 10px;
@@ -221,24 +222,24 @@ body#tracy-debug .tracy-panel { /* in popup window */
 	border: 1px solid rgba(0, 0, 0, 0.1);
 }
 
-#tracy-debug .tracy-mode-peek,
-#tracy-debug .tracy-mode-float:not(.tracy-panel-resized) {
+.tracy-mode-peek,
+.tracy-mode-float:not(.tracy-panel-resized) {
 	max-width: 700px;
 	max-height: 500px;
 }
 
 @media (max-height: 555px) {
-	#tracy-debug .tracy-mode-peek,
-	#tracy-debug .tracy-mode-float:not(.tracy-panel-resized) {
+	.tracy-mode-peek,
+	.tracy-mode-float:not(.tracy-panel-resized) {
 		max-height: 100vh;
 	}
 }
 
-#tracy-debug .tracy-mode-peek h1 {
+.tracy-mode-peek h1 {
 	cursor: move;
 }
 
-#tracy-debug .tracy-mode-float {
+.tracy-mode-float {
 	display: flex;
 	opacity: .95;
 	transition: opacity 0.2s;
@@ -247,18 +248,18 @@ body#tracy-debug .tracy-panel { /* in popup window */
 	resize: both;
 }
 
-#tracy-debug .tracy-focused {
+.tracy-focused {
 	display: flex;
 	opacity: 1;
 	transition: opacity 0.1s;
 }
 
-#tracy-debug .tracy-mode-float h1 {
+.tracy-mode-float h1 {
 	cursor: move;
 	padding-right: 25px;
 }
 
-#tracy-debug .tracy-mode-float .tracy-icons {
+.tracy-mode-float .tracy-icons {
 	display: block;
 	position: absolute;
 	top: 0;
@@ -266,26 +267,26 @@ body#tracy-debug .tracy-panel { /* in popup window */
 	font-size: 18px;
 }
 
-#tracy-debug .tracy-mode-window {
+.tracy-mode-window {
 	padding: 10px;
 }
 
-#tracy-debug .tracy-icons a {
+.tracy-icons a {
 	color: #575753;
 }
 
-#tracy-debug .tracy-icons a:hover {
+.tracy-icons a:hover {
 	color: white;
 }
 
 
-#tracy-debug .tracy-inner-container {
+.tracy-inner-container {
 	min-width: 100%;
 	float: left;
 }
 
 @media print {
-	#tracy-debug * {
+	* {
 		display: none;
 	}
 }
diff --git a/src/Tracy/Bar/assets/bar.js b/src/Tracy/Bar/assets/bar.js
index c37a48809..b11c2fa14 100644
--- a/src/Tracy/Bar/assets/bar.js
+++ b/src/Tracy/Bar/assets/bar.js
@@ -4,7 +4,8 @@
 
 let requestId = document.currentScript.dataset.id,
 	ajaxCounter = 1,
-	baseUrl = location.href.split('#')[0];
+	baseUrl = location.href.split('#')[0],
+	root;
 
 baseUrl += (baseUrl.indexOf('?') < 0 ? '?' : '&');
 
@@ -24,7 +25,7 @@ class Panel
 {
 	constructor(id) {
 		this.id = id;
-		this.elem = document.getElementById(this.id);
+		this.elem = root.getElementById(this.id);
 		this.elem.Tracy = this.elem.Tracy || {};
 	}
 
@@ -34,7 +35,7 @@ class Panel
 
 		this.init = function() {};
 		elem.innerHTML = elem.dataset.tracyContent;
-		Tracy.Dumper.init(Debug.layer);
+		Tracy.Dumper.init(root);
 		evalScripts(elem);
 
 		draggable(elem, {
@@ -248,7 +249,7 @@ class Bar
 {
 	init() {
 		this.id = 'tracy-debug-bar';
-		this.elem = document.getElementById(this.id);
+		this.elem = root.getElementById(this.id);
 
 		draggable(this.elem, {
 			handles: this.elem.querySelectorAll('li:first-child'),
@@ -352,7 +353,7 @@ class Bar
 
 
 	close() {
-		document.getElementById('tracy-debug').style.display = 'none';
+		root.getElementById('tracy-debug').style.display = 'none';
 	}
 
 
@@ -392,15 +393,16 @@ class Debug
 	static init(content) {
 		Debug.bar = new Bar;
 		Debug.panels = {};
-		Debug.layer = document.createElement('tracy-div');
-		Debug.layer.setAttribute('id', 'tracy-debug');
-		Debug.layer.innerHTML = content;
+		Debug.layer = document.createElement('tracy-debug');
+		root = Debug.layer.shadowRoot;
+		root.innerHTML = content;
+		root.appendChild(document.querySelector('style.tracy-debug'));
 		(document.body || document.documentElement).appendChild(Debug.layer);
-		evalScripts(Debug.layer);
+		evalScripts(root);
 		Debug.layer.style.display = 'block';
 		Debug.bar.init();
 
-		Debug.layer.querySelectorAll('.tracy-panel').forEach((panel) => {
+		root.querySelectorAll('.tracy-panel').forEach((panel) => {
 			Debug.panels[panel.id] = new Panel(panel.id);
 			Debug.panels[panel.id].restorePosition();
 		});
@@ -437,12 +439,12 @@ class Debug
 			});
 		}
 
-		Debug.layer.insertAdjacentHTML('beforeend', content.panels);
-		evalScripts(Debug.layer);
+		root.insertAdjacentHTML('beforeend', content.panels);
+		evalScripts(root);
 		Debug.bar.elem.insertAdjacentHTML('beforeend', content.bar);
 		let ajaxBar = Debug.bar.elem.querySelector('.tracy-row:last-child');
 
-		Debug.layer.querySelectorAll('.tracy-panel').forEach((panel) => {
+		root.querySelectorAll('.tracy-panel').forEach((panel) => {
 			if (!Debug.panels[panel.id]) {
 				Debug.panels[panel.id] = new Panel(panel.id);
 				Debug.panels[panel.id].restorePosition();
@@ -675,6 +677,16 @@ function getPosition(elem) {
 }
 
 
+class TracyDebugElement extends HTMLElement {
+	constructor() {
+		super();
+		this.attachShadow({mode: 'open'});
+	}
+}
+
+window.customElements.define('tracy-debug', TracyDebugElement);
+
+
 let Tracy = window.Tracy = window.Tracy || {};
 Tracy.DebugPanel = Panel;
 Tracy.DebugBar = Bar;
diff --git a/src/Tracy/assets/reset.css b/src/Tracy/assets/reset.css
index e333f841e..c34442a2c 100644
--- a/src/Tracy/assets/reset.css
+++ b/src/Tracy/assets/reset.css
@@ -2,8 +2,7 @@
  * This file is part of the Tracy (https://tracy.nette.org)
  */
 
-tracy-div:not(a b),
-tracy-div:not(a b) * {
+* {
 	font: inherit;
 	line-height: inherit;
 	color: inherit;
@@ -23,354 +22,156 @@ tracy-div:not(a b) * {
 	white-space: inherit;
 	float: none;
 	clear: none;
-	max-width: initial;
-	min-width: initial;
-	max-height: initial;
-	min-height: initial;
 }
 
-tracy-div:not(a b) *:hover {
+*:hover {
 	color: inherit;
 	background: transparent;
 }
 
-tracy-div:not(a b) *:not(svg):not(img):not(table) {
-	width: initial;
-	height: initial;
-}
-
-tracy-div:not(a b):before,
-tracy-div:not(a b):after,
-tracy-div:not(a b) *:before,
-tracy-div:not(a b) *:after {
-	all: unset;
-}
-
-tracy-div:not(a b) b,
-tracy-div:not(a b) strong {
+b,
+strong {
 	font-weight: bold;
 }
 
-tracy-div:not(a b) small {
+small {
 	font-size: smaller;
 }
 
-tracy-div:not(a b) i,
-tracy-div:not(a b) em {
+i,
+em {
 	font-style: italic;
 }
 
-tracy-div:not(a b) big {
+big {
 	font-size: larger;
 }
 
-tracy-div:not(a b) small,
-tracy-div:not(a b) sub,
-tracy-div:not(a b) sup {
+small,
+sub,
+sup {
 	font-size: smaller;
 }
 
-tracy-div:not(a b) ins {
+ins {
 	text-decoration: underline;
 }
 
-tracy-div:not(a b) del {
+del {
 	text-decoration: line-through;
 }
 
-tracy-div:not(a b) table {
+table {
 	border-collapse: collapse;
 }
 
-tracy-div:not(a b) pre {
+pre {
 	font-family: monospace;
 	white-space: pre;
 }
 
-tracy-div:not(a b) code,
-tracy-div:not(a b) kbd,
-tracy-div:not(a b) samp {
+code,
+kbd,
+samp {
 	font-family: monospace;
 }
 
-tracy-div:not(a b) input {
+input {
 	background-color: white;
 	padding: 1px;
 	border: 1px solid;
 }
 
-tracy-div:not(a b) textarea {
+textarea {
 	background-color: white;
 	border: 1px solid;
 	padding: 2px;
 	white-space: pre-wrap;
 }
 
-tracy-div:not(a b) select {
+select {
 	border: 1px solid;
 	white-space: pre;
 }
 
-tracy-div:not(a b) article,
-tracy-div:not(a b) aside,
-tracy-div:not(a b) details,
-tracy-div:not(a b) div,
-tracy-div:not(a b) figcaption,
-tracy-div:not(a b) footer,
-tracy-div:not(a b) form,
-tracy-div:not(a b) header,
-tracy-div:not(a b) hgroup,
-tracy-div:not(a b) main,
-tracy-div:not(a b) nav,
-tracy-div:not(a b) section,
-tracy-div:not(a b) summary,
-tracy-div:not(a b) pre,
-tracy-div:not(a b) p,
-tracy-div:not(a b) dl,
-tracy-div:not(a b) dd,
-tracy-div:not(a b) dt,
-tracy-div:not(a b) blockquote,
-tracy-div:not(a b) figure,
-tracy-div:not(a b) address,
-tracy-div:not(a b) h1,
-tracy-div:not(a b) h2,
-tracy-div:not(a b) h3,
-tracy-div:not(a b) h4,
-tracy-div:not(a b) h5,
-tracy-div:not(a b) h6,
-tracy-div:not(a b) ul,
-tracy-div:not(a b) ol,
-tracy-div:not(a b) li,
-tracy-div:not(a b) hr {
+article,
+aside,
+details,
+div,
+figcaption,
+footer,
+form,
+header,
+hgroup,
+main,
+nav,
+section,
+summary,
+pre,
+p,
+dl,
+dd,
+dt,
+blockquote,
+figure,
+address,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+ul,
+ol,
+li,
+hr {
 	display: block;
 }
 
-tracy-div:not(a b) a,
-tracy-div:not(a b) b,
-tracy-div:not(a b) big,
-tracy-div:not(a b) code,
-tracy-div:not(a b) em,
-tracy-div:not(a b) i,
-tracy-div:not(a b) small,
-tracy-div:not(a b) span,
-tracy-div:not(a b) strong {
+a,
+b,
+big,
+code,
+em,
+i,
+small,
+span,
+strong {
 	display: inline;
 }
 
-tracy-div:not(a b) table {
+table {
 	display: table;
 }
 
-tracy-div:not(a b) tr {
+tr {
 	display: table-row;
 }
 
-tracy-div:not(a b) col {
+col {
 	display: table-column;
 }
 
-tracy-div:not(a b) colgroup {
+colgroup {
 	display: table-column-group;
 }
 
-tracy-div:not(a b) tbody {
+tbody {
 	display: table-row-group;
 }
 
-tracy-div:not(a b) thead {
+thead {
 	display: table-header-group;
 }
 
-tracy-div:not(a b) tfoot {
+tfoot {
 	display: table-footer-group;
 }
 
-tracy-div:not(a b) td {
+td {
 	display: table-cell;
 }
 
-tracy-div:not(a b) th {
+th {
 	display: table-cell;
 }
-
-
-
-/* TableSort */
-tracy-div:not(a b) .tracy-sortable > :first-child > tr:first-child > * {
-	position: relative;
-}
-
-tracy-div:not(a b) .tracy-sortable > :first-child > tr:first-child > *:hover:before {
-	position: absolute;
-	right: .3em;
-	content: "\21C5";
-	opacity: .4;
-	font-weight: normal;
-}
-
-
-/* dump */
-tracy-div:not(a b) .tracy-dump div {
-	padding-left: 3ex;
-}
-
-tracy-div:not(a b) .tracy-dump div div {
-	border-left: 1px solid rgba(0, 0, 0, .1);
-	margin-left: .5ex;
-}
-
-tracy-div:not(a b) .tracy-dump div div:hover {
-	border-left-color: rgba(0, 0, 0, .25);
-}
-
-tracy-div:not(a b) .tracy-dump {
-	background: #FDF5CE;
-	padding: .4em .7em;
-	border: 1px dotted silver;
-	overflow: auto;
-}
-
-tracy-div:not(a b) table .tracy-dump.tracy-dump { /* overwrite .tracy-dump.tracy-light etc. */
-	padding: 0;
-	margin: 0;
-	border: none;
-}
-
-tracy-div:not(a b) .tracy-dump-location {
-	color: gray;
-	font-size: 80%;
-	text-decoration: none;
-	background: none;
-	opacity: .5;
-	float: right;
-	cursor: pointer;
-}
-
-tracy-div:not(a b) .tracy-dump-location:hover,
-tracy-div:not(a b) .tracy-dump-location:focus {
-	color: gray;
-	background: none;
-	opacity: 1;
-}
-
-tracy-div:not(a b) .tracy-dump-array,
-tracy-div:not(a b) .tracy-dump-object {
-	color: #C22;
-}
-
-tracy-div:not(a b) .tracy-dump-string {
-	color: #35D;
-	white-space: break-spaces;
-}
-
-tracy-div:not(a b) div.tracy-dump-string {
-	position: relative;
-	padding-left: 3.5ex;
-}
-
-tracy-div:not(a b) .tracy-dump-lq {
-	margin-left: calc(-1ex - 1px);
-}
-
-tracy-div:not(a b) div.tracy-dump-string:before {
-	content: '';
-	position: absolute;
-	left: calc(3ex - 1px);
-	top: 1.5em;
-	bottom: 0;
-	border-left: 1px solid rgba(0, 0, 0, .1);
-}
-
-tracy-div:not(a b) .tracy-dump-virtual span,
-tracy-div:not(a b) .tracy-dump-dynamic span,
-tracy-div:not(a b) .tracy-dump-string span {
-	color: rgba(0, 0, 0, 0.5);
-}
-
-tracy-div:not(a b) .tracy-dump-virtual i,
-tracy-div:not(a b) .tracy-dump-dynamic i,
-tracy-div:not(a b) .tracy-dump-string i {
-	font-size: 80%;
-	font-style: normal;
-	color: rgba(0, 0, 0, 0.5);
-	user-select: none;
-}
-
-tracy-div:not(a b) .tracy-dump-number {
-	color: #090;
-}
-
-tracy-div:not(a b) .tracy-dump-null,
-tracy-div:not(a b) .tracy-dump-bool {
-	color: #850;
-}
-
-tracy-div:not(a b) .tracy-dump-virtual {
-	font-style: italic;
-}
-
-tracy-div:not(a b) .tracy-dump-public::after {
-	content: ' pub';
-}
-
-tracy-div:not(a b) .tracy-dump-protected::after {
-	content: ' pro';
-}
-
-tracy-div:not(a b) .tracy-dump-private::after {
-	content: ' pri';
-}
-
-tracy-div:not(a b) .tracy-dump-public::after,
-tracy-div:not(a b) .tracy-dump-protected::after,
-tracy-div:not(a b) .tracy-dump-private::after,
-tracy-div:not(a b) .tracy-dump-hash {
-	font-size: 85%;
-	color: rgba(0, 0, 0, 0.5);
-}
-
-tracy-div:not(a b) .tracy-dump-indent {
-	display: none;
-}
-
-tracy-div:not(a b) .tracy-dump-highlight {
-	background: #C22;
-	color: white;
-	border-radius: 2px;
-	padding: 0 2px;
-	margin: 0 -2px;
-}
-
-tracy-div:not(a b) span[data-tracy-href] {
-	border-bottom: 1px dotted rgba(0, 0, 0, .2);
-}
-
-
-/* toggle */
-tracy-div:not(a b) .tracy-toggle:after {
-	content: '';
-	display: inline-block;
-	vertical-align: middle;
-	line-height: 0;
-	border-top: .6ex solid;
-	border-right: .6ex solid transparent;
-	border-left: .6ex solid transparent;
-	transform: scale(1, 1.5);
-	margin: 0 .2ex 0 .7ex;
-	transition: .1s transform;
-	opacity: .5;
-}
-
-tracy-div:not(a b) .tracy-toggle.tracy-collapsed:after {
-	transform: rotate(-90deg) scale(1, 1.5) translate(.1ex, 0);
-}
-
-
-/* tabs */
-tracy-div:not(a b) .tracy-tab-label {
-	user-select: none;
-}
-
-tracy-div:not(a b) .tracy-tab-panel:not(.tracy-active) {
-	display: none;
-}

From f2464fdd4d4f81c89cc4d62e8538dd3c697fe72e Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Fri, 18 Nov 2022 03:55:40 +0100
Subject: [PATCH 28/30] shadow dom for bluescreen [WIP]

---
 src/Tracy/BlueScreen/assets/bluescreen.css | 150 ++++++++++-----------
 src/Tracy/BlueScreen/assets/bluescreen.js  |   3 +-
 src/Tracy/BlueScreen/assets/content.phtml  |   8 +-
 src/Tracy/BlueScreen/assets/page.phtml     |  22 ++-
 4 files changed, 102 insertions(+), 81 deletions(-)

diff --git a/src/Tracy/BlueScreen/assets/bluescreen.css b/src/Tracy/BlueScreen/assets/bluescreen.css
index 7e007625f..8dd5f6a96 100644
--- a/src/Tracy/BlueScreen/assets/bluescreen.css
+++ b/src/Tracy/BlueScreen/assets/bluescreen.css
@@ -2,7 +2,7 @@
  * This file is part of the Tracy (https://tracy.nette.org)
  */
 
-:root {
+:host {
 	--tracy-space: 16px;
 }
 
@@ -18,7 +18,7 @@ html.tracy-bs-visible body {
 	overflow: auto;
 }
 
-#tracy-bs {
+:host {
 	font: 9pt/1.5 Verdana, sans-serif;
 	background: white;
 	color: #333;
@@ -30,19 +30,19 @@ html.tracy-bs-visible body {
 	text-align: left;
 }
 
-#tracy-bs a {
+a {
 	text-decoration: none;
 	color: #328ADC;
 	padding: 0 4px;
 	margin: 0 -4px;
 }
 
-#tracy-bs a + a {
+a + a {
 	margin-left: 0;
 }
 
-#tracy-bs a:hover,
-#tracy-bs a:focus {
+a:hover,
+a:focus {
 	color: #085AA3;
 }
 
@@ -70,44 +70,44 @@ html.tracy-bs-visible body {
 	display: none;
 }
 
-#tracy-bs p,
-#tracy-bs table,
-#tracy-bs pre,
-#tracy-bs h1,
-#tracy-bs h2,
-#tracy-bs h3 {
+p,
+table,
+pre,
+h1,
+h2,
+h3 {
 	margin: 0 0 var(--tracy-space);
 }
 
-#tracy-bs h1 {
+h1 {
 	font-size: 15pt;
 	font-weight: normal;
 	text-shadow: 1px 1px 2px rgba(0, 0, 0, .3);
 }
 
-#tracy-bs h1 span {
+h1 span {
 	white-space: pre-wrap;
 }
 
-#tracy-bs h2 {
+h2 {
 	font-size: 14pt;
 	font-weight: normal;
 	margin-top: var(--tracy-space);
 }
 
-#tracy-bs h3 {
+h3 {
 	font-size: 10pt;
 	font-weight: bold;
 }
 
-#tracy-bs pre,
-#tracy-bs code,
-#tracy-bs table {
+pre,
+code,
+table {
 	font: 9pt/1.5 Consolas, monospace !important;
 }
 
-#tracy-bs pre,
-#tracy-bs table {
+pre,
+table {
 	background: #FDF5CE;
 	padding: .4em .7em;
 	border: 2px solid #ffffffa6;
@@ -115,46 +115,46 @@ html.tracy-bs-visible body {
 	overflow: auto;
 }
 
-#tracy-bs table pre {
+table pre {
 	padding: 0;
 	margin: 0;
 	border: none;
 	box-shadow: none;
 }
 
-#tracy-bs table {
+table {
 	border-collapse: collapse;
 	width: 100%;
 }
 
-#tracy-bs td,
-#tracy-bs th {
+td,
+th {
 	vertical-align: top;
 	text-align: left;
 	padding: 2px 6px;
 	border: 1px solid #e6dfbf;
 }
 
-#tracy-bs th {
+th {
 	font-weight: bold;
 }
 
-#tracy-bs tr > :first-child {
+tr > :first-child {
 	width: 20%;
 }
 
-#tracy-bs tr:nth-child(2n),
-#tracy-bs tr:nth-child(2n) pre {
+tr:nth-child(2n),
+tr:nth-child(2n) pre {
 	background-color: #F7F0CB;
 }
 
-#tracy-bs .tracy-footer--sticky {
+.tracy-footer--sticky {
 	position: fixed;
 	width: 100%;
 	bottom: 0;
 }
 
-#tracy-bs footer ul {
+footer ul {
 	font-size: 7pt;
 	padding: var(--tracy-space);
 	margin: var(--tracy-space) 0 0;
@@ -164,11 +164,11 @@ html.tracy-bs-visible body {
 	list-style: none;
 }
 
-#tracy-bs .tracy-footer-logo {
+.tracy-footer-logo {
 	position: relative;
 }
 
-#tracy-bs .tracy-footer-logo a {
+.tracy-footer-logo a {
 	position: absolute;
 	bottom: 0;
 	right: 0;
@@ -180,19 +180,19 @@ html.tracy-bs-visible body {
 	margin: 0;
 }
 
-#tracy-bs .tracy-footer-logo a:hover,
-#tracy-bs .tracy-footer-logo a:focus {
+.tracy-footer-logo a:hover,
+.tracy-footer-logo a:focus {
 	opacity: 1;
 	transition: opacity 0.1s;
 }
 
 
-#tracy-bs .tracy-section {
+.tracy-section {
 	padding-left: calc(1.5 * var(--tracy-space));
 	padding-right: calc(1.5 * var(--tracy-space));
 }
 
-#tracy-bs .tracy-section-panel {
+.tracy-section-panel {
 	background: #F4F3F1;
 	padding: var(--tracy-space) var(--tracy-space) 0;
 	margin: 0 0 var(--tracy-space);
@@ -201,8 +201,8 @@ html.tracy-bs-visible body {
 	overflow: hidden;
 }
 
-#tracy-bs .outer, /* deprecated */
-#tracy-bs .tracy-pane {
+.outer, /* deprecated */
+.tracy-pane {
 	overflow: auto;
 }
 
@@ -212,62 +212,62 @@ html.tracy-bs-visible body {
 
 
 /* header */
-#tracy-bs .tracy-section--error {
+.tracy-section--error {
 	background: #CD1818;
 	color: white;
 	font-size: 13pt;
 	padding-top: var(--tracy-space);
 }
 
-#tracy-bs .tracy-section--error h1 {
+.tracy-section--error h1 {
 	color: white;
 }
 
-#tracy-bs .tracy-section--error::selection,
-#tracy-bs .tracy-section--error ::selection {
+.tracy-section--error::selection,
+.tracy-section--error ::selection {
 	color: black !important;
 	background: #FDF5CE !important;
 }
 
-#tracy-bs .tracy-section--error a {
+.tracy-section--error a {
 	color: #ffefa1 !important;
 }
 
-#tracy-bs .tracy-section--error span span {
+.tracy-section--error span span {
 	font-size: 80%;
 	color: rgba(255, 255, 255, 0.5);
 	text-shadow: none;
 }
 
-#tracy-bs .tracy-section--error a.tracy-action {
+.tracy-section--error a.tracy-action {
 	color: white !important;
 	opacity: 0;
 	font-size: .7em;
 	border-bottom: none !important;
 }
 
-#tracy-bs .tracy-section--error:hover a.tracy-action {
+.tracy-section--error:hover a.tracy-action {
 	opacity: .6;
 }
 
-#tracy-bs .tracy-section--error a.tracy-action:hover {
+.tracy-section--error a.tracy-action:hover {
 	opacity: 1;
 }
 
-#tracy-bs .tracy-section--error i {
+.tracy-section--error i {
 	color: #ffefa1;
 	font-style: normal;
 }
 
 
 /* source code */
-#tracy-bs pre.tracy-code > div {
+pre.tracy-code > div {
 	min-width: 100%;
 	float: left;
 	white-space: pre;
 }
 
-#tracy-bs .tracy-line-highlight {
+.tracy-line-highlight {
 	background: #CD1818;
 	color: white;
 	font-weight: bold;
@@ -277,38 +277,38 @@ html.tracy-bs-visible body {
 	margin: 0 -1ch;
 }
 
-#tracy-bs .tracy-column-highlight {
+.tracy-column-highlight {
 	display: inline-block;
 	backdrop-filter: grayscale(1);
 	margin: 0 -1px;
 	padding: 0 1px;
 }
 
-#tracy-bs .tracy-line {
+.tracy-line {
 	color: #9F9C7F;
 	font-weight: normal;
 	font-style: normal;
 }
 
-#tracy-bs a.tracy-editor {
+a.tracy-editor {
 	color: inherit;
 	border-bottom: 1px dotted rgba(0, 0, 0, .3);
 	border-radius: 3px;
 }
 
-#tracy-bs a.tracy-editor:hover {
+a.tracy-editor:hover {
 	background: #0001;
 }
 
-#tracy-bs span[data-tracy-href] {
+span[data-tracy-href] {
 	border-bottom: 1px dotted rgba(0, 0, 0, .3);
 }
 
-#tracy-bs .tracy-dump-whitespace {
+.tracy-dump-whitespace {
 	color: #0003;
 }
 
-#tracy-bs .tracy-caused {
+.tracy-caused {
 	float: right;
 	padding: .3em calc(1.5 * var(--tracy-space));
 	background: #df8075;
@@ -316,45 +316,45 @@ html.tracy-bs-visible body {
 	white-space: nowrap;
 }
 
-#tracy-bs .tracy-caused a {
+.tracy-caused a {
 	color: white;
 }
 
-#tracy-bs .tracy-callstack {
+.tracy-callstack {
 	display: grid;
 	grid-template-columns: max-content 1fr;
 	margin-bottom: calc(.5 * var(--tracy-space));
 }
 
-#tracy-bs .tracy-callstack-file {
+.tracy-callstack-file {
 	text-align: right;
 	padding-right: var(--tracy-space);
 	white-space: nowrap;
 	height: calc(1.5 * var(--tracy-space));
 }
 
-#tracy-bs .tracy-callstack-callee {
+.tracy-callstack-callee {
 	white-space: nowrap;
 	height: calc(1.5 * var(--tracy-space));
 }
 
-#tracy-bs .tracy-callstack-additional {
+.tracy-callstack-additional {
 	grid-column-start: 1;
 	grid-column-end: 3;
 }
 
-#tracy-bs .tracy-callstack-args tr:first-child > * {
+.tracy-callstack-args tr:first-child > * {
 	position: relative;
 }
 
-#tracy-bs .tracy-callstack-args tr:first-child td:before {
+.tracy-callstack-args tr:first-child td:before {
 	position: absolute;
 	right: .3em;
 	content: 'may not be true';
 	opacity: .4;
 }
 
-#tracy-bs .tracy-panel-fadein {
+.tracy-panel-fadein {
 	animation: tracy-panel-fadein .12s ease;
 }
 
@@ -364,26 +364,26 @@ html.tracy-bs-visible body {
 	}
 }
 
-#tracy-bs .tracy-section--causedby {
+.tracy-section--causedby {
 	flex-direction: column;
 	padding: 0;
 }
 
-#tracy-bs .tracy-section--causedby:not(.tracy-collapsed) {
+.tracy-section--causedby:not(.tracy-collapsed) {
 	display: flex;
 }
 
-#tracy-bs .tracy-section--causedby .tracy-section--error {
+.tracy-section--causedby .tracy-section--error {
 	background: #cd1818a6;
 }
 
-#tracy-bs .tracy-section--error + .tracy-section--stack {
+.tracy-section--error + .tracy-section--stack {
 	margin-top: calc(1.5 * var(--tracy-space));
 }
 
 
 /* tabs */
-#tracy-bs .tracy-tab-bar {
+.tracy-tab-bar {
 	display: flex;
 	list-style: none;
 	padding-left: 0;
@@ -392,11 +392,11 @@ html.tracy-bs-visible body {
 	font-size: 110%;
 }
 
-#tracy-bs .tracy-tab-bar > *:not(:first-child) {
+.tracy-tab-bar > *:not(:first-child) {
 	margin-left: var(--tracy-space);
 }
 
-#tracy-bs .tracy-tab-bar a {
+.tracy-tab-bar a {
 	display: block;
 	padding: calc(.5 * var(--tracy-space)) var(--tracy-space);
 	margin: 0;
@@ -407,11 +407,11 @@ html.tracy-bs-visible body {
 	transition: all 0.1s;
 }
 
-#tracy-bs .tracy-tab-bar > .tracy-active a {
+.tracy-tab-bar > .tracy-active a {
 	background: white;
 }
 
-#tracy-bs .tracy-tab-panel {
+.tracy-tab-panel {
 	border-top: 2px solid white;
 	padding-top: var(--tracy-space);
 	overflow: auto;
diff --git a/src/Tracy/BlueScreen/assets/bluescreen.js b/src/Tracy/BlueScreen/assets/bluescreen.js
index 42985fad7..cb4291bec 100644
--- a/src/Tracy/BlueScreen/assets/bluescreen.js
+++ b/src/Tracy/BlueScreen/assets/bluescreen.js
@@ -31,7 +31,7 @@ class BlueScreen
 			sessionStorage.setItem('tracy-toggles-bskey', id);
 		}
 
-		(new ResizeObserver(stickyFooter)).observe(blueScreen);
+		//(new ResizeObserver(stickyFooter)).observe(blueScreen);
 
 		if (document.documentElement.classList.contains('tracy-bs-visible')) {
 			window.scrollTo(0, 0);
@@ -76,3 +76,4 @@ function stickyFooter() {
 
 let Tracy = window.Tracy = window.Tracy || {};
 Tracy.BlueScreen = Tracy.BlueScreen || BlueScreen;
+
diff --git a/src/Tracy/BlueScreen/assets/content.phtml b/src/Tracy/BlueScreen/assets/content.phtml
index 107b6a0c4..f99948c5e 100644
--- a/src/Tracy/BlueScreen/assets/content.phtml
+++ b/src/Tracy/BlueScreen/assets/content.phtml
@@ -23,7 +23,11 @@ namespace Tracy;
  * @var \Fiber[] $fibers
  */
 ?>
-<tracy-div id="tracy-bs" itemscope>
+<tracy-bs id="tracy-bs" itemscope>
+	<style class="tracy-debug">
+	<?= str_replace('</', '<\/', $css) ?>
+	</style>
+
 	<a id="tracy-bs-toggle" href="#" class="tracy-toggle">&#xfeff;</a>
 	<div class="tracy-bs-main">
 <?php $ex = $exception; $exceptions = []; ?>
@@ -70,4 +74,4 @@ namespace Tracy;
 		</footer>
 	</div>
 	<meta itemprop=tracy-snapshot content=<?= Dumper::formatSnapshotAttribute($snapshot) ?>>
-</tracy-div>
+</tracy-bs>
diff --git a/src/Tracy/BlueScreen/assets/page.phtml b/src/Tracy/BlueScreen/assets/page.phtml
index 0dff01fbb..9fd7720b9 100644
--- a/src/Tracy/BlueScreen/assets/page.phtml
+++ b/src/Tracy/BlueScreen/assets/page.phtml
@@ -31,13 +31,29 @@ $chain = Helpers::getExceptionChain($exception);
 <?php endif ?>
 	<!-- <?= Helpers::escapeHtml($source) ?> -->
 
-	<style class="tracy-debug">
-	<?= str_replace('</', '<\/', $css) ?>
-	</style>
 </head>
 
 
 <body>
+<script>
+class TracyBsElement extends HTMLElement {
+	constructor() {
+		super();
+		this.attachShadow({mode: 'open'});
+	}
+
+	connectedCallback() {
+		setTimeout(() => {
+			while (this.firstElementChild) {
+				this.shadowRoot.appendChild(this.firstElementChild);
+			}
+		});
+	}
+}
+
+window.customElements.define('tracy-bs', TracyBsElement);
+</script>
+
 <?php require __DIR__ . '/content.phtml' ?>
 
 <script<?= $nonceAttr ?>>

From 1ac7a0ad39752b345652698f040b48529a98b8bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20Felix=20=C5=A0ulc?= <rkfelix@gmail.com>
Date: Wed, 8 Mar 2023 22:32:32 +0100
Subject: [PATCH 29/30] Logger: add StreamLogger

---
 src/Tracy/Logger/StreamLogger.php    | 66 ++++++++++++++++++++++++++++
 tests/Tracy/StreamLogger.log().phpt  | 21 +++++++++
 tests/Tracy/StreamLogger.stdout.phpt | 19 ++++++++
 3 files changed, 106 insertions(+)
 create mode 100644 src/Tracy/Logger/StreamLogger.php
 create mode 100644 tests/Tracy/StreamLogger.log().phpt
 create mode 100644 tests/Tracy/StreamLogger.stdout.phpt

diff --git a/src/Tracy/Logger/StreamLogger.php b/src/Tracy/Logger/StreamLogger.php
new file mode 100644
index 000000000..12ea99519
--- /dev/null
+++ b/src/Tracy/Logger/StreamLogger.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * This file is part of the Tracy (https://tracy.nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Tracy;
+
+
+class StreamLogger implements ILogger
+{
+
+	/** @var string path to a file where errors should be logged */
+	public string $path;
+
+
+	public function __construct(string $path)
+	{
+		$this->path = $path;
+	}
+
+
+	public function log(mixed $message, string $level = self::INFO)
+	{
+		$line = $this->formatLogLine($message);
+
+		if (!@file_put_contents($this->path, $line . PHP_EOL)) { // @ is escalated to exception
+			throw new \RuntimeException("Unable to write to log file '{$this->path}'. Is directory writable?");
+		}
+	}
+
+
+	public static function formatMessage(mixed $message): string
+	{
+		if ($message instanceof \Throwable) {
+			foreach (Helpers::getExceptionChain($message) as $exception) {
+				$tmp[] = ($exception instanceof \ErrorException
+						? Helpers::errorTypeToString($exception->getSeverity()) . ': ' . $exception->getMessage()
+						: get_debug_type($exception) . ': ' . $exception->getMessage() . ($exception->getCode() ? ' #' . $exception->getCode() : '')
+					) . ' in ' . $exception->getFile() . ':' . $exception->getLine();
+			}
+
+			$message = implode("\ncaused by ", $tmp);
+
+		} elseif (!is_string($message)) {
+			$message = Dumper::toText($message);
+		}
+
+		return trim($message);
+	}
+
+
+	public static function formatLogLine(mixed $message): string
+	{
+		return implode(' ', [
+			date('[Y-m-d H-i-s]'),
+			preg_replace('#\s*\r?\n\s*#', ' ', static::formatMessage($message)),
+			' @  ' . Helpers::getSource()
+		]);
+	}
+
+
+}
diff --git a/tests/Tracy/StreamLogger.log().phpt b/tests/Tracy/StreamLogger.log().phpt
new file mode 100644
index 000000000..cf4e918ef
--- /dev/null
+++ b/tests/Tracy/StreamLogger.log().phpt
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Test: Tracy\StreamLogger logging exceptions in log message.
+ */
+
+declare(strict_types=1);
+
+use Tester\Assert;
+use Tracy\StreamLogger;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test('', function () {
+	$path = getTempDir() . '/a.log';
+	$e = new Exception('First');
+	$logger = new StreamLogger($path);
+	$logger->log($e, 'a');
+	Assert::match('[%a%] Exception: First in %a%:%d% %A%', file_get_contents($path));
+});
diff --git a/tests/Tracy/StreamLogger.stdout.phpt b/tests/Tracy/StreamLogger.stdout.phpt
new file mode 100644
index 000000000..afff2936b
--- /dev/null
+++ b/tests/Tracy/StreamLogger.stdout.phpt
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Test: Tracy\StreamLogger logging exceptions in log message.
+ * @outputMatch %A%Exception: First%A%
+ */
+
+declare(strict_types=1);
+
+use Tracy\StreamLogger;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test('', function () {
+	$e = new Exception('First');
+	$logger = new StreamLogger('php://stdout');
+	$logger->log($e);
+});

From 60d4fa85f850dae6f61b17b134ae767eee5e1cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20Felix=20=C5=A0ulc?= <rkfelix@gmail.com>
Date: Wed, 8 Mar 2023 22:32:37 +0100
Subject: [PATCH 30/30] Logger: add MultiLogger

---
 src/Tracy/Logger/MultiLogger.php    | 42 +++++++++++++++++++++++++++++
 tests/Tracy/MultiLogger.log().phpt  | 29 ++++++++++++++++++++
 tests/Tracy/MultiLogger.stdout.phpt | 21 +++++++++++++++
 3 files changed, 92 insertions(+)
 create mode 100644 src/Tracy/Logger/MultiLogger.php
 create mode 100644 tests/Tracy/MultiLogger.log().phpt
 create mode 100644 tests/Tracy/MultiLogger.stdout.phpt

diff --git a/src/Tracy/Logger/MultiLogger.php b/src/Tracy/Logger/MultiLogger.php
new file mode 100644
index 000000000..d05c33f6e
--- /dev/null
+++ b/src/Tracy/Logger/MultiLogger.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * This file is part of the Tracy (https://tracy.nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Tracy;
+
+
+class MultiLogger implements ILogger
+{
+
+	/** @var ILogger[] */
+	private array $loggers = [];
+
+
+	/**
+	 * @param ILogger[] $loggers
+	 */
+	public function __construct(array $loggers = [])
+	{
+		$this->loggers = $loggers;
+	}
+
+
+	public function addLogger(ILogger $logger): void
+	{
+		$this->loggers[] = $logger;
+	}
+
+
+	public function log(mixed $message, string $level = self::INFO)
+	{
+		foreach ($this->loggers as $logger) {
+			$logger->log($message, $level);
+		}
+	}
+
+}
diff --git a/tests/Tracy/MultiLogger.log().phpt b/tests/Tracy/MultiLogger.log().phpt
new file mode 100644
index 000000000..fdd837b64
--- /dev/null
+++ b/tests/Tracy/MultiLogger.log().phpt
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Test: Tracy\StreamLogger logging exceptions in log message.
+ */
+
+declare(strict_types=1);
+
+use Tester\Assert;
+use Tracy\MultiLogger;
+use Tracy\StreamLogger;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test('', function () {
+	$e = new Exception('First');
+
+	$path1 = getTempDir() . '/a1.log';
+	$logger1 = new StreamLogger($path1);
+	$path2 = getTempDir() . '/a2.log';
+	$logger2 = new StreamLogger($path2);
+
+	$logger = new MultiLogger([$logger1, $logger2]);
+	$logger->log($e, 'a');
+
+	Assert::match('[%a%] Exception: First in %a%:%d% %A%', file_get_contents($path1));
+	Assert::match('[%a%] Exception: First in %a%:%d% %A%', file_get_contents($path2));
+});
diff --git a/tests/Tracy/MultiLogger.stdout.phpt b/tests/Tracy/MultiLogger.stdout.phpt
new file mode 100644
index 000000000..1e26a3312
--- /dev/null
+++ b/tests/Tracy/MultiLogger.stdout.phpt
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Test: Tracy\StreamLogger logging exceptions in log message.
+ * @outputMatch %A%Exception: First%A%
+ */
+
+declare(strict_types=1);
+
+use Tracy\MultiLogger;
+use Tracy\StreamLogger;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test('', function () {
+	$e = new Exception('First');
+	$logger1 = new StreamLogger('php://stdout');
+	$logger = new MultiLogger([$logger1]);
+	$logger->log($e);
+});