Skip to content

Commit b382351

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: Fix bad merge CS fix [ErrorHandler] Don't format binary strings [Validator] Consistently use "This value is not" instead of "This is not" in error messages [Messenger] Improve Redis integration tests [Validator] added missing Estonian and Romanian translations
2 parents 42c5bfd + 8271694 commit b382351

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Extension/CodeExtension.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ public function formatArgs(array $args): string
9191
$formattedValue = '<em>'.strtolower(htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset)).'</em>';
9292
} elseif ('resource' === $item[0]) {
9393
$formattedValue = '<em>resource</em>';
94+
} elseif (preg_match('/[^\x07-\x0D\x1B\x20-\xFF]/', $item[1])) {
95+
$formattedValue = '<em>binary string</em>';
9496
} else {
9597
$formattedValue = str_replace("\n", '', htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset));
9698
}

0 commit comments

Comments
 (0)