From de681cbf5c7cb85dcf4937d373877012cb4f94fa Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Fri, 14 Mar 2014 10:10:07 +0100
Subject: [PATCH] [Process] Add tests on ProcessUtils::escapeArgument

---
 src/Symfony/Component/Process/ProcessUtils.php           | 4 ++--
 src/Symfony/Component/Process/Tests/ProcessUtilsTest.php | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Process/ProcessUtils.php b/src/Symfony/Component/Process/ProcessUtils.php
index 84059cac73..7c9887fdbe 100644
--- a/src/Symfony/Component/Process/ProcessUtils.php
+++ b/src/Symfony/Component/Process/ProcessUtils.php
@@ -57,7 +57,7 @@ class ProcessUtils
                         $part .= '\\';
                     }
                     $part = escapeshellarg($part);
-                    if ($part[0] === '"' && $part[strlen($part) - 1] === '"') {
+                    if ('"' === $part[0] && '"' === $part[strlen($part) - 1]) {
                         $part = substr($part, 1, -1);
                         $quote = true;
                     }
@@ -65,7 +65,7 @@ class ProcessUtils
                 }
             }
             if ($quote) {
-                $escapedArgument = '"' . $escapedArgument . '"';
+                $escapedArgument = '"'.$escapedArgument.'"';
             }
 
             return $escapedArgument;
diff --git a/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php b/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php
index b9e8b0c76a..288d4f369d 100644
--- a/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php
@@ -27,6 +27,7 @@ class ProcessUtilsTest extends \PHPUnit_Framework_TestCase
     {
         if (defined('PHP_WINDOWS_VERSION_BUILD')) {
             return array(
+                array('"\"php\" \"-v\""', '"php" "-v"'),
                 array('"foo bar"', 'foo bar'),
                 array('^%"path"^%', '%path%'),
                 array('"<|>"\\"" "\\""\'f"', '<|>" "\'f'),
@@ -36,6 +37,7 @@ class ProcessUtilsTest extends \PHPUnit_Framework_TestCase
         }
 
         return array(
+            array("'\"php\" \"-v\"'", '"php" "-v"'),
             array("'foo bar'", 'foo bar'),
             array("'%path%'", '%path%'),
             array("'<|>\" \"'\\''f'", '<|>" "\'f'),