diff options
Diffstat (limited to 'crates/shirabe/src/repository')
| -rw-r--r-- | crates/shirabe/src/repository/filesystem_repository.rs | 15 | ||||
| -rw-r--r-- | crates/shirabe/src/repository/vcs/vcs_driver.rs | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/crates/shirabe/src/repository/filesystem_repository.rs b/crates/shirabe/src/repository/filesystem_repository.rs index d9d3289..4e752d9 100644 --- a/crates/shirabe/src/repository/filesystem_repository.rs +++ b/crates/shirabe/src/repository/filesystem_repository.rs @@ -284,8 +284,10 @@ impl FilesystemRepository { } // PHP: sort($data['dev-package-names']); - if let Some(PhpMixed::List(_list)) = data.get_mut("dev-package-names") { - // TODO(phase-b): sort PhpMixed::List in-place using string comparison; PhpMixed: !Ord. + if let Some(PhpMixed::List(list)) = data.get_mut("dev-package-names") { + usort(list, |a: &Box<PhpMixed>, b: &Box<PhpMixed>| -> i64 { + shirabe_php_shim::strcmp(a.as_string().unwrap_or(""), b.as_string().unwrap_or("")) + }); } // PHP: usort($data['packages'], static function ($a, $b): int { return strcmp($a['name'], $b['name']); }); if let Some(PhpMixed::List(list)) = data.get_mut("packages") { @@ -611,9 +613,14 @@ impl FilesystemRepository { if let PhpMixed::Array(version_map) = version.as_mut() { for key in ["aliases", "replaced", "provided"] { if let Some(boxed) = version_map.get_mut(key) { - if let PhpMixed::List(_list) = boxed.as_mut() { + if let PhpMixed::List(list) = boxed.as_mut() { // PHP: sort($versions['versions'][$name][$key], SORT_NATURAL); - // TODO(phase-b): PhpMixed lacks Ord; needs custom comparator. + usort(list, |a: &Box<PhpMixed>, b: &Box<PhpMixed>| -> i64 { + shirabe_php_shim::strnatcmp( + a.as_string().unwrap_or(""), + b.as_string().unwrap_or(""), + ) + }); } } } diff --git a/crates/shirabe/src/repository/vcs/vcs_driver.rs b/crates/shirabe/src/repository/vcs/vcs_driver.rs index d87924a..94c3ff8 100644 --- a/crates/shirabe/src/repository/vcs/vcs_driver.rs +++ b/crates/shirabe/src/repository/vcs/vcs_driver.rs @@ -74,7 +74,6 @@ impl VcsDriverBase { .get("options") .cloned() .unwrap_or(PhpMixed::Array(IndexMap::new())); - // TODO(phase-b): convert PhpMixed::Array options into IndexMap<String, PhpMixed> properly. let options: IndexMap<String, PhpMixed> = match options_mixed { PhpMixed::Array(a) => a.into_iter().map(|(k, v)| (k, *v)).collect(), _ => IndexMap::new(), @@ -216,7 +215,6 @@ pub trait VcsDriver: VcsDriverInterface { if self.should_cache(identifier) { if let Some(res) = self.cache_mut().and_then(|c| c.read(identifier)) { let parsed = JsonFile::parse_json(Some(&res), None)?; - // TODO(phase-b): unwrap PhpMixed::Array into IndexMap<String, PhpMixed>. let parsed_map: Option<IndexMap<String, PhpMixed>> = match parsed { PhpMixed::Array(a) => Some(a.into_iter().map(|(k, v)| (k, *v)).collect()), _ => None, @@ -273,7 +271,6 @@ pub trait VcsDriver: VcsDriverInterface { Some(&format!("{}:composer.json", identifier)), )?; - // TODO(phase-b): unwrap PhpMixed::Array into IndexMap<String, PhpMixed>. let mut composer: IndexMap<String, PhpMixed> = match composer { PhpMixed::Array(a) if !a.is_empty() => a.into_iter().map(|(k, v)| (k, *v)).collect(), _ => return Ok(None), @@ -315,7 +312,6 @@ pub trait VcsDriver: VcsDriverInterface { .get("options") .cloned() .unwrap_or(PhpMixed::Array(IndexMap::new())); - // TODO(phase-b): convert PhpMixed::Array options into IndexMap<String, PhpMixed> properly. let options: IndexMap<String, PhpMixed> = match options_mixed { PhpMixed::Array(a) => a.into_iter().map(|(k, v)| (k, *v)).collect(), _ => IndexMap::new(), |