Skip to content

Commit d3edc75

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: Use mb_convert_encoding instead of utf8_decode [SecurityBundle] Remove forgotten unused code Minor @requires function tests cleanup [FrameworkBundle] Always add CacheCollectorPass Fix "Notice: Undefined index: headers" in messenger with Oracle [String] Fix ansi escape sequences regex Indicate support for doctrine/persistence 3 [Routing] fix router base url when default uri has trailing slash Replace deprecated String.prototype.substr()
2 parents 4060673 + df9f03d commit d3edc75

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

AbstractUnicodeString.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ public function width(bool $ignoreAnsiDecoration = true): int
478478
foreach (explode("\n", $s) as $s) {
479479
if ($ignoreAnsiDecoration) {
480480
$s = preg_replace('/(?:\x1B(?:
481-
\[ [\x30-\x3F]*+ [\x20-\x2F]*+ [0x40-\x7E]
481+
\[ [\x30-\x3F]*+ [\x20-\x2F]*+ [\x40-\x7E]
482482
| [P\]X^_] .*? \x1B\\\\
483483
| [\x41-\x7E]
484484
)|[\p{Cc}\x7F]++)/xu', '', $s);

0 commit comments

Comments
 (0)