BlueScreen: unified listing of hidden keys [Closes #441]

nette · Oct 14, 2020 · 3a7cfd5 · 3a7cfd5
1 parent 5e93a55
commit 3a7cfd5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/Tracy/BlueScreen/BlueScreen.php b/src/Tracy/BlueScreen/BlueScreen.php
@@ -363,7 +363,7 @@ public function getDumper(): \Closure
 
 		return function ($v, $k = null) use ($keysToHide): string {
 			if (is_string($k) && isset($keysToHide[strtolower($k)])) {
-				$v = Dumper::HIDDEN_VALUE;
+				return '<pre class="tracy-dump">' . Helpers::escapeHtml(Dumper::hideValue($v)) . '</pre>';
 			}
 			return Dumper::toHtml($v, [
 				Dumper::DEPTH => $this->maxDepth,

diff --git a/src/Tracy/Dumper/Dumper.php b/src/Tracy/Dumper/Dumper.php
@@ -650,7 +650,8 @@ private static function exportPhpIncompleteClass(\__PHP_Incomplete_Class $obj):
 	}
 
 
-	private static function hideValue($var): string
+	/** @internal */
+	public static function hideValue($var): string
 	{
 		return self::HIDDEN_VALUE . ' (' . (is_object($var) ? Helpers::getClass($var) : gettype($var)) . ')';
 	}

diff --git a/tests/Tracy/expected/Debugger.error-in-eval.expect b/tests/Tracy/expected/Debugger.error-in-eval.expect
@@ -91,9 +91,7 @@
 						<tr><th>$user</th><td><pre class="tracy-dump"><span class="tracy-dump-string">"root"</span> (4)
 </pre>
 </td></tr>
-<tr><th>$pass</th><td><pre class="tracy-dump"><span class="tracy-dump-string">"*****"</span> (5)
-</pre>
-</td></tr>
+<tr><th>$pass</th><td><pre class="tracy-dump">***** (string)</pre></td></tr>
 						</table>
 						</div>
 										</li>
@@ -110,9 +108,7 @@
 			<tr><th>$user</th><td><pre class="tracy-dump"><span class="tracy-dump-string">"root"</span> (4)
 </pre>
 </td></tr>
-<tr><th>$pass</th><td><pre class="tracy-dump"><span class="tracy-dump-string">"*****"</span> (5)
-</pre>
-</td></tr>
+<tr><th>$pass</th><td><pre class="tracy-dump">***** (string)</pre></td></tr>
 			</table>
 			</div>
 			</div></div>