aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/mozart-registry
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-05-02 22:59:23 +0900
committernsfisis <nsfisis@gmail.com>2026-05-02 22:59:23 +0900
commitb60cf8d9cb6776e5df85f080b5bb3fba252e154c (patch)
tree66770723795378fc65f1aeab726973b18813aef8 /crates/mozart-registry
parent3c61a7e1e557e3b90128d2ec29227f166b17c05b (diff)
downloadphp-mozart-b60cf8d9cb6776e5df85f080b5bb3fba252e154c.tar.gz
php-mozart-b60cf8d9cb6776e5df85f080b5bb3fba252e154c.tar.zst
php-mozart-b60cf8d9cb6776e5df85f080b5bb3fba252e154c.zip
fix(resolver): honor root self-provide/replace as require fulfilment
Port Composer's RuleSetGenerator::createRequireRule self-fulfilling branch: when the root composer.json's `provide` or `replace` covers a name it also requires (with intersecting constraints), skip emitting an install-one-of rule for that root require. Composer relies on the root package being a fixed entry in the pool so whatProvides() includes it; Mozart does not yet add the root to the pool, so the same decision is made via explicit `root_provide` / `root_replace` tables threaded through ResolveRequest. Without this, an inline repo package whose name matches the root's provide was being force-installed. Fixes installer fixtures `provider_satisfies_its_own_requirement` and `replacer_satisfies_its_own_requirement`.
Diffstat (limited to 'crates/mozart-registry')
-rw-r--r--crates/mozart-registry/src/lockfile.rs2
-rw-r--r--crates/mozart-registry/src/resolver.rs20
2 files changed, 20 insertions, 2 deletions
diff --git a/crates/mozart-registry/src/lockfile.rs b/crates/mozart-registry/src/lockfile.rs
index 045b189..99e87c8 100644
--- a/crates/mozart-registry/src/lockfile.rs
+++ b/crates/mozart-registry/src/lockfile.rs
@@ -1400,6 +1400,8 @@ mod tests {
))),
temporary_constraints: HashMap::new(),
raw_repositories: vec![],
+ root_provide: HashMap::new(),
+ root_replace: HashMap::new(),
};
let resolved = resolve(&resolve_request)
diff --git a/crates/mozart-registry/src/resolver.rs b/crates/mozart-registry/src/resolver.rs
index a83304f..e8076b4 100644
--- a/crates/mozart-registry/src/resolver.rs
+++ b/crates/mozart-registry/src/resolver.rs
@@ -569,6 +569,15 @@ pub struct ResolveRequest {
/// preload that still live in `resolve()` (Step B follow-up will move
/// these through `RepositorySet` too).
pub raw_repositories: Vec<RawRepository>,
+ /// Root composer.json's `provide` map (target → constraint string). Drives
+ /// the self-fulfilling-rule check in the SAT generator: when a root
+ /// `require` names something the root itself `provide`s with a matching
+ /// constraint, no install-one-of rule is emitted, mirroring Composer's
+ /// `RuleSetGenerator::createRequireRule` self-fulfillment branch.
+ pub root_provide: HashMap<String, String>,
+ /// Root composer.json's `replace` map. Same role as `root_provide` for the
+ /// `replace` link: a replaced target counts as fulfilled by the root.
+ pub root_replace: HashMap<String, String>,
}
/// A single package in the resolution output.
@@ -848,7 +857,12 @@ pub async fn resolve(request: &ResolveRequest) -> Result<Vec<ResolvedPackage>, R
let mut generator = RuleSetGenerator::new(&mut pool);
generator.set_ignore_platform_reqs(ignore_set);
generator.set_ignore_all_platform_reqs(request.ignore_platform_reqs);
- let rules = generator.generate(&root_requires, &fixed_ids);
+ let rules = generator.generate(
+ &root_requires,
+ &fixed_ids,
+ &request.root_provide,
+ &request.root_replace,
+ );
// Create policy and solve
let policy = DefaultPolicy::new(request.prefer_stable, request.prefer_lowest);
@@ -1247,7 +1261,7 @@ mod tests {
requires.insert("foo/foo".to_string(), Some("^1.0".to_string()));
let generator = RuleSetGenerator::new(&mut pool);
- let rules = generator.generate(&requires, &[]);
+ let rules = generator.generate(&requires, &[], &HashMap::new(), &HashMap::new());
let policy = DefaultPolicy::default();
let solver = Solver::new(rules, &pool, policy, HashSet::new());
@@ -1282,6 +1296,8 @@ mod tests {
))),
temporary_constraints: HashMap::new(),
raw_repositories: vec![],
+ root_provide: HashMap::new(),
+ root_replace: HashMap::new(),
};
let result = resolve(&request).await;