Explorar el Código

Merge remote-tracking branch 'mizunashi-mana/fix-issue-5045'

Jordi Boggiano hace 9 años
padre
commit
2f6b4c439d
Se han modificado 1 ficheros con 8 adiciones y 3 borrados
  1. 8 3
      src/Composer/EventDispatcher/EventDispatcher.php

+ 8 - 3
src/Composer/EventDispatcher/EventDispatcher.php

@@ -145,13 +145,18 @@ class EventDispatcher
      */
     protected function doDispatch(Event $event)
     {
+        $pathStr = 'PATH';
+        if (!isset($_SERVER[$pathStr])) {
+            $pathStr = 'Path';
+        }
+        
         // add the bin dir to the PATH to make local binaries of deps usable in scripts
         $binDir = $this->composer->getConfig()->get('bin-dir');
         if (is_dir($binDir)) {
             $binDir = realpath($binDir);
-            if (isset($_SERVER['PATH']) && !preg_match('{(^|'.PATH_SEPARATOR.')'.preg_quote($binDir).'($|'.PATH_SEPARATOR.')}', $_SERVER['PATH'])) {
-                $_SERVER['PATH'] = $binDir.PATH_SEPARATOR.getenv('PATH');
-                putenv('PATH='.$_SERVER['PATH']);
+            if (isset($_SERVER[$pathStr]) && !preg_match('{(^|'.PATH_SEPARATOR.')'.preg_quote($binDir).'($|'.PATH_SEPARATOR.')}', $_SERVER[$pathStr])) {
+                $_SERVER[$pathStr] = $binDir.PATH_SEPARATOR.getenv($pathStr);
+                putenv($pathStr.'='.$_SERVER[$pathStr]);
             }
         }