Merge pull request #40 from paranoiq/patch-1

JakubOnderka · JakubOnderka · commit d94caff9deb7 · 2014-10-25T20:47:14.000+02:00
Fix problem with escapeshellarg on Windows
diff --git a/src/Process/PhpExecutable.php b/src/Process/PhpExecutable.php
@@ -75,7 +75,7 @@ public function getVersionId()
     public static function getPhpExecutable($phpExecutable)
     {
         $codeToExecute = <<<PHP
-echo "PHP;", PHP_VERSION_ID, ";", defined('HPHP_VERSION') ? HPHP_VERSION : null;
+echo 'PHP;', PHP_VERSION_ID, ';', defined('HPHP_VERSION') ? HPHP_VERSION : null;
 PHP;
 
         $process = new Process(escapeshellarg($phpExecutable) . ' -n -r ' . escapeshellarg($codeToExecute));
@@ -125,4 +125,4 @@ private static function getPhpExecutableFromOutput($phpExecutable, $output, $isH
             $isHhvmType
         );
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function getVersionId()`
`75`	`75`	`public static function getPhpExecutable($phpExecutable)`
`76`	`76`	`{`
`77`	`77`	`$codeToExecute = <<<PHP`
`78`		`-echo "PHP;", PHP_VERSION_ID, ";", defined('HPHP_VERSION') ? HPHP_VERSION : null;`
	`78`	`+echo 'PHP;', PHP_VERSION_ID, ';', defined('HPHP_VERSION') ? HPHP_VERSION : null;`
`79`	`79`	`PHP;`
`80`	`80`
`81`	`81`	`$process = new Process(escapeshellarg($phpExecutable) . ' -n -r ' . escapeshellarg($codeToExecute));`
`@@ -125,4 +125,4 @@ private static function getPhpExecutableFromOutput($phpExecutable, $output, $isH`
`125`	`125`	`$isHhvmType`
`126`	`126`	`);`
`127`	`127`	`}`
`128`		`-}`
	`128`	`+}`