Skip to content

Remove optional package loading to simplify pool builder #11450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2023
Merged

Remove optional package loading to simplify pool builder #11450

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 6 additions & 25 deletions src/Composer/DependencyResolver/PoolBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@ class PoolBuilder
* @phpstan-var array<int, array<string, array<string, PackageInterface>>>
*/
private $loadedPerRepo = [];
/**
* @var array[]
* @phpstan-var array<string, bool>
*/
private $optionalPackages = [];
/**
* @var BasePackage[]
*/
Expand Down Expand Up @@ -240,9 +235,8 @@ public function buildPool(array $repositories, Request $request): Pool
}
}

while ([] !== $this->packagesToLoad || [] !== $this->optionalPackages) {
while (!empty($this->packagesToLoad)) {
$this->loadPackagesMarkedForLoading($request, $repositories);
$this->loadOptionalPackages($request);
}

if (\count($this->temporaryConstraints) > 0) {
Expand Down Expand Up @@ -489,8 +483,8 @@ private function loadPackage(Request $request, array $repositories, BasePackage

if ($request->getUpdateAllowTransitiveRootDependencies() || !$skippedRootRequires) {
$this->unlockPackage($request, $repositories, $replace);
// Mark as optional - if no other package requires it, we don't need to load it
$this->markPackageNameForOptionalLoading($replace);
// the replaced package only needs to be loaded if something else requires it
$this->markPackageNameForLoadingIfRequired($request, $replace);
} else {
foreach ($skippedRootRequires as $rootRequire) {
if (!isset($this->updateAllowWarned[$rootRequire])) {
Expand Down Expand Up @@ -662,9 +656,7 @@ private function unlockPackage(Request $request, array $repositories, string $na
foreach ($lockedPackage->getReplaces() as $replace) {
if (isset($requires[$replace->getTarget()], $this->skippedLoad[$replace->getTarget()])) {
$this->unlockPackage($request, $repositories, $replace->getTarget());
// Do not call markPackageNameForOptionalLoading() here, we know that $lockedPackage is already
// part of $this->packages, and we check for $requires[$replace->getTarget()] so we're guaranteed
// to require this package.
// this package is in $requires so no need to call markPackageNameForLoadingIfRequired
$this->markPackageNameForLoading($request, $replace->getTarget(), $replace->getConstraint());
}
}
Expand All @@ -675,26 +667,15 @@ private function unlockPackage(Request $request, array $repositories, string $na
}
}

private function markPackageNameForOptionalLoading(string $name): void
private function markPackageNameForLoadingIfRequired(Request $request, string $name): void
{
$this->optionalPackages[$name] = true;
}

private function loadOptionalPackages(Request $request): void
{
if ([] === $this->optionalPackages) {
return;
}

foreach ($this->packages as $package) {
foreach ($package->getRequires() as $link) {
if (isset($this->optionalPackages[$link->getTarget()])) {
if ($name === $link->getTarget()) {
$this->markPackageNameForLoading($request, $link->getTarget(), $link->getConstraint());
}
}
}

$this->optionalPackages = [];
}

/**
Expand Down