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

PoolBuilder: Move merging of constaints to be loaded into relevant section

pull/8850/head
Nils Adermann 2020-09-01 12:28:22 +02:00
parent b2670945bd
commit 7b990f3767
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,22 +265,22 @@ class PoolBuilder
$constraint = $rootRequires[$name]; $constraint = $rootRequires[$name];
} }
// Maybe it was already marked before but not loaded yet. In that case
// we have to extend the constraint (we don't check if they are identical because
// MultiConstraint::create() will optimize anyway)
if (isset($this->packagesToLoad[$name])) {
// Already marked for loading and this does not expand the constraint to be loaded, nothing to do
if (Intervals::isSubsetOf($constraint, $this->packagesToLoad[$name])) {
return;
}
// extend the constraint to be loaded
$constraint = Intervals::compactConstraint(MultiConstraint::create(array($this->packagesToLoad[$name], $constraint), false));
}
// Not yet loaded or already marked for a reload, override the existing constraint // Not yet loaded or already marked for a reload, override the existing constraint
// (either it's a new one to load, or it has already been extended above) // (either it's a new one to load, or it has already been extended above)
if (!isset($this->loadedPackages[$name])) { if (!isset($this->loadedPackages[$name])) {
// Maybe it was already marked before but not loaded yet. In that case
// we have to extend the constraint (we don't check if they are identical because
// MultiConstraint::create() will optimize anyway)
if (isset($this->packagesToLoad[$name])) {
// Already marked for loading and this does not expand the constraint to be loaded, nothing to do
if (Intervals::isSubsetOf($constraint, $this->packagesToLoad[$name])) {
return;
}
// extend the constraint to be loaded
$constraint = Intervals::compactConstraint(MultiConstraint::create(array($this->packagesToLoad[$name], $constraint), false));
}
$this->packagesToLoad[$name] = $constraint; $this->packagesToLoad[$name] = $constraint;
return; return;
} }