diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-06-08 04:22:49 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-06-08 04:23:11 +0900 |
| commit | 632c9793927a30c4bca3c91888e66b369d732dfe (patch) | |
| tree | 5bafb9d7fa2523d5a2f8d70ff59c3173e962e389 /crates/shirabe/src/dependency_resolver/rule_set_generator.rs | |
| parent | 243450fee9853c2fea66ae0642dabb8db5227d6f (diff) | |
| download | php-shirabe-632c9793927a30c4bca3c91888e66b369d732dfe.tar.gz php-shirabe-632c9793927a30c4bca3c91888e66b369d732dfe.tar.zst php-shirabe-632c9793927a30c4bca3c91888e66b369d732dfe.zip | |
feat(phase-c): resolve PhpMixed-conversion phase-b TODOs
Implement the foundational PhpMixed conversion infrastructure
(From<bool|i64|f64|String>, order-sensitive PartialEq matching PHP ===)
and resolve the category-G phase-b TODOs that depend on it:
- Fix VCS driver cache paths that discarded parsed JSON or diverged on
null caches (svn/forgejo/gitlab/git-bitbucket/github).
- Wire up real conversions previously stubbed or dropped: suggests
platform config, audit ignore-severities, composer_repository search
and ProviderInfo, class_loader prefix/classmap merges, locker lock
diff comparison, advisory JSON serialization, SPDX license fields.
- Make GenericRule take a typed ReasonData; populate RULE_ROOT_REQUIRE
with the constraint and convert PhpMixed at the call sites.
Diffstat (limited to 'crates/shirabe/src/dependency_resolver/rule_set_generator.rs')
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/rule_set_generator.rs | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs index 048a5f5..295160c 100644 --- a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs +++ b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs @@ -67,8 +67,8 @@ impl RuleSetGenerator { Some(GenericRule::new( literals, - PhpMixed::Int(reason), - reason_data, + reason, + rule::ReasonData::from(reason_data), )) } @@ -83,7 +83,7 @@ impl RuleSetGenerator { reason_data: PhpMixed, ) -> GenericRule { let literals: Vec<i64> = packages.iter().map(|p| p.get_id()).collect(); - GenericRule::new(literals, PhpMixed::Int(reason), reason_data) + GenericRule::new(literals, reason, rule::ReasonData::from(reason_data)) } /// Creates a rule for two conflicting packages. @@ -368,19 +368,14 @@ impl RuleSetGenerator { self.add_rules_for_package(package.clone(), platform_requirement_filter); } - let mut reason_data: IndexMap<String, Box<PhpMixed>> = IndexMap::new(); - reason_data.insert( - "packageName".to_string(), - Box::new(PhpMixed::String(package_name.clone())), - ); - reason_data.insert( - "constraint".to_string(), - Box::new(PhpMixed::Null), // reasonData: $constraint (ConstraintInterface) - ); - let rule = self.create_install_one_of_rule( - &packages, + let literals: Vec<i64> = packages.iter().map(|p| p.get_id()).collect(); + let rule = GenericRule::new( + literals, rule::RULE_ROOT_REQUIRE, - PhpMixed::Array(reason_data), + rule::ReasonData::RootRequire { + package_name: package_name.clone(), + constraint: constraint.clone(), + }, ); self.add_rule(RuleSet::TYPE_REQUEST, Some(Rule::Generic(rule))); } |
