Apply nicolas-grekas patch

alamirault · alamirault · commit 395783fcad7d · 2023-01-09T21:21:51.000+01:00
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -51,6 +51,7 @@ class CliDumper extends AbstractDumper
         "\r" => '\r',
         "\033" => '\e',
     ];
+    protected static $unicodeCharsRx = "/[\u{00A0}\u{00AD}\u{034F}\u{061C}\u{115F}\u{1160}\u{17B4}\u{17B5}\u{180E}\u{2000}-\u{200F}\u{202F}\u{205F}\u{2060}-\u{2064}\u{206A}-\u{206F}\u{3000}\u{2800}\u{3164}\u{FEFF}\u{FFA0}\u{1D159}\u{1D173}-\u{1D17A}]/u";
 
     protected $collapseNextHash = false;
     protected $expandNextHash = false;
@@ -224,7 +225,6 @@ public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut)
                     $this->line .= $this->indentPad;
                 }
                 if ('' !== $str) {
-                    $str = $this->replaceInvisibleCharacters($str);
                     $this->line .= $this->style('str', $str, $attr);
                 }
                 if ($i++ == $m) {
@@ -349,7 +349,6 @@ protected function dumpKey(Cursor $cursor)
                     if (\is_int($key)) {
                         $this->line .= $this->style($style, $key).' => ';
                     } else {
-                        $key = $this->replaceInvisibleCharacters($key);
                         $this->line .= $bin.'"'.$this->style($style, $key).'" => ';
                     }
                     break;
@@ -452,6 +451,14 @@ protected function style(string $style, string $value, array $attr = []): string
             return $s.$endCchr;
         }, $value, -1, $cchrCount);
 
+        if (!($attr['binary'] ?? false)) {
+            $value = preg_replace_callback(static::$unicodeCharsRx, function ($c) use (&$cchrCount, $startCchr, $endCchr) {
+                ++$cchrCount;
+
+                return $startCchr.'\u{'.strtoupper(dechex(mb_ord($c[0]))).'}'.$endCchr;
+            }, $value);
+        }
+
         if ($this->colors) {
             if ($cchrCount && "\033" === $value[0]) {
                 $value = substr($value, \strlen($startCchr));
@@ -615,16 +622,4 @@ private function getSourceLink(string $file, int $line)
 
         return false;
     }
-
-    /**
-     * Replace invisible character by the hexadecimal representation of the codepoint.
-     */
-    private function replaceInvisibleCharacters(string $input): string
-    {
-        $invisibleCharacters = ['﻿'];
-
-        return preg_replace_callback('/'.implode('|', $invisibleCharacters).'/u', static function (array $matches): string {
-            return sprintf('\u{%s}', dechex(mb_ord($matches[0])));
-        }, $input);
-    }
 }
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
@@ -66,7 +66,7 @@ public function testGet()
     é\\x01test\\t\\n
     ing
     """
-  "bo\\u{feff}m" => "te\\u{feff}st"
+  "bo\\u{FEFF}m" => "te\\u{FEFF}st"
   "[]" => []
   "res" => stream resource {@{$res}
 %A  wrapper_type: "plainfile"
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php
@@ -69,7 +69,7 @@ public function testGet()
     <span class=sf-dump-str title="11 binary or non-UTF-8 characters">&#233;<span class="sf-dump-default">\\x01</span>test<span class="sf-dump-default">\\t</span><span class="sf-dump-default sf-dump-ns">\\n</span></span>
     <span class=sf-dump-str title="11 binary or non-UTF-8 characters">ing</span>
     """
-  "<span class=sf-dump-key>bo\\u{feff}m</span>" => "<span class=sf-dump-str title="5 characters">te\\u{feff}st</span>"
+  "<span class=sf-dump-key>bo\\u{FEFF}m</span>" => "<span class=sf-dump-str title="5 characters">te\\u{FEFF}st</span>"
   "<span class=sf-dump-key>[]</span>" => []
   "<span class=sf-dump-key>res</span>" => <span class=sf-dump-note>stream resource</span> <a class=sf-dump-ref>@{$res}</a><samp data-depth=2 class=sf-dump-compact>
 %A  <span class=sf-dump-meta>wrapper_type</span>: "<span class=sf-dump-str title="9 characters">plainfile</span>"
