nette · janbarasek · May 19, 2020 · Apr 13, 2020 · Apr 13, 2020 · May 19, 2020
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -6,7 +6,6 @@ module.exports = {
 		'ecmaVersion': 6
 	},
 	'globals': {
-		'Tracy': true
 	},
 	'extends': 'eslint:recommended',
 	'rules': {

diff --git a/examples/assets/style.css b/examples/assets/style.css
@@ -17,8 +17,9 @@ h1 {
 	color: #036;
 }
 
-pre.tracy-dump {
+pre.tracy-dump--light {
 	border: 1px solid silver;
+	border-radius: 4px;
 	padding: 1em;
 	margin: 1em 0;
 }

diff --git a/examples/dump.php b/examples/dump.php
@@ -4,11 +4,7 @@
 
 require __DIR__ . '/../src/tracy.php';
 
-use Tracy\Debugger;
-
-// For security reasons, Tracy is visible only on localhost.
-// You may force Tracy to run in development mode by passing the Debugger::DEVELOPMENT instead of Debugger::DETECT.
-Debugger::enable(Debugger::DETECT, __DIR__ . '/log');
+use Tracy\Dumper;
 
 ?>
 <!DOCTYPE html><link rel="stylesheet" href="assets/style.css">
@@ -17,6 +13,14 @@
 
 <?php
 
+// options:
+// Dumper::$maxDepth = 7; // how many nested levels of array/object properties display
+// Dumper::$maxLength = 150; // how long strings display
+// Dumper::$maxItems = 100; // how many items in array/object display
+// Dumper::$keysToHide = []; // sensitive keys not displayed
+// Dumper::$theme = 'dark'; // theme light or dark
+
+
 class Test
 {
 	public $x = [10, null];
@@ -28,23 +32,20 @@ class Test
 
 $arr = [10, 20.2, true, null, 'hello', (object) null, [], fopen(__FILE__, 'r')];
 
-$obj = new Test;
-
-
-dump('<a href="#">test</a>');
-
 dump($arr);
 
-dump($obj);
-
 
 echo "<h2>With location</h2>\n";
 
-Debugger::$showLocation = true;
+Dumper::$showLocation = true;
 
 dump($arr);
 
 
-if (Debugger::$productionMode) {
-	echo '<p><b>For security reasons, Tracy is visible only on localhost. Look into the source code to see how to enable Tracy.</b></p>';
-}
+echo "<h2>Dark theme</h2>\n";
+
+Dumper::$theme = 'dark';
+
+$obj = new Test;
+
+dump($obj);
diff --git a/readme.md b/readme.md
@@ -255,27 +255,32 @@ Every debugging developer is a good friend with the function `var_dump`, which l
 $arr = [10, 20.2, true, null, 'hello'];
 
 dump($arr);
-// or Tracy\Debugger::dump($arr);
+// or Tracy\Dumper::dump($arr);
 ```
 
 generates the output:
 
 ![dump](https://nette.github.io/tracy/images/tracy-dump.png)
 
-You can also change the nesting depth by `Debugger::$maxDepth` and displayed strings length by `Debugger::$maxLength`. Naturally, lower values accelerate Tracy rendering.
+You can also change the nesting depth by `Dumper::$maxDepth`, displayed strings length by `Dumper::$maxLength` and other options. Naturally, lower values accelerate Tracy rendering.
 
 ```php
-Debugger::$maxDepth = 2; // default: 3
-Debugger::$maxLength = 50; // default: 150
+use Tracy\Dumper;
+
+Dumper::$maxDepth = 2; // default: 7
+Dumper::$maxLength = 50; // default: 150
+Dumper::$maxItems = 50; // default: 100
+Dumper::$keysToHide = ['password']; // default: []
+Dumper::$theme = 'dark'; // default: light
 ```
 
-The `dump()` function can display other useful information. `Tracy\Dumper::LOCATION_SOURCE` adds a tooltip with path to the file, where the function was called. `Tracy\Dumper::LOCATION_LINK` adds a link to the file. `Tracy\Dumper::LOCATION_CLASS` adds a tooltip to every dumped object containing path to the file, in which the object's class is defined. All these constants can be set in `Debugger::$showLocation` variable before calling the `dump()`. You can set multiple values at once using the `|` operator.
+The `dump()` function can display other useful information. `Tracy\Dumper::LOCATION_SOURCE` adds a tooltip with path to the file, where the function was called. `Tracy\Dumper::LOCATION_LINK` adds a link to the file. `Tracy\Dumper::LOCATION_CLASS` adds a tooltip to every dumped object containing path to the file, in which the object's class is defined. All these constants can be set in `Dumper::$showLocation` variable before calling the `dump()`. You can set multiple values at once using the `|` operator.
 
 ```php
-Debugger::$showLocation = Tracy\Dumper::LOCATION_SOURCE; // Shows path to where the dump() was called
-Debugger::$showLocation = Tracy\Dumper::LOCATION_CLASS | Tracy\Dumper::LOCATION_LINK; // Shows both paths to the classes and link to where the dump() was called
-Debugger::$showLocation = false; // Hides additional location information
-Debugger::$showLocation = true; // Shows all additional location information
+Dumper::$showLocation = Tracy\Dumper::LOCATION_SOURCE; // Shows path to where the dump() was called
+Dumper::$showLocation = Tracy\Dumper::LOCATION_CLASS | Tracy\Dumper::LOCATION_LINK; // Shows both paths to the classes and link to where the dump() was called
+Dumper::$showLocation = false; // Hides additional location information
+Dumper::$showLocation = true; // Shows all additional location information
 ```
 
 Very handy alternative to `dump()` is `dumpe()` (ie. dump and exit) and `bdump()`. This allows us to dump variables in Debugger Bar. This is useful, because dumps don't mess up the output and we can also add a title to the dump.

diff --git a/src/Bridges/Nette/TracyExtension.php b/src/Bridges/Nette/TracyExtension.php
@@ -46,6 +46,9 @@ public function getConfigSchema(): Nette\Schema\Schema
 			'showBar' => Expect::bool()->dynamic(),
 			'maxLength' => Expect::int()->dynamic(),
 			'maxDepth' => Expect::int()->dynamic(),
+			'maxItems' => Expect::int()->dynamic(),
+			'keysToHide' => Expect::array()->dynamic(),
+			'theme' => Expect::string()->dynamic(),
 			'showLocation' => Expect::bool()->dynamic(),
 			'scream' => Expect::bool()->dynamic(),
 			'bar' => Expect::listOf('string|Nette\DI\Definitions\Statement'),
@@ -88,9 +91,17 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 		}
 		foreach ($options as $key => $value) {
 			if ($value !== null) {
-				$key = ($key === 'fromEmail' ? 'getLogger()->' : '$') . $key;
+				static $tbl = [
+					'maxLength' => 'Dumper::$maxLength',
+					'maxDepth' => 'Dumper::$maxDepth',
+					'maxItems' => 'Dumper::$maxItems',
+					'keysToHide' => 'Dumper::$keysToHide',
+					'theme' => 'Dumper::$theme',
+					'showLocation' => 'Dumper::$showLocation',
+					'fromEmail' => 'Debugger::getLogger()->fromEmail',
+				];
 				$initialize->addBody($builder->formatPhp(
-					'Tracy\Debugger::' . $key . ' = ?;',
+					'Tracy\\' . ($tbl[$key] ?? 'Debugger::$' . $key) . ' = ?;',
 					Nette\DI\Helpers::filterArguments([$value])
 				));
 			}

diff --git a/src/Tracy/Bar/Bar.php b/src/Tracy/Bar/Bar.php
@@ -122,12 +122,12 @@ private function renderHtml(string $type, string $suffix = ''): array
 		$panels = $this->renderPanels($suffix);
 
 		return [
-			'bar' => Helpers::fixEncoding(Helpers::capture(function () use ($type, $panels) {
+			'bar' => Helpers::capture(function () use ($type, $panels) {
 				require __DIR__ . '/assets/bar.phtml';
-			})),
-			'panels' => Helpers::fixEncoding(Helpers::capture(function () use ($type, $panels) {
+			}),
+			'panels' => Helpers::capture(function () use ($type, $panels) {
 				require __DIR__ . '/assets/panels.phtml';
-			})),
+			}),
 		];
 	}
 
@@ -198,12 +198,12 @@ public function dispatchAssets(): bool
 			}
 			if ($session) {
 				$method = $m[1] ? 'loadAjax' : 'init';
-				echo "Tracy.Debug.$method(", json_encode($session['content'], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), ');';
+				echo "Tracy.Debug.$method(", json_encode($session['content'], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_INVALID_UTF8_SUBSTITUTE), ');';
 				$session = null;
 			}
 			$session = &$_SESSION['_tracy']['bluescreen'][$m[2]];
 			if ($session) {
-				echo 'Tracy.BlueScreen.loadAjax(', json_encode($session['content'], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), ');';
+				echo 'Tracy.BlueScreen.loadAjax(', json_encode($session['content'], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_INVALID_UTF8_SUBSTITUTE), ');';
 				$session = null;
 			}
 			return true;
@@ -219,7 +219,8 @@ private function renderAssets(): void
 			__DIR__ . '/assets/bar.css',
 			__DIR__ . '/../Toggle/toggle.css',
 			__DIR__ . '/../TableSort/table-sort.css',
-			__DIR__ . '/../Dumper/assets/dumper.css',
+			__DIR__ . '/../Dumper/assets/dumper-light.css',
+			__DIR__ . '/../Dumper/assets/dumper-dark.css',
 			__DIR__ . '/../BlueScreen/assets/bluescreen.css',
 		], Debugger::$customCssFiles));
 
@@ -229,16 +230,17 @@ private function renderAssets(): void
 	var el = document.createElement('style');
 	el.setAttribute('nonce', document.currentScript.getAttribute('nonce') || document.currentScript.nonce);
 	el.className='tracy-debug';
-	el.textContent=" . json_encode(preg_replace('#\s+#u', ' ', implode($css))) . ";
+	el.textContent=" . json_encode(Helpers::minifyCss(implode($css))) . ";
 	document.head.appendChild(el);})
 ();\n";
 
-		array_map('readfile', array_merge([
+		array_map(function ($file) { echo '(function(){', Helpers::minifyJs(file_get_contents($file)), '})();'; }, [
 			__DIR__ . '/assets/bar.js',
 			__DIR__ . '/../Toggle/toggle.js',
 			__DIR__ . '/../TableSort/table-sort.js',
 			__DIR__ . '/../Dumper/assets/dumper.js',
 			__DIR__ . '/../BlueScreen/assets/bluescreen.js',
-		], Debugger::$customJsFiles));
+		]);
+		array_map('readfile', Debugger::$customJsFiles);
 	}
 }
diff --git a/src/Tracy/Bar/assets/bar.css b/src/Tracy/Bar/assets/bar.css
@@ -352,23 +352,27 @@ body#tracy-debug .tracy-panel { /* in popup window */
 
 
 /* dump */
-#tracy-debug pre.tracy-dump div {
+#tracy-debug .tracy-dump--light div {
 	padding-left: 3ex;
 }
 
-#tracy-debug pre.tracy-dump div div {
+#tracy-debug .tracy-dump--light div div {
 	border-left: 1px solid rgba(0, 0, 0, .1);
 	margin-left: .5ex;
 }
 
-#tracy-debug pre.tracy-dump {
+#tracy-debug .tracy-dump--light div div:hover {
+	border-left-color: rgba(0, 0, 0, .25);
+}
+
+#tracy-debug .tracy-dump--light {
 	background: #FDF5CE;
 	padding: .4em .7em;
 	border: 1px dotted silver;
 	overflow: auto;
 }
 
-#tracy-debug table pre.tracy-dump {
+#tracy-debug table .tracy-dump--light {
 	padding: 0;
 	margin: 0;
 	border: none;
@@ -383,6 +387,13 @@ body#tracy-debug .tracy-panel { /* in popup window */
 	color: #35D;
 }
 
+#tracy-debug .tracy-dump-virtual span,
+#tracy-debug .tracy-dump-dynamic span,
+#tracy-debug .tracy-dump-string span {
+	font-size: 80%;
+	color: rgba(0, 0, 0, 0.5);
+}
+
 #tracy-debug .tracy-dump-number {
 	color: #090;
 }
@@ -392,15 +403,42 @@ body#tracy-debug .tracy-panel { /* in popup window */
 	color: #850;
 }
 
-#tracy-debug .tracy-dump-visibility,
+#tracy-debug .tracy-dump-virtual {
+	font-style: italic;
+}
+
+#tracy-debug .tracy-dump-public::after {
+	content: ' pub';
+}
+
+#tracy-debug .tracy-dump-protected::after {
+	content: ' pro';
+}
+
+#tracy-debug .tracy-dump-private::after {
+	content: ' pri';
+}
+
+#tracy-debug .tracy-dump-public::after,
+#tracy-debug .tracy-dump-protected::after,
+#tracy-debug .tracy-dump-private::after,
 #tracy-debug .tracy-dump-hash {
-	font-size: 85%; color: #999;
+	font-size: 85%;
+	color: rgba(0, 0, 0, 0.5);
 }
 
 #tracy-debug .tracy-dump-indent {
 	display: none;
 }
 
+#tracy-debug .tracy-dump-highlight {
+	background: #C22;
+	color: white;
+	border-radius: 2px;
+	padding: 0 2px;
+	margin: 0 -2px;
+}
+
 
 /* toggle */
 #tracy-debug .tracy-toggle:after {