bug #22613 [Process] Fix incorrectly calling PHP process when path contains space (maryo)

nicolas-grekas · nicolas-grekas · commit 03914e9e9bdf · 2017-05-15T10:12:59.000+02:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [Process] Fix incorrectly calling PHP process when path contains space | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #22556 | License | MIT I have PHP installed at "D:\Program Files\PHP" which contains a space. `PhpExecutableFinder` found it but then `PhpProcess` splitted the path by space. This PR fixes it. I wanted to write a test but I don't know ho to do it properly since it is dependent on the location where PHP is installed and I can't even mock `PhpExecutableFinder` because it is hardcoded dependency and an implementation detail. Commits ------- 9c08109 Fix incorrectly calling PHP process on Windows when path contains space
diff --git a/src/Symfony/Component/Process/PhpProcess.php b/src/Symfony/Component/Process/PhpProcess.php
@@ -36,10 +36,10 @@ class PhpProcess extends Process
     public function __construct($script, $cwd = null, array $env = null, $timeout = 60, array $options = null)
     {
         $executableFinder = new PhpExecutableFinder();
-        if (false === $php = $executableFinder->find()) {
+        if (false === $php = $executableFinder->find(false)) {
             $php = null;
         } else {
-            $php = explode(' ', $php);
+            $php = array_merge(array($php), $executableFinder->findArguments());
         }
         if ('phpdbg' === PHP_SAPI) {
             $file = tempnam(sys_get_temp_dir(), 'dbg');

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,10 @@ class PhpProcess extends Process`
`36`	`36`	`public function __construct($script, $cwd = null, array $env = null, $timeout = 60, array $options = null)`
`37`	`37`	`{`
`38`	`38`	`$executableFinder = new PhpExecutableFinder();`
`39`		`- if (false === $php = $executableFinder->find()) {`
	`39`	`+ if (false === $php = $executableFinder->find(false)) {`
`40`	`40`	`$php = null;`
`41`	`41`	`} else {`
`42`		`- $php = explode(' ', $php);`
	`42`	`+ $php = array_merge(array($php), $executableFinder->findArguments());`
`43`	`43`	`}`
`44`	`44`	`if ('phpdbg' === PHP_SAPI) {`
`45`	`45`	`$file = tempnam(sys_get_temp_dir(), 'dbg');`