From 3779f3fbb98db5fd1647fa8e2af84a05adb1c7a0 Mon Sep 17 00:00:00 2001 From: GuillaumeVerdon Date: Wed, 1 Feb 2017 10:32:26 +0100 Subject: [PATCH] [Process] Non ASCII characters disappearing during the escapeshellarg --- src/Symfony/Component/Process/ProcessUtils.php | 2 +- src/Symfony/Component/Process/Tests/ProcessUtilsTest.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Process/ProcessUtils.php b/src/Symfony/Component/Process/ProcessUtils.php index 0bd2f6b772..c0fd9c12db 100644 --- a/src/Symfony/Component/Process/ProcessUtils.php +++ b/src/Symfony/Component/Process/ProcessUtils.php @@ -71,7 +71,7 @@ class ProcessUtils 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 index e6564cde5b..0f554b6151 100644 --- a/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php +++ b/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php @@ -43,6 +43,7 @@ class ProcessUtilsTest extends \PHPUnit_Framework_TestCase array("'<|>\" \"'\\''f'", '<|>" "\'f'), array("''", ''), array("'with\\trailingbs\\'", 'with\trailingbs\\'), + array("'withNonAsciiAccentLikeéÉèÈàÀöä'", 'withNonAsciiAccentLikeéÉèÈàÀöä'), ); } }