diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-06-08 11:26:03 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-06-08 11:26:03 +0900 |
| commit | e5b789616ec4c1cbd152c5ccbefe2d27ced4a18f (patch) | |
| tree | 7a713cf1bcec30a1c69d5c434d8df6a7525dcbc2 /crates/shirabe/src/repository/repository_set.rs | |
| parent | 7439cdb08afe0882186a34f70c1e8878fcb7dca5 (diff) | |
| download | php-shirabe-e5b789616ec4c1cbd152c5ccbefe2d27ced4a18f.tar.gz php-shirabe-e5b789616ec4c1cbd152c5ccbefe2d27ced4a18f.tar.zst php-shirabe-e5b789616ec4c1cbd152c5ccbefe2d27ced4a18f.zip | |
feat(phase-c): resolve PHP-array-semantics phase-b TODOs
Resolve category K (array_* functions, integer keys, nested mutation,
sorting). Add shim variants (uasort over Vec<T>, uasort_map for IndexMap)
and delegate to existing typed variants (strtr_array, array_merge_map,
array_search_in_vec). Implement PHP array semantics directly where the
shape is fixed: canonical integer-key coercion (is_php_integer_key,
shared by config and FilesystemRepository::dumpToPhpCode), strict
array_search via trait-object pointer identity, array_reverse/array_chunk
preserve_keys loops, and the installed.php nested version mutations via
auto-vivify helpers.
Resolving the array_merge in UpdateCommand unmasked latent borrow bugs in
execute's tail (Rc input/output moved by value); fixed with .clone() to
match PHP reference sharing, and resolved the tightly-coupled Intervals
constraint check.
composerRequire reclassified to phase-c: it depends on the $GLOBALS
superglobal and PHP's require include mechanism, neither portable.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/repository/repository_set.rs')
| -rw-r--r-- | crates/shirabe/src/repository/repository_set.rs | 16 |
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) |
