[Process] Fix trailing space in PHP binary finder

symfony · Nov 19, 2015 · 4d0eaad · 4d0eaad
1 parent b268a43
commit 4d0eaad
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/PhpExecutableFinder.php b/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')) {