[VarExporter] espace unicode chars involved in directionality

nicolas-grekas · nicolas-grekas · commit b802d3668298 · 2021-11-03T14:16:20.000+01:00
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -214,10 +214,10 @@ public static function export($value, $indent = '')
         if (\is_string($value)) {
             $code = sprintf("'%s'", addcslashes($value, "'\\"));
 
-            $code = preg_replace_callback('/([\0\r\n]++)(.)/', function ($m) use ($subIndent) {
+            $code = preg_replace_callback("/((?:[\\0\\r\\n]|\u{202A}|\u{202B}|\u{202D}|\u{202E}|\u{2066}|\u{2067}|\u{2068}|\u{202C}|\u{2069})++)(.)/", function ($m) use ($subIndent) {
                 $m[1] = sprintf('\'."%s".\'', str_replace(
-                    ["\0", "\r", "\n", '\n\\'],
-                    ['\0', '\r', '\n', '\n"'."\n".$subIndent.'."\\'],
+                    ["\0", "\r", "\n", "\u{202A}", "\u{202B}", "\u{202D}", "\u{202E}", "\u{2066}", "\u{2067}", "\u{2068}", "\u{202C}", "\u{2069}", '\n\\'],
+                    ['\0', '\r', '\n', '\u{202A}', '\u{202B}', '\u{202D}', '\u{202E}', '\u{2066}', '\u{2067}', '\u{2068}', '\u{202C}', '\u{2069}', '\n"'."\n".$subIndent.'."\\'],
                     $m[1]
                 ));
 
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
@@ -240,6 +240,11 @@ public function provideExport()
             yield ['unit-enum', [FooUnitEnum::Bar], true];
         }
     }
+
+    public function testUnicodeDirectionality()
+    {
+        $this->assertSame('"\0\r\u{202A}\u{202B}\u{202D}\u{202E}\u{2066}\u{2067}\u{2068}\u{202C}\u{2069}\n"', VarExporter::export("\0\r\u{202A}\u{202B}\u{202D}\u{202E}\u{2066}\u{2067}\u{2068}\u{202C}\u{2069}\n"));
+    }
 }
 
 class MyWakeup

Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,11 @@ public function provideExport()`
`240`	`240`	`yield ['unit-enum', [FooUnitEnum::Bar], true];`
`241`	`241`	`}`
`242`	`242`	`}`
	`243`	`+`
	`244`	`+ public function testUnicodeDirectionality()`
	`245`	`+ {`
	`246`	`+ $this->assertSame('"\0\r\u{202A}\u{202B}\u{202D}\u{202E}\u{2066}\u{2067}\u{2068}\u{202C}\u{2069}\n"', VarExporter::export("\0\r\u{202A}\u{202B}\u{202D}\u{202E}\u{2066}\u{2067}\u{2068}\u{202C}\u{2069}\n"));`
	`247`	`+ }`
`243`	`248`	`}`
`244`	`249`
`245`	`250`	`class MyWakeup`