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/config.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/config.rs')
| -rw-r--r-- | crates/shirabe/src/config.rs | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/crates/shirabe/src/config.rs b/crates/shirabe/src/config.rs index e036625..5333173 100644 --- a/crates/shirabe/src/config.rs +++ b/crates/shirabe/src/config.rs @@ -512,8 +512,7 @@ impl Config { } // store repo - // TODO(phase-b): is_int($name) where $name is an IndexMap key (PHP string-or-int) - let is_numeric_name = name.parse::<i64>().is_ok(); + let is_numeric_name = is_php_integer_key(name); if is_numeric_name { if !self.repositories.contains_key(name) { self.repositories.insert(name.clone(), repository.clone()); @@ -1278,3 +1277,22 @@ impl Config { ProcessExecutor::set_timeout(0); } } + +/// Whether a string array key would have been coerced to an integer key by PHP. +/// +/// PHP stores a string array key as an integer when it is a canonical decimal +/// representation: "0", or an optionally negative sequence of digits with no +/// leading zero and no leading plus sign, that fits in a platform integer. +pub(crate) fn is_php_integer_key(key: &str) -> bool { + if key == "0" { + return true; + } + let digits = key.strip_prefix('-').unwrap_or(key); + if digits.is_empty() || digits.as_bytes()[0] == b'0' { + return false; + } + if !digits.bytes().all(|b| b.is_ascii_digit()) { + return false; + } + key.parse::<i64>().is_ok() +} |
