diff options
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/shirabe/src/installer.rs | 6 | ||||
| -rw-r--r-- | crates/shirabe/src/package/locker.rs | 11 | ||||
| -rw-r--r-- | crates/shirabe/tests/installer_test.rs | 4 |
3 files changed, 8 insertions, 13 deletions
diff --git a/crates/shirabe/src/installer.rs b/crates/shirabe/src/installer.rs index 6d943ea7..cfe2432c 100644 --- a/crates/shirabe/src/installer.rs +++ b/crates/shirabe/src/installer.rs @@ -1373,16 +1373,10 @@ impl Installer { .borrow_mut() .get_minimum_stability() .unwrap_or_else(|_| String::new()); - // locker stores stability flags as stringified ints; recover the int form here. stability_flags = self .locker .borrow_mut() .get_stability_flags() - .map(|m| { - m.into_iter() - .map(|(k, v)| (k, v.parse::<i64>().unwrap_or(0))) - .collect() - }) .unwrap_or_default(); let mut tmp: IndexMap<String, AnyConstraint> = IndexMap::new(); diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs index f7542d1f..535b5fdf 100644 --- a/crates/shirabe/src/package/locker.rs +++ b/crates/shirabe/src/package/locker.rs @@ -350,8 +350,9 @@ impl Locker { .to_string()) } - /// @return array<string, string> - pub fn get_stability_flags(&mut self) -> anyhow::Result<IndexMap<String, String>> { + /// @return array<string, int> despite the upstream `@return array<string, string>` docblock; + /// the values are BasePackage::STABILITIES ints, written verbatim by set_lock_data. + pub fn get_stability_flags(&mut self) -> anyhow::Result<IndexMap<String, i64>> { let lock_data = self.get_lock_data()?; Ok(lock_data @@ -359,7 +360,7 @@ impl Locker { .and_then(|v| match v { PhpMixed::Array(m) => Some( m.iter() - .map(|(k, v)| (k.clone(), v.as_string().unwrap_or("").to_string())) + .map(|(k, v)| (k.clone(), v.as_int().unwrap_or(0))) .collect(), ), _ => None, @@ -1016,7 +1017,7 @@ pub trait LockerInterface: std::fmt::Debug { fn get_dev_package_names(&mut self) -> anyhow::Result<Vec<String>>; fn get_platform_requirements(&mut self, with_dev_reqs: bool) -> anyhow::Result<Vec<Link>>; fn get_minimum_stability(&mut self) -> anyhow::Result<String>; - fn get_stability_flags(&mut self) -> anyhow::Result<IndexMap<String, String>>; + fn get_stability_flags(&mut self) -> anyhow::Result<IndexMap<String, i64>>; fn get_prefer_stable(&mut self) -> anyhow::Result<Option<bool>>; fn get_prefer_lowest(&mut self) -> anyhow::Result<Option<bool>>; fn get_platform_overrides(&mut self) -> anyhow::Result<IndexMap<String, String>>; @@ -1084,7 +1085,7 @@ impl LockerInterface for Locker { self.get_minimum_stability() } - fn get_stability_flags(&mut self) -> anyhow::Result<IndexMap<String, String>> { + fn get_stability_flags(&mut self) -> anyhow::Result<IndexMap<String, i64>> { self.get_stability_flags() } diff --git a/crates/shirabe/tests/installer_test.rs b/crates/shirabe/tests/installer_test.rs index c8b47b86..b4dc3811 100644 --- a/crates/shirabe/tests/installer_test.rs +++ b/crates/shirabe/tests/installer_test.rs @@ -1331,7 +1331,7 @@ pool_optimizer_test! { pool_optimizer_conflict_downgrade_nested => "conflict-downgrade-nested.test"; pool_optimizer_conflict_downgrade => "conflict-downgrade.test"; pool_optimizer_conflict_on_root_with_alias_prevents_update_if_not_required => "conflict-on-root-with-alias-prevents-update-if-not-required.test"; - pool_optimizer_conflict_with_alias_in_lock_does_prevents_install => "conflict-with-alias-in-lock-does-prevents-install.test", ignore = "TODO(phase-d): known-failing fixture under COMPOSER_POOL_OPTIMIZER=1"; + pool_optimizer_conflict_with_alias_in_lock_does_prevents_install => "conflict-with-alias-in-lock-does-prevents-install.test"; pool_optimizer_conflict_with_alias_prevents_update_if_not_required => "conflict-with-alias-prevents-update-if-not-required.test"; pool_optimizer_conflict_with_alias_prevents_update => "conflict-with-alias-prevents-update.test"; pool_optimizer_conflict_with_all_dependencies_option_dont_recommend_to_use_it => "conflict-with-all-dependencies-option-dont-recommend-to-use-it.test"; @@ -1521,7 +1521,7 @@ raw_pool_test! { raw_pool_conflict_downgrade_nested => "conflict-downgrade-nested.test"; raw_pool_conflict_downgrade => "conflict-downgrade.test"; raw_pool_conflict_on_root_with_alias_prevents_update_if_not_required => "conflict-on-root-with-alias-prevents-update-if-not-required.test"; - raw_pool_conflict_with_alias_in_lock_does_prevents_install => "conflict-with-alias-in-lock-does-prevents-install.test", ignore = "TODO(phase-d): known-failing fixture under COMPOSER_POOL_OPTIMIZER=0"; + raw_pool_conflict_with_alias_in_lock_does_prevents_install => "conflict-with-alias-in-lock-does-prevents-install.test"; raw_pool_conflict_with_alias_prevents_update_if_not_required => "conflict-with-alias-prevents-update-if-not-required.test"; raw_pool_conflict_with_alias_prevents_update => "conflict-with-alias-prevents-update.test"; raw_pool_conflict_with_all_dependencies_option_dont_recommend_to_use_it => "conflict-with-all-dependencies-option-dont-recommend-to-use-it.test"; |