From b8a50e25aafb51a6d73f9695362854cc5ed58117 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 7 Jun 2026 18:26:55 +0900 Subject: feat(phase-c): resolve &mut-access phase-b TODOs via handle setters PHP mutator methods that the Phase B port could not call because only &self / &dyn / Rc access was available. Resolved by the interior-mutation APIs that already exist: handle &self setters (set_dist/source_reference, set_requires/dev/references/stability_flags), Rc> .borrow_mut(), and get_installation_manager().borrow_mut() (build_package_map passes an empty/canonical package list per upstream). composer.get_package() returns &RootPackageInterfaceHandle, so the "&dyn" Phase B note was wrong. factory's set_config_source/set_auth_config_source were already live code; their stale TODOs are removed. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/command/init_command.rs | 12 ++++++++++-- crates/shirabe/src/command/require_command.rs | 24 ++++++++++------------- crates/shirabe/src/command/run_script_command.rs | 5 +---- crates/shirabe/src/command/self_update_command.rs | 2 +- crates/shirabe/src/command/show_command.rs | 9 +++++---- crates/shirabe/src/command/update_command.rs | 14 ++++++------- 6 files changed, 33 insertions(+), 33 deletions(-) (limited to 'crates/shirabe/src/command') diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs index 5a3c71b..f8bdad9 100644 --- a/crates/shirabe/src/command/init_command.rs +++ b/crates/shirabe/src/command/init_command.rs @@ -426,11 +426,19 @@ impl InitCommand { if !input.borrow().is_interactive() { if input.borrow().get_option("name").is_null() { - // TODO(phase-b): input.set_option requires &mut; signature passes &dyn here + let name = self.get_default_package_name(); + input + .borrow_mut() + .set_option("name", PhpMixed::from(name)) + .expect("name option is defined"); } if input.borrow().get_option("author").is_null() { - // TODO(phase-b): input.set_option requires &mut; signature passes &dyn here + let author = self.get_default_author(); + input + .borrow_mut() + .set_option("author", PhpMixed::from(author)) + .expect("author option is defined"); } } } diff --git a/crates/shirabe/src/command/require_command.rs b/crates/shirabe/src/command/require_command.rs index b3ad6cf..d3d17a7 100644 --- a/crates/shirabe/src/command/require_command.rs +++ b/crates/shirabe/src/command/require_command.rs @@ -413,9 +413,7 @@ impl RequireCommand { .to_string(), true, ) { - // TODO(phase-b): set_option needs &mut dyn InputInterface, but execute holds - // input as &dyn. Commented out until input is threaded as &mut. - // input.set_option("dev", PhpMixed::Bool(true)); + input.borrow_mut().set_option("dev", PhpMixed::Bool(true))?; } } @@ -511,9 +509,7 @@ impl RequireCommand { return Ok(0); } - // TODO(phase-b): set_option needs &mut dyn InputInterface, but execute holds - // input as &dyn. Commented out until input is threaded as &mut. - // input.set_option("dev", PhpMixed::Bool(true)); + input.borrow_mut().set_option("dev", PhpMixed::Bool(true))?; let swap = require_key; require_key = remove_key; remove_key = swap; @@ -782,21 +778,21 @@ impl RequireCommand { section.shift_remove(package); } } - // TODO(phase-b): root_package mutation requires &mut RootPackageInterface but - // Composer::get_package() exposes only & dyn; needs accessor returning &mut for - // the dry-run case to update requires/dev-requires/stability flags/references. - let _ = &links; - let _ = root_package.get_references().clone(); - let _ = RootPackageLoader::extract_references( + root_package.set_requires(links["require"].clone()); + root_package.set_dev_requires(links["require-dev"].clone()); + + // extract stability flags & references as they weren't present when loading the unmodified composer.json + let references = RootPackageLoader::extract_references( requirements, root_package.get_references().clone(), ); - let _ = RootPackageLoader::extract_stability_flags( + root_package.set_references(references); + let stability_flags = RootPackageLoader::extract_stability_flags( requirements, &root_package.get_minimum_stability(), root_package.get_stability_flags().clone(), ); - // unset($stabilityFlags, $references); + root_package.set_stability_flags(stability_flags); } let update_dev_mode = !input diff --git a/crates/shirabe/src/command/run_script_command.rs b/crates/shirabe/src/command/run_script_command.rs index cf8b8f1..3fe0855 100644 --- a/crates/shirabe/src/command/run_script_command.rs +++ b/crates/shirabe/src/command/run_script_command.rs @@ -144,10 +144,7 @@ impl RunScriptCommand { false, ); - if let Some(selected) = script.as_string() { - // TODO(phase-b): input is std::rc::Rc> but set_argument needs &mut. - let _ = selected; - } + input.borrow_mut().set_argument("script", script)?; Ok(()) } diff --git a/crates/shirabe/src/command/self_update_command.rs b/crates/shirabe/src/command/self_update_command.rs index 9c5ae5a..127661a 100644 --- a/crates/shirabe/src/command/self_update_command.rs +++ b/crates/shirabe/src/command/self_update_command.rs @@ -275,7 +275,7 @@ impl SelfUpdateCommand { if input.borrow().get_argument("command").as_string() == Some("self") && input.borrow().get_argument("version").as_string() == Some("update") { - // TODO(phase-b): set_argument requires &mut InputInterface; input is &dyn here + input.borrow_mut().set_argument("version", PhpMixed::Null)?; } let latest = versions_util.get_latest(None)??; diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs index 53f3ac4..f324a5c 100644 --- a/crates/shirabe/src/command/show_command.rs +++ b/crates/shirabe/src/command/show_command.rs @@ -634,10 +634,11 @@ impl ShowCommand { self.get_io().write_no_newline(&package.get_name()); let path = { let composer_ref = composer.as_ref().unwrap(); - // TODO(phase-b): get_installation_manager wants &mut Composer; PHP shares - // by reference. Skipping the install path lookup keeps compile clean. - let _ = composer_ref; - None:: + composer_ref + .borrow_partial() + .get_installation_manager() + .borrow_mut() + .get_install_path(package.clone().into()) }; if let Some(path) = path { let real = realpath(&path).unwrap_or_default(); diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs index e7a7437..efde845 100644 --- a/crates/shirabe/src/command/update_command.rs +++ b/crates/shirabe/src/command/update_command.rs @@ -160,17 +160,15 @@ impl UpdateCommand { } let root_package = composer.get_package(); - // TODO(phase-b): composer.get_package() returns &dyn RootPackageInterface so - // set_references/set_stability_flags cannot be called; needs &mut access. - let references = - RootPackageLoader::extract_references(&reqs, root_package.get_references().clone()); - let stability_flags = RootPackageLoader::extract_stability_flags( + root_package.set_references(RootPackageLoader::extract_references( + &reqs, + root_package.get_references().clone(), + )); + root_package.set_stability_flags(RootPackageLoader::extract_stability_flags( &reqs, &root_package.get_minimum_stability(), root_package.get_stability_flags().clone(), - ); - let _ = references; - let _ = stability_flags; + )); let parser = VersionParser::new(); let mut temporary_constraints: IndexMap = IndexMap::new(); -- cgit v1.3.1