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

PoolBuilder: never mark skipped packages for loading 

Reorder code in loadPackage to avoid duplicate calls
pull/9360/head
Nils Adermann 2020-10-28 13:57:18 +01:00
parent 63bed40818
commit 2d91fbc65a
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,26 +371,22 @@ class PoolBuilder
$require = $link->getTarget(); $require = $link->getTarget();
$linkConstraint = $link->getConstraint(); $linkConstraint = $link->getConstraint();
if ($propagateUpdate) { // if the required package is loaded as a locked package only and hasn't had its deps analyzed
// if this is a partial update with transitive dependencies we need to unlock the package we now know is a if (isset($this->skippedLoad[$require])) {
// if we're doing a full update or this is a partial update with transitive deps and we're currently
// looking at a package which needs to be updated we need to unlock the package we now know is a
// dependency of another package which we are trying to update, and then attempt to load it again // dependency of another package which we are trying to update, and then attempt to load it again
if ($request->getUpdateAllowTransitiveDependencies() && isset($this->skippedLoad[$require])) { if ($propagateUpdate && $request->getUpdateAllowTransitiveDependencies()) {
if ($request->getUpdateAllowTransitiveRootDependencies() || !$this->isRootRequire($request, $this->skippedLoad[$require])) { if ($request->getUpdateAllowTransitiveRootDependencies() || !$this->isRootRequire($request, $this->skippedLoad[$require])) {
$this->unlockPackage($request, $require); $this->unlockPackage($request, $require);
$this->markPackageNameForLoading($request, $require, $linkConstraint); $this->markPackageNameForLoading($request, $require, $linkConstraint);
} elseif (!$request->getUpdateAllowTransitiveRootDependencies() && $this->isRootRequire($request, $require) && !isset($this->updateAllowWarned[$require])) { } elseif (!isset($this->updateAllowWarned[$this->skippedLoad[$require]])) {
$this->updateAllowWarned[$require] = true; $this->updateAllowWarned[$this->skippedLoad[$require]] = true;
$this->io->writeError('<warning>Dependency "'.$require.'" is also a root requirement. Package has not been listed as an update argument, so keeping locked at old version. Use --with-all-dependencies (-W) to include root dependencies.</warning>'); $this->io->writeError('<warning>Dependency "'.$this->skippedLoad[$require].'" is also a root requirement. Package has not been listed as an update argument, so keeping locked at old version. Use --with-all-dependencies (-W) to include root dependencies.</warning>');
} }
} else {
$this->markPackageNameForLoading($request, $require, $linkConstraint);
} }
} else { } else {
// We also need to load the requirements of a locked package $this->markPackageNameForLoading($request, $require, $linkConstraint);
// unless it was skipped
if (!isset($this->skippedLoad[$require])) {
$this->markPackageNameForLoading($request, $require, $linkConstraint);
}
} }
} }