aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/command
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-07 14:15:55 +0900
committernsfisis <nsfisis@gmail.com>2026-06-07 14:15:55 +0900
commitda6f05c12d08ac96b4286664cd8205d3fee042d8 (patch)
tree7fb50447d73d04544edb224346604f294b450f95 /crates/shirabe/src/command
parent86961b16b2f5c9c26a776193934d13ff87ab7fea (diff)
downloadphp-shirabe-da6f05c12d08ac96b4286664cd8205d3fee042d8.tar.gz
php-shirabe-da6f05c12d08ac96b4286664cd8205d3fee042d8.tar.zst
php-shirabe-da6f05c12d08ac96b4286664cd8205d3fee042d8.zip
feat(phase-c): resolve owned-argument phase-b TODOs
Replace value-by-value signature workarounds with proper ownership: - validate_json_schema: borrow JsonFile via ValidateJsonInput<&JsonFile>, restoring the dropped local auth file validation call - Auditor::audit / Solver::new / create_pool: pass cloned Rc handles and share Pool via Rc<RefCell<Pool>>; create_pool now takes &mut Request - MarkAlias{Installed,Uninstalled}Operation: hand over AliasPackageHandle from the alias-confirmed branch - dispatch_installer_event: clone the base Transaction (Rc-backed contents) and enable the PRE_OPERATIONS_EXEC dispatch - SuggestedPackagesReporter: share between command and installer via Rc<RefCell<>> to mirror PHP reference semantics PrePoolCreateEvent remains a TODO: it is plugin-only and would require a speculative Rc migration of Request whose payload is never read today.
Diffstat (limited to 'crates/shirabe/src/command')
-rw-r--r--crates/shirabe/src/command/create_project_command.rs13
1 files changed, 8 insertions, 5 deletions
diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs
index f59e1eb..bbde603 100644
--- a/crates/shirabe/src/command/create_project_command.rs
+++ b/crates/shirabe/src/command/create_project_command.rs
@@ -52,7 +52,8 @@ pub struct CreateProjectCommand {
base_command_data: BaseCommandData,
/// @var SuggestedPackagesReporter
- pub(crate) suggested_packages_reporter: Option<SuggestedPackagesReporter>,
+ pub(crate) suggested_packages_reporter:
+ Option<std::rc::Rc<std::cell::RefCell<SuggestedPackagesReporter>>>,
}
impl CreateProjectCommand {
@@ -282,7 +283,9 @@ impl CreateProjectCommand {
io.borrow_mut()
.load_configuration(&mut *config.borrow_mut())?;
- self.suggested_packages_reporter = Some(SuggestedPackagesReporter::new(io.clone()));
+ self.suggested_packages_reporter = Some(std::rc::Rc::new(std::cell::RefCell::new(
+ SuggestedPackagesReporter::new(io.clone()),
+ )));
let installed_from_vcs = if let Some(package_name) = package_name.as_ref() {
self.install_root_package(
@@ -420,14 +423,14 @@ impl CreateProjectCommand {
.set_output_progress(!no_progress);
let mut installer = Installer::create(io.clone(), &composer_handle);
- // TODO(phase-b): set_suggested_packages_reporter takes by value but PHP class
- // means shared ownership; needs Rc<SuggestedPackagesReporter> for proper sharing.
installer
.set_prefer_source(prefer_source)
.set_prefer_dist(prefer_dist)
.set_dev_mode(install_dev_packages)
.set_platform_requirement_filter(platform_requirement_filter.clone())
- .set_suggested_packages_reporter(SuggestedPackagesReporter::new(io.clone()))
+ .set_suggested_packages_reporter(
+ self.suggested_packages_reporter.as_ref().unwrap().clone(),
+ )
.set_optimize_autoloader(
config
.borrow_mut()