Merge pull request #124 from lavoiesl/hhvm-composer

Spea · Spea · commit d2f51eb9b894 · 2015-02-19T19:10:24.000+01:00
Added support for HHVM in ScriptHandler
diff --git a/Composer/ScriptHandler.php b/Composer/ScriptHandler.php
@@ -80,13 +80,14 @@ public static function bowerUpdate(Event $event)
      */
     protected static function executeCommand(Event $event, $appDir, $cmd, $timeout = 300)
     {
-        $php = escapeshellarg(self::getPhp());
+        $php = escapeshellarg(self::getPhp(false));
+        $phpArgs = implode(' ', array_map('escapeshellarg', self::getPhpArguments()));
         $console = escapeshellarg($appDir.'/console');
         if ($event->getIO()->isDecorated()) {
             $console.= ' --ansi';
         }
 
-        $process = new Process($php.' '.$console.' '.$cmd, null, null, null, $timeout);
+        $process = new Process($php.($phpArgs ? ' '.$phpArgs : '').' '.$console.' '.$cmd, null, null, null, $timeout);
         $process->run(function ($type, $buffer) { echo $buffer; });
         if (!$process->isSuccessful()) {
             throw new \RuntimeException(sprintf('An error occurred when executing the "%s" command.', escapeshellarg($cmd)));
@@ -113,13 +114,20 @@ protected static function getOptions(Event $event)
      * @return string|false
      * @throws \RuntimeException
      */
-    protected static function getPhp()
+    protected static function getPhp($includeArgs = true)
     {
-        $phpFinder = new PhpExecutableFinder;
-        if (!$phpPath = $phpFinder->find()) {
+        $phpFinder = new PhpExecutableFinder();
+        if (!$phpPath = $phpFinder->find($includeArgs)) {
             throw new \RuntimeException('The php executable could not be found, add it to your PATH environment variable and try again');
         }
 
         return $phpPath;
     }
+
+   protected static function getPhpArguments()
+   {
+       $phpFinder = new PhpExecutableFinder();
+
+       return method_exists($phpFinder, 'findArguments') ? $phpFinder->findArguments() : array();
+   }
 }
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "require": {
         "php": ">=5.3.3",
         "symfony/framework-bundle": "~2.1",
-        "symfony/process": "~2.1",
+        "symfony/process": "~2.3,>=2.3.20 | ~2.4,>=2.4.10 | ~2.5,>=2.5.5",
         "doctrine/collections": "1.*",
         "symfony/assetic-bundle": "~2.1",
         "doctrine/cache": "~1.0"
