diff options
| -rw-r--r-- | crates/shirabe/src/package/dumper/array_dumper.rs | 16 | ||||
| -rw-r--r-- | crates/shirabe/tests/installer_test.rs | 4 |
2 files changed, 4 insertions, 16 deletions
diff --git a/crates/shirabe/src/package/dumper/array_dumper.rs b/crates/shirabe/src/package/dumper/array_dumper.rs index 6688ad5e..85021a87 100644 --- a/crates/shirabe/src/package/dumper/array_dumper.rs +++ b/crates/shirabe/src/package/dumper/array_dumper.rs @@ -71,13 +71,7 @@ impl ArrayDumper { { source.insert( "mirrors".to_string(), - PhpMixed::Array( - mirrors - .into_iter() - .enumerate() - .map(|(i, m)| (i.to_string(), mirror_to_php(m))) - .collect(), - ), + PhpMixed::List(mirrors.into_iter().map(mirror_to_php).collect()), ); } data.insert("source".to_string(), PhpMixed::Array(source)); @@ -104,13 +98,7 @@ impl ArrayDumper { { dist.insert( "mirrors".to_string(), - PhpMixed::Array( - mirrors - .into_iter() - .enumerate() - .map(|(i, m)| (i.to_string(), mirror_to_php(m))) - .collect(), - ), + PhpMixed::List(mirrors.into_iter().map(mirror_to_php).collect()), ); } data.insert("dist".to_string(), PhpMixed::Array(dist)); diff --git a/crates/shirabe/tests/installer_test.rs b/crates/shirabe/tests/installer_test.rs index 2a0c4872..7a581a00 100644 --- a/crates/shirabe/tests/installer_test.rs +++ b/crates/shirabe/tests/installer_test.rs @@ -1515,7 +1515,7 @@ pool_optimizer_test! { pool_optimizer_update_installed_alias => "update-installed-alias.test"; pool_optimizer_update_installed_reference_dry_run => "update-installed-reference-dry-run.test"; pool_optimizer_update_installed_reference => "update-installed-reference.test"; - pool_optimizer_update_mirrors_changes_url => "update-mirrors-changes-url.test", ignore = "TODO(phase-d): known-failing fixture under COMPOSER_POOL_OPTIMIZER=1"; + pool_optimizer_update_mirrors_changes_url => "update-mirrors-changes-url.test"; pool_optimizer_update_mirrors_fails_with_new_req => "update-mirrors-fails-with-new-req.test"; pool_optimizer_update_no_dev_still_resolves_dev => "update-no-dev-still-resolves-dev.test"; pool_optimizer_update_no_install => "update-no-install.test"; @@ -1705,7 +1705,7 @@ raw_pool_test! { raw_pool_update_installed_alias => "update-installed-alias.test"; raw_pool_update_installed_reference_dry_run => "update-installed-reference-dry-run.test"; raw_pool_update_installed_reference => "update-installed-reference.test"; - raw_pool_update_mirrors_changes_url => "update-mirrors-changes-url.test", ignore = "TODO(phase-d): known-failing fixture under COMPOSER_POOL_OPTIMIZER=0"; + raw_pool_update_mirrors_changes_url => "update-mirrors-changes-url.test"; raw_pool_update_mirrors_fails_with_new_req => "update-mirrors-fails-with-new-req.test"; raw_pool_update_no_dev_still_resolves_dev => "update-no-dev-still-resolves-dev.test"; raw_pool_update_no_install => "update-no-install.test"; |