Browse Source

Merge pull request #3884 from frederikbosch/auth-fix-chh

Fix #3813,  #3830
Jordi Boggiano 10 years ago
parent
commit
f10c714751
2 changed files with 6 additions and 1 deletions
  1. 5 0
      src/Composer/Util/Git.php
  2. 1 1
      src/Composer/Util/ProcessExecutor.php

+ 5 - 0
src/Composer/Util/Git.php

@@ -177,6 +177,11 @@ class Git
             unset($_SERVER['GIT_WORK_TREE']);
         }
 
+        // Run processes with predictable LANGUAGE
+        if (getenv('LANGUAGE') !== 'C') {
+            putenv('LANGUAGE=C');
+        }
+
         // clean up env for OSX, see https://github.com/composer/composer/issues/2146#issuecomment-35478940
         putenv("DYLD_LIBRARY_PATH");
         unset($_SERVER['DYLD_LIBRARY_PATH']);

+ 1 - 1
src/Composer/Util/ProcessExecutor.php

@@ -56,7 +56,7 @@ class ProcessExecutor
 
         $this->captureOutput = count(func_get_args()) > 1;
         $this->errorOutput = null;
-        $process = new Process($command, $cwd, array_replace($_ENV, $_SERVER, array('LANGUAGE' => 'C')), null, static::getTimeout());
+        $process = new Process($command, $cwd, null, null, static::getTimeout());
 
         $callback = is_callable($output) ? $output : array($this, 'outputHandler');
         $process->run($callback);