From 886ee829cb191745167dca369045acd3125e5714 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 5 Jun 2026 02:36:13 +0900 Subject: feat(filter): share platform req filter via Rc, drop clone_box PlatformRequirementFilterInterface::clone_box (a todo!() trait-object clone stub) is removed in favor of Rc shared ownership, matching PHP's by-reference sharing of the single filter object. Box is replaced with Rc across the factory, Solver/RuleSetGenerator, VersionSelector, AutoloadGenerator, Installer and the command layer (BaseCommand/PackageDiscoveryTrait and their impls); clone_box call sites become Rc clones. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/command/base_command.rs | 4 ++-- crates/shirabe/src/command/create_project_command.rs | 4 ++-- crates/shirabe/src/command/init_command.rs | 5 +++-- crates/shirabe/src/command/package_discovery_trait.rs | 4 +++- crates/shirabe/src/command/require_command.rs | 5 +++-- 5 files changed, 13 insertions(+), 9 deletions(-) (limited to 'crates/shirabe/src/command') diff --git a/crates/shirabe/src/command/base_command.rs b/crates/shirabe/src/command/base_command.rs index f806854..501915b 100644 --- a/crates/shirabe/src/command/base_command.rs +++ b/crates/shirabe/src/command/base_command.rs @@ -221,7 +221,7 @@ pub trait BaseCommand { fn get_platform_requirement_filter( &self, input: &dyn InputInterface, - ) -> Result>; + ) -> Result>; /// @param array $requirements /// @@ -585,7 +585,7 @@ impl BaseCommand for C { fn get_platform_requirement_filter( &self, input: &dyn InputInterface, - ) -> Result> { + ) -> Result> { if !input.has_option("ignore-platform-reqs") || !input.has_option("ignore-platform-req") { return Err(LogicException { message: diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs index 1667ac1..076d7cd 100644 --- a/crates/shirabe/src/command/create_project_command.rs +++ b/crates/shirabe/src/command/create_project_command.rs @@ -222,7 +222,7 @@ impl CreateProjectCommand { disable_scripts: bool, no_progress: bool, no_install: bool, - platform_requirement_filter: Option>, + platform_requirement_filter: Option>, secure_http: bool, add_repository: bool, ) -> Result { @@ -389,7 +389,7 @@ impl CreateProjectCommand { .set_prefer_source(prefer_source) .set_prefer_dist(prefer_dist) .set_dev_mode(install_dev_packages) - .set_platform_requirement_filter(platform_requirement_filter.clone_box()) + .set_platform_requirement_filter(platform_requirement_filter.clone()) .set_suggested_packages_reporter(SuggestedPackagesReporter::new(io.clone())) .set_optimize_autoloader( config diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs index 053df36..e401534 100644 --- a/crates/shirabe/src/command/init_command.rs +++ b/crates/shirabe/src/command/init_command.rs @@ -73,8 +73,9 @@ impl PackageDiscoveryTrait for InitCommand { fn get_platform_requirement_filter( &self, input: &dyn InputInterface, - ) -> Box - { + ) -> std::rc::Rc< + dyn crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface, + > { todo!() } diff --git a/crates/shirabe/src/command/package_discovery_trait.rs b/crates/shirabe/src/command/package_discovery_trait.rs index 197636c..eba6b8b 100644 --- a/crates/shirabe/src/command/package_discovery_trait.rs +++ b/crates/shirabe/src/command/package_discovery_trait.rs @@ -50,7 +50,9 @@ pub trait PackageDiscoveryTrait { fn get_platform_requirement_filter( &self, input: &dyn InputInterface, - ) -> Box; + ) -> std::rc::Rc< + dyn crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface, + >; fn normalize_requirements(&self, requires: Vec) -> Vec>; diff --git a/crates/shirabe/src/command/require_command.rs b/crates/shirabe/src/command/require_command.rs index fa9a3dc..cfa7bba 100644 --- a/crates/shirabe/src/command/require_command.rs +++ b/crates/shirabe/src/command/require_command.rs @@ -88,8 +88,9 @@ impl PackageDiscoveryTrait for RequireCommand { fn get_platform_requirement_filter( &self, input: &dyn InputInterface, - ) -> Box - { + ) -> std::rc::Rc< + dyn crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface, + > { todo!() } -- cgit v1.3.1