public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge branch '1.10'

pull/9651/head
Jordi Boggiano 2021-01-26 15:56:49 +01:00
parent 6c346d00f3 2cb9630320
commit 125f8a3319
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/EventDispatcher/EventDispatcher.php
View File

@ -243,6 +243,8 @@ class EventDispatcher
if (strpos($exec, '@putenv ') === 0) { if (strpos($exec, '@putenv ') === 0) {
putenv(substr($exec, 8)); putenv(substr($exec, 8));
list($var, $value) = explode('=', substr($exec, 8), 2);
$_SERVER[$var] = $value;
continue; continue;
} }

3
src/Composer/Util/Git.php
View File

@ -354,7 +354,7 @@ class Git
// added in git 1.7.1, prevents prompting the user for username/password // added in git 1.7.1, prevents prompting the user for username/password
if (getenv('GIT_ASKPASS') !== 'echo') { if (getenv('GIT_ASKPASS') !== 'echo') {
putenv('GIT_ASKPASS=echo'); putenv('GIT_ASKPASS=echo');
unset($_SERVER['GIT_ASKPASS']); $_SERVER['GIT_ASKPASS'] = 'echo';
} }
// clean up rogue git env vars in case this is running in a git hook // clean up rogue git env vars in case this is running in a git hook
@ -370,6 +370,7 @@ class Git
// Run processes with predictable LANGUAGE // Run processes with predictable LANGUAGE
if (getenv('LANGUAGE') !== 'C') { if (getenv('LANGUAGE') !== 'C') {
putenv('LANGUAGE=C'); putenv('LANGUAGE=C');
$_SERVER['LANGUAGE'] = 'C';
} }
// clean up env for OSX, see https://github.com/composer/composer/issues/2146#issuecomment-35478940 // clean up env for OSX, see https://github.com/composer/composer/issues/2146#issuecomment-35478940