Skip to content

Commit b385dce

Browse files
Merge branch '3.4' into 4.4
* 3.4: updated VERSION for 3.4.40 update CONTRIBUTORS for 3.4.40 updated CHANGELOG for 3.4.40 [WebProfilerBundle] changed label of peak memory usage in the time & memory panels (MB into MiB) add tests for the ConstraintViolationBuilder class Improve dirname usage [PhpUnitBridge] Use COMPOSER_BINARY env var if available [YAML] escape DEL(\x7f) fix compatibility with phpunit 9 [Cache] skip APCu in chains when the backend is disabled [Form] apply automatically step=1 for datetime-local input
2 parents 8a65d0f + 8fef49a commit b385dce

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Escaper.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
class Escaper
2323
{
2424
// Characters that would cause a dumped string to require double quoting.
25-
const REGEX_CHARACTER_TO_ESCAPE = "[\\x00-\\x1f]|\xc2\x85|\xc2\xa0|\xe2\x80\xa8|\xe2\x80\xa9";
25+
const REGEX_CHARACTER_TO_ESCAPE = "[\\x00-\\x1f]|\x7f|\xc2\x85|\xc2\xa0|\xe2\x80\xa8|\xe2\x80\xa9";
2626

2727
// Mapping arrays for escaping a double quoted string. The backslash is
2828
// first to ensure proper escaping because str_replace operates iteratively
@@ -33,13 +33,15 @@ class Escaper
3333
"\x08", "\x09", "\x0a", "\x0b", "\x0c", "\x0d", "\x0e", "\x0f",
3434
"\x10", "\x11", "\x12", "\x13", "\x14", "\x15", "\x16", "\x17",
3535
"\x18", "\x19", "\x1a", "\x1b", "\x1c", "\x1d", "\x1e", "\x1f",
36+
"\x7f",
3637
"\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9",
3738
];
3839
private static $escaped = ['\\\\', '\\"', '\\\\', '\\"',
3940
'\\0', '\\x01', '\\x02', '\\x03', '\\x04', '\\x05', '\\x06', '\\a',
4041
'\\b', '\\t', '\\n', '\\v', '\\f', '\\r', '\\x0e', '\\x0f',
4142
'\\x10', '\\x11', '\\x12', '\\x13', '\\x14', '\\x15', '\\x16', '\\x17',
4243
'\\x18', '\\x19', '\\x1a', '\\e', '\\x1c', '\\x1d', '\\x1e', '\\x1f',
44+
'\\x7f',
4345
'\\N', '\\_', '\\L', '\\P',
4446
];
4547

Tests/DumperTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ public function getEscapeSequences()
223223
'double-quote' => ['"', "'\"'"],
224224
'slash' => ['/', '/'],
225225
'backslash' => ['\\', '\\'],
226+
'del' => ["\x7f", '"\x7f"'],
226227
'next-line' => ["\xC2\x85", '"\\N"'],
227228
'non-breaking-space' => ["\xc2\xa0", '"\\_"'],
228229
'line-separator' => ["\xE2\x80\xA8", '"\\L"'],

0 commit comments

Comments
 (0)