aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/repository/repository_set.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/src/repository/repository_set.rs')
-rw-r--r--crates/shirabe/src/repository/repository_set.rs16
1 files changed, 7 insertions, 9 deletions
diff --git a/crates/shirabe/src/repository/repository_set.rs b/crates/shirabe/src/repository/repository_set.rs
index aa5f128..f632fbc 100644
--- a/crates/shirabe/src/repository/repository_set.rs
+++ b/crates/shirabe/src/repository/repository_set.rs
@@ -5,8 +5,7 @@ use std::any::Any;
use anyhow::Result;
use indexmap::IndexMap;
use shirabe_php_shim::{
- LogicException, PhpMixed, RuntimeException, array_merge, array_merge_recursive, ksort,
- strtolower,
+ LogicException, PhpMixed, RuntimeException, array_merge, ksort, strtolower,
};
use shirabe_semver::constraint::AnyConstraint;
use shirabe_semver::constraint::MatchAllConstraint;
@@ -411,13 +410,12 @@ impl RepositorySet {
}
}
- let mut advisories = if !repo_advisories.is_empty() {
- // PHP: array_merge_recursive([], ...$repoAdvisories)
- // TODO(phase-b): array_merge_recursive signature expects PhpMixed arguments
- todo!("array_merge_recursive across repo_advisories")
- } else {
- IndexMap::new()
- };
+ let mut advisories: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new();
+ for repo in repo_advisories {
+ for (name, list) in repo {
+ advisories.entry(name).or_default().extend(list);
+ }
+ }
ksort(&mut advisories);
Ok(advisories)