aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-05 02:36:13 +0900
committernsfisis <nsfisis@gmail.com>2026-06-05 02:36:13 +0900
commit886ee829cb191745167dca369045acd3125e5714 (patch)
treefc439e4b425dce6a10bbca92b305faef6bbb4def /crates/shirabe
parent222012294e953a0f5bf6e442b8a61116235c86b5 (diff)
downloadphp-shirabe-886ee829cb191745167dca369045acd3125e5714.tar.gz
php-shirabe-886ee829cb191745167dca369045acd3125e5714.tar.zst
php-shirabe-886ee829cb191745167dca369045acd3125e5714.zip
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<dyn ...> shared ownership, matching PHP's by-reference sharing of the single filter object. Box<dyn ...> is replaced with Rc<dyn ...> 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) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe')
-rw-r--r--crates/shirabe/src/autoload/autoload_generator.rs4
-rw-r--r--crates/shirabe/src/command/base_command.rs4
-rw-r--r--crates/shirabe/src/command/create_project_command.rs4
-rw-r--r--crates/shirabe/src/command/init_command.rs5
-rw-r--r--crates/shirabe/src/command/package_discovery_trait.rs4
-rw-r--r--crates/shirabe/src/command/require_command.rs5
-rw-r--r--crates/shirabe/src/dependency_resolver/rule_set_generator.rs2
-rw-r--r--crates/shirabe/src/dependency_resolver/solver.rs4
-rw-r--r--crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_factory.rs13
-rw-r--r--crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_interface.rs4
-rw-r--r--crates/shirabe/src/installer.rs12
-rw-r--r--crates/shirabe/src/package/version/version_selector.rs4
12 files changed, 33 insertions, 32 deletions
diff --git a/crates/shirabe/src/autoload/autoload_generator.rs b/crates/shirabe/src/autoload/autoload_generator.rs
index 4d2e704..9647a8d 100644
--- a/crates/shirabe/src/autoload/autoload_generator.rs
+++ b/crates/shirabe/src/autoload/autoload_generator.rs
@@ -48,7 +48,7 @@ pub struct AutoloadGenerator {
apcu_prefix: Option<String>,
dry_run: bool,
run_scripts: bool,
- platform_requirement_filter: Box<dyn PlatformRequirementFilterInterface>,
+ platform_requirement_filter: std::rc::Rc<dyn PlatformRequirementFilterInterface>,
}
impl AutoloadGenerator {
@@ -117,7 +117,7 @@ impl AutoloadGenerator {
pub fn set_platform_requirement_filter(
&mut self,
- platform_requirement_filter: Box<dyn PlatformRequirementFilterInterface>,
+ platform_requirement_filter: std::rc::Rc<dyn PlatformRequirementFilterInterface>,
) {
self.platform_requirement_filter = platform_requirement_filter;
}
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<Box<dyn PlatformRequirementFilterInterface>>;
+ ) -> Result<std::rc::Rc<dyn PlatformRequirementFilterInterface>>;
/// @param array<string> $requirements
///
@@ -585,7 +585,7 @@ impl<C: HasBaseCommandData> BaseCommand for C {
fn get_platform_requirement_filter(
&self,
input: &dyn InputInterface,
- ) -> Result<Box<dyn PlatformRequirementFilterInterface>> {
+ ) -> Result<std::rc::Rc<dyn PlatformRequirementFilterInterface>> {
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<Box<dyn PlatformRequirementFilterInterface>>,
+ platform_requirement_filter: Option<std::rc::Rc<dyn PlatformRequirementFilterInterface>>,
secure_http: bool,
add_repository: bool,
) -> Result<i64> {
@@ -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<dyn crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface>
- {
+ ) -> 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<dyn crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface>;
+ ) -> std::rc::Rc<
+ dyn crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface,
+ >;
fn normalize_requirements(&self, requires: Vec<String>) -> Vec<IndexMap<String, String>>;
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<dyn crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface>
- {
+ ) -> std::rc::Rc<
+ dyn crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface,
+ > {
todo!()
}
diff --git a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs
index 6aabd6a..048a5f5 100644
--- a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs
+++ b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs
@@ -423,7 +423,7 @@ impl RuleSetGenerator {
pub fn get_rules_for(
&mut self,
request: &Request,
- platform_requirement_filter: Option<Box<dyn PlatformRequirementFilterInterface>>,
+ platform_requirement_filter: Option<Rc<dyn PlatformRequirementFilterInterface>>,
) -> anyhow::Result<RuleSet> {
let platform_requirement_filter = platform_requirement_filter
.unwrap_or_else(PlatformRequirementFilterFactory::ignore_nothing);
diff --git a/crates/shirabe/src/dependency_resolver/solver.rs b/crates/shirabe/src/dependency_resolver/solver.rs
index 1fbc3ec..281c796 100644
--- a/crates/shirabe/src/dependency_resolver/solver.rs
+++ b/crates/shirabe/src/dependency_resolver/solver.rs
@@ -240,7 +240,7 @@ impl Solver {
pub fn solve(
&mut self,
request: &Request,
- platform_requirement_filter: Option<Box<dyn PlatformRequirementFilterInterface>>,
+ platform_requirement_filter: Option<Rc<dyn PlatformRequirementFilterInterface>>,
) -> anyhow::Result<LockTransaction> {
let platform_requirement_filter = platform_requirement_filter
.unwrap_or_else(|| PlatformRequirementFilterFactory::ignore_nothing());
@@ -250,7 +250,7 @@ impl Solver {
self.io
.write_error3("Generating rules", true, crate::io::DEBUG);
let mut rule_set_generator = RuleSetGenerator::new(self.policy.clone(), self.pool.clone());
- // TODO(phase-b): get_rules_for takes Option<Box<dyn PlatformRequirementFilterInterface>>;
+ // TODO(phase-b): get_rules_for takes Option<Rc<dyn PlatformRequirementFilterInterface>>;
// PHP passes the filter directly. Forwarding `None` here keeps the call typecheckable.
let _ = platform_requirement_filter.as_ref();
self.rules = rule_set_generator.get_rules_for(request, None)?;
diff --git a/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_factory.rs b/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_factory.rs
index 35a3ed9..a260c29 100644
--- a/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_factory.rs
+++ b/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_factory.rs
@@ -8,13 +8,14 @@ use crate::filter::platform_requirement_filter::{
};
use anyhow::Result;
use shirabe_php_shim::{InvalidArgumentException, PhpMixed};
+use std::rc::Rc;
pub struct PlatformRequirementFilterFactory;
impl PlatformRequirementFilterFactory {
pub fn from_bool_or_list(
bool_or_list: PhpMixed,
- ) -> Result<Box<dyn PlatformRequirementFilterInterface>> {
+ ) -> Result<Rc<dyn PlatformRequirementFilterInterface>> {
match bool_or_list {
PhpMixed::Bool(b) => {
if b {
@@ -35,7 +36,7 @@ impl PlatformRequirementFilterFactory {
.collect(),
_ => unreachable!(),
};
- Ok(Box::new(IgnoreListPlatformRequirementFilter::new(list)?))
+ Ok(Rc::new(IgnoreListPlatformRequirementFilter::new(list)?))
}
other => Err(anyhow::anyhow!(InvalidArgumentException {
message: format!(
@@ -47,11 +48,11 @@ impl PlatformRequirementFilterFactory {
}
}
- pub fn ignore_all() -> Box<dyn PlatformRequirementFilterInterface> {
- Box::new(IgnoreAllPlatformRequirementFilter)
+ pub fn ignore_all() -> Rc<dyn PlatformRequirementFilterInterface> {
+ Rc::new(IgnoreAllPlatformRequirementFilter)
}
- pub fn ignore_nothing() -> Box<dyn PlatformRequirementFilterInterface> {
- Box::new(IgnoreNothingPlatformRequirementFilter)
+ pub fn ignore_nothing() -> Rc<dyn PlatformRequirementFilterInterface> {
+ Rc::new(IgnoreNothingPlatformRequirementFilter)
}
}
diff --git a/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_interface.rs b/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_interface.rs
index 8061e1a..4ec528e 100644
--- a/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_interface.rs
+++ b/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_interface.rs
@@ -6,8 +6,4 @@ pub trait PlatformRequirementFilterInterface: std::fmt::Debug {
fn is_upper_bound_ignored(&self, req: &str) -> bool;
fn as_any(&self) -> &dyn std::any::Any;
-
- fn clone_box(&self) -> Box<dyn PlatformRequirementFilterInterface> {
- todo!()
- }
}
diff --git a/crates/shirabe/src/installer.rs b/crates/shirabe/src/installer.rs
index 1f63f35..95b9298 100644
--- a/crates/shirabe/src/installer.rs
+++ b/crates/shirabe/src/installer.rs
@@ -144,7 +144,7 @@ pub struct Installer {
pub(crate) update_allow_list: Option<Vec<String>>,
pub(crate) update_allow_transitive_dependencies: i64,
pub(crate) suggested_packages_reporter: SuggestedPackagesReporter,
- pub(crate) platform_requirement_filter: Box<dyn PlatformRequirementFilterInterface>,
+ pub(crate) platform_requirement_filter: std::rc::Rc<dyn PlatformRequirementFilterInterface>,
pub(crate) additional_fixed_repository: Option<crate::repository::RepositoryInterfaceHandle>,
pub(crate) temporary_constraints: IndexMap<String, AnyConstraint>,
}
@@ -404,7 +404,7 @@ impl Installer {
.set_run_scripts(self.run_scripts);
self.autoload_generator
.borrow_mut()
- .set_platform_requirement_filter(self.platform_requirement_filter.clone_box());
+ .set_platform_requirement_filter(self.platform_requirement_filter.clone());
let local_repo_handle = self.repository_manager.borrow().get_local_repository();
let local_repo_ref = local_repo_handle.borrow();
self.autoload_generator.borrow_mut().dump(
@@ -662,7 +662,7 @@ impl Installer {
match solver
.as_mut()
.unwrap()
- .solve(&request, Some(self.platform_requirement_filter.clone_box()))
+ .solve(&request, Some(self.platform_requirement_filter.clone()))
{
Ok(t) => {
lock_transaction = t;
@@ -951,7 +951,7 @@ impl Installer {
match solver
.as_mut()
.unwrap()
- .solve(&request, Some(self.platform_requirement_filter.clone_box()))
+ .solve(&request, Some(self.platform_requirement_filter.clone()))
{
Ok(t) => {
non_dev_lock_transaction = t;
@@ -1093,7 +1093,7 @@ impl Installer {
match solver
.as_mut()
.unwrap()
- .solve(&request, Some(self.platform_requirement_filter.clone_box()))
+ .solve(&request, Some(self.platform_requirement_filter.clone()))
{
Ok(lock_transaction) => {
solver = None;
@@ -1866,7 +1866,7 @@ impl Installer {
pub fn set_platform_requirement_filter(
&mut self,
- platform_requirement_filter: Box<dyn PlatformRequirementFilterInterface>,
+ platform_requirement_filter: std::rc::Rc<dyn PlatformRequirementFilterInterface>,
) -> &mut Self {
self.platform_requirement_filter = platform_requirement_filter;
diff --git a/crates/shirabe/src/package/version/version_selector.rs b/crates/shirabe/src/package/version/version_selector.rs
index d2a551f..31942f9 100644
--- a/crates/shirabe/src/package/version/version_selector.rs
+++ b/crates/shirabe/src/package/version/version_selector.rs
@@ -65,7 +65,7 @@ impl VersionSelector {
package_name: &str,
target_package_version: Option<&str>,
preferred_stability: &str,
- platform_requirement_filter: Option<Box<dyn PlatformRequirementFilterInterface>>,
+ platform_requirement_filter: Option<std::rc::Rc<dyn PlatformRequirementFilterInterface>>,
repo_set_flags: i64,
io: Option<std::rc::Rc<std::cell::RefCell<dyn IOInterface>>>,
show_warnings: shirabe_php_shim::PhpMixed,
@@ -81,7 +81,7 @@ impl VersionSelector {
.into());
}
- let platform_requirement_filter: Box<dyn PlatformRequirementFilterInterface> =
+ let platform_requirement_filter: std::rc::Rc<dyn PlatformRequirementFilterInterface> =
match platform_requirement_filter {
Some(f) => f,
None => PlatformRequirementFilterFactory::ignore_nothing(),