[Process] Non ASCII characters disappearing during the escapeshellarg

GuillaumeVerdon · nicolas-grekas · commit 3779f3fbb98d · 2017-02-02T14:55:53.000+01:00
diff --git a/src/Symfony/Component/Process/ProcessUtils.php b/src/Symfony/Component/Process/ProcessUtils.php
@@ -71,7 +71,7 @@ public static function escapeArgument($argument)
             return $escapedArgument;
         }
 
-        return escapeshellarg($argument);
+        return "'".str_replace("'", "'\\''", $argument)."'";
     }
 
     /**
diff --git a/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php b/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php
@@ -43,6 +43,7 @@ public function dataArguments()
             array("'<|>\" \"'\\''f'", '<|>" "\'f'),
             array("''", ''),
             array("'with\\trailingbs\\'", 'with\trailingbs\\'),
+            array("'withNonAsciiAccentLikeéÉèÈàÀöä'", 'withNonAsciiAccentLikeéÉèÈàÀöä'),
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public static function escapeArgument($argument)`
`71`	`71`	`return $escapedArgument;`
`72`	`72`	`}`
`73`	`73`
`74`		`- return escapeshellarg($argument);`
	`74`	`+ return "'".str_replace("'", "'\\''", $argument)."'";`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ public function dataArguments()`
`43`	`43`	`array("'<\|>\" \"'\\''f'", '<\|>" "\'f'),`
`44`	`44`	`array("''", ''),`
`45`	`45`	`array("'with\\trailingbs\\'", 'with\trailingbs\\'),`
	`46`	`+ array("'withNonAsciiAccentLikeéÉèÈàÀöä'", 'withNonAsciiAccentLikeéÉèÈàÀöä'),`
`46`	`47`	`);`
`47`	`48`	`}`
`48`	`49`	`}`