minor symfony#16599 [Process] Fix trailing space in PHP binary finder (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 1728dcca8269 · 2015-11-19T13:57:32.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Process] Fix trailing space in PHP binary finder | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#16598 | License | MIT | Doc PR | - Commits ------- f15e6e0 [Process] Fix trailing space in PHP binary finder
diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php
@@ -35,14 +35,17 @@ public function __construct()
      */
     public function find($includeArgs = true)
     {
+        $args = $this->findArguments();
+        $args = $includeArgs && $args ? ' '.implode(' ', $args) : '';
+
         // HHVM support
         if (defined('HHVM_VERSION')) {
-            return (getenv('PHP_BINARY') ?: PHP_BINARY).($includeArgs ? ' '.implode(' ', $this->findArguments()) : '');
+            return (getenv('PHP_BINARY') ?: PHP_BINARY).$args;
         }
 
         // PHP_BINARY return the current sapi executable
         if (defined('PHP_BINARY') && PHP_BINARY && in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg')) && is_file(PHP_BINARY)) {
-            return PHP_BINARY.($includeArgs ? ' '.implode(' ', $this->findArguments()) : '');
+            return PHP_BINARY.$args;
         }
 
         if ($php = getenv('PHP_PATH')) {

Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,17 @@ public function __construct()`
`35`	`35`	`*/`
`36`	`36`	`public function find($includeArgs = true)`
`37`	`37`	`{`
	`38`	`+ $args = $this->findArguments();`
	`39`	`+ $args = $includeArgs && $args ? ' '.implode(' ', $args) : '';`
	`40`	`+`
`38`	`41`	`// HHVM support`
`39`	`42`	`if (defined('HHVM_VERSION')) {`
`40`		`- return (getenv('PHP_BINARY') ?: PHP_BINARY).($includeArgs ? ' '.implode(' ', $this->findArguments()) : '');`
	`43`	`+ return (getenv('PHP_BINARY') ?: PHP_BINARY).$args;`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`// PHP_BINARY return the current sapi executable`
`44`	`47`	`if (defined('PHP_BINARY') && PHP_BINARY && in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg')) && is_file(PHP_BINARY)) {`
`45`		`- return PHP_BINARY.($includeArgs ? ' '.implode(' ', $this->findArguments()) : '');`
	`48`	`+ return PHP_BINARY.$args;`
`46`	`49`	`}`
`47`	`50`
`48`	`51`	`if ($php = getenv('PHP_PATH')) {`