[Process] Always escape commands properly and remove windows-specific handling

Seldaek · Seldaek · commit c4e8ff75f562 · 2012-02-16T16:52:23.000+01:00
diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/ProcessBuilder.php
@@ -102,20 +102,12 @@ public function getProcess()
 
         $options = $this->options;
 
-        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
-            $options['bypass_shell'] = true;
+        $arguments = $this->arguments;
+        $command = array_shift($arguments);
 
-            $arguments = $this->arguments;
-            $command = array_shift($arguments);
-
-            $script = '"'.$command.'"';
-            if ($arguments) {
-                $script .= ' '.implode(' ', array_map('escapeshellarg', $arguments));
-            }
-
-            $script = 'cmd /V:ON /E:ON /C "'.$script.'"';
-        } else {
-            $script = implode(' ', array_map('escapeshellarg', $this->arguments));
+        $script = escapeshellcmd($command);
+        if ($arguments) {
+            $script .= ' '.implode(' ', array_map('escapeshellarg', $arguments));
         }
 
         $env = $this->inheritEnv && $_ENV ? $this->env + $_ENV : $this->env;
