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

Merge branch '2.2' into main

pull/10449/head
Jordi Boggiano 2022-01-07 13:59:04 +01:00
parent 9466e68ac7 d9619985db
commit 3d6bf8c98d
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/composer
View File

@ -67,8 +67,12 @@ if (function_exists('ini_set')) {
// Workaround PHP bug on Windows where env vars containing Unicode chars are mangled in $_SERVER // Workaround PHP bug on Windows where env vars containing Unicode chars are mangled in $_SERVER
// see https://github.com/php/php-src/issues/7896 // see https://github.com/php/php-src/issues/7896
if (Platform::isWindows()) { if (PHP_VERSION_ID >= 70113 && Platform::isWindows()) {
$_SERVER = array_merge($_SERVER, array_intersect_ukey($_SERVER, getenv(), 'strcasecmp')); foreach ($_SERVER as $serverVar => $serverVal) {
if (($serverVal = getenv($serverVar)) !== false) {
$_SERVER[$serverVar] = $serverVal;
}
}
} }
Platform::putEnv('COMPOSER_BINARY', realpath($_SERVER['argv'][0])); Platform::putEnv('COMPOSER_BINARY', realpath($_SERVER['argv'][0]));

4
src/Composer/DependencyResolver/PoolBuilder.php
View File

@ -459,6 +459,10 @@ class PoolBuilder
} }
} }
} }
} elseif (isset($this->pathRepoUnlocked[$require]) && !isset($this->loadedPackages[$require])) {
// if doing a partial update and a package depends on a path-repo-unlocked package which is not referenced by the root, we need to ensure it gets loaded as it was not loaded by the request's root requirements
// and would not be loaded above if update propagation is not allowed (which happens if the requirer is itself a path-repo-unlocked package) or if transitive deps are not allowed to be unlocked
$this->markPackageNameForLoading($request, $require, $linkConstraint);
} }
} else { } else {
$this->markPackageNameForLoading($request, $require, $linkConstraint); $this->markPackageNameForLoading($request, $require, $linkConstraint);