Skip to content
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

Jump to bottom

Fixed base package replacers being removed incorrectly #11629

Merged
merged 3 commits into from
Sep 13, 2023
Merged

Fixed base package replacers being removed incorrectly #11629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91d3dd7
Fixed base package replacers being removed incorrectly
Toflar Sep 11, 2023
c466ab0
Re-use isRootRequire()
Toflar Sep 12, 2023
9b60d18
Test case for loading packages replaced by old versions of requirements
naderman Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Composer/DependencyResolver/PoolBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,10 @@ private function unlockPackage(Request $request, array $repositories, string $na

private function markPackageNameForLoadingIfRequired(Request $request, string $name): void
{
if ($this->isRootRequire($request, $name)) {
$this->markPackageNameForLoading($request, $name, $request->getRequires()[$name]);
}

foreach ($this->packages as $package) {
foreach ($package->getRequires() as $link) {
if ($name === $link->getTarget()) {
Expand Down
49 changes: 49 additions & 0 deletions ...pendencyResolver/Fixtures/poolbuilder/load-replaced-root-package-if-replacer-dropped.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
--TEST--
Ensure that a root package gets loaded which is replaced by old versions of another requirement

--REQUEST--
{
"require": {
"root/dep": "*",
"replaced/pkg": "1.0.0"
},
"locked": [
{"name": "root/dep", "version": "1.1.0", "require": {"replacer/pkg": "1.*"}},
{"name": "replacer/pkg", "version": "1.1.0"},
{"name": "replaced/pkg", "version": "1.0.0"}
],
"allowList": [
"root/dep"
],
"allowTransitiveDeps": true
}

--FIXED--
[
]

--PACKAGE-REPOS--
[
[
{"name": "root/dep", "version": "1.2.0", "require": {"replacer/pkg": "1.*"}},
{"name": "replacer/pkg", "version": "1.0.0", "replace": {"replaced/pkg": "1.0.0"}},
{"name": "replacer/pkg", "version": "1.1.0"},
{"name": "replaced/pkg", "version": "1.0.0"}
]
]

--EXPECT--
[
"replaced/pkg-1.0.0.0",
"replacer/pkg-1.0.0.0",
"replacer/pkg-1.1.0.0",
"root/dep-1.2.0.0"
]

--EXPECT-OPTIMIZED--
[
"replaced/pkg-1.0.0.0",
"replacer/pkg-1.0.0.0",
"replacer/pkg-1.1.0.0",
"root/dep-1.2.0.0"
]
2 changes: 2 additions & 0 deletions ...r/Test/DependencyResolver/Fixtures/poolbuilder/multi-repo-replace-partial-update-all.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ Check that replacers from additional repositories are loaded when doing a partia

--EXPECT--
[
"base/package-1.0.0.0",
"indirect/replacer-1.2.0.0",
"indirect/replacer-1.0.0.0",
"replacer/package-1.2.0.0",
Expand All @@ -107,6 +108,7 @@ Check that replacers from additional repositories are loaded when doing a partia

--EXPECT-OPTIMIZED--
[
"base/package-1.0.0.0",
"indirect/replacer-1.2.0.0",
"indirect/replacer-1.0.0.0",
"replacer/package-1.2.0.0",
Expand Down