Fix empty process argument escaping on Windows

symfony · Aug 8, 2013 · 98f6969 · 98f6969
1 parent b463a70
commit 98f6969
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Symfony/Component/Process/ProcessUtils.php b/src/Symfony/Component/Process/ProcessUtils.php
@@ -41,11 +41,15 @@ public static function escapeArgument($argument)
         //@see https://bugs.php.net/bug.php?id=43784
         //@see https://bugs.php.net/bug.php?id=49446
         if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+            if ('' === $argument) {
+                return escapeshellarg($argument);
+            }
+
             $escapedArgument = '';
             foreach (preg_split('/([%"])/i', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
-                if ('"' == $part) {
+                if ('"' === $part) {
                     $escapedArgument .= '\\"';
-                } elseif ('%' == $part) {
+                } elseif ('%' === $part) {
                     $escapedArgument .= '^%';
                 } else {
                     $escapedArgument .= escapeshellarg($part);

diff --git a/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php b/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php
@@ -30,13 +30,15 @@ public function dataArguments()
                 array('"foo bar"', 'foo bar'),
                 array('^%"path"^%', '%path%'),
                 array('"<|>"\\"" "\\""\'f"', '<|>" "\'f'),
+                array('""', ''),
             );
         }
 
         return array(
             array("'foo bar'", 'foo bar'),
             array("'%path%'", '%path%'),
             array("'<|>\" \"'\\''f'", '<|>" "\'f'),
+            array("''", ''),
         );
     }
 }