Add a COMPOSER_BINARY env var so that chdir does not affect @composer …

…script resolvability, fixes #6080
composer · Jan 22, 2017 · e4840ee · e4840ee
1 parent 0ea93df
commit e4840ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/bin/composer b/bin/composer
@@ -48,6 +48,8 @@ if (function_exists('ini_set')) {
     unset($memoryInBytes, $memoryLimit);
 }
 
+putenv('COMPOSER_BINARY='.realpath($_SERVER['argv'][0]));
+
 // run the command application
 $application = new Application();
 $application->run(null, $output);
diff --git a/src/Composer/EventDispatcher/EventDispatcher.php b/src/Composer/EventDispatcher/EventDispatcher.php
@@ -180,7 +180,7 @@ protected function doDispatch(Event $event)
                     if (!$phpPath) {
                         throw new \RuntimeException('Failed to locate PHP binary to execute '.$scriptName);
                     }
-                    $exec = $phpPath . '  ' . realpath($_SERVER['argv'][0]) . substr($callable, 9);
+                    $exec = ProcessExecutor::escape($phpPath) . ' ' . ProcessExecutor::escape(getenv('COMPOSER_BINARY')) . substr($callable, 9);
                     if (0 !== ($exitCode = $this->process->execute($exec))) {
                         $this->io->writeError(sprintf('<error>Script %s handling the %s event returned with error code '.$exitCode.'</error>', $callable, $event->getName()));