Merge branch '2.2' into main

bin/composer

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

src/Composer/DependencyResolver/PoolBuilder.php

@@ -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 {
                 $this->markPackageNameForLoading($request, $require, $linkConstraint);