From 2d474e91e49c7343d28198eff2b5bbbed9afbcee Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 10 Jun 2026 02:41:34 +0900 Subject: feat(phase-c): resolve cross-module phase-b TODOs --- crates/shirabe/src/command/create_project_command.rs | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'crates/shirabe/src/command/create_project_command.rs') diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs index c49d2fc..bf00371 100644 --- a/crates/shirabe/src/command/create_project_command.rs +++ b/crates/shirabe/src/command/create_project_command.rs @@ -293,7 +293,7 @@ impl CreateProjectCommand { io.clone(), &config, package_name, - &*platform_requirement_filter, + platform_requirement_filter.clone(), directory.clone(), package_version, stability, @@ -334,17 +334,10 @@ impl CreateProjectCommand { .get_config() .borrow() .get_repositories(); - // TODO(phase-b): generate_repository_name expects existing repos as - // IndexMap>; pass empty placeholder. - let _ = &composer_json_repositories_config; - let placeholder_existing: IndexMap< - String, - crate::repository::RepositoryInterfaceHandle, - > = IndexMap::new(); let name = RepositoryFactory::generate_repository_name( &PhpMixed::Int(index as i64), &repo_config, - &placeholder_existing, + &composer_json_repositories_config, ); let mut config_source = JsonConfigSource::new( std::rc::Rc::new(std::cell::RefCell::new(JsonFile::new( @@ -595,7 +588,7 @@ impl CreateProjectCommand { io: std::rc::Rc>, config: &std::rc::Rc>, package_name: &str, - platform_requirement_filter: &dyn PlatformRequirementFilterInterface, + platform_requirement_filter: std::rc::Rc, directory: Option, mut package_version: Option, mut stability: Option, @@ -850,14 +843,11 @@ impl CreateProjectCommand { std::rc::Rc::new(std::cell::RefCell::new(repository_set)), Some(&mut platform_repo), )?; - // TODO(phase-b): platform_requirement_filter is &dyn here but VersionSelector expects - // Option>; pass None as placeholder. - let _ = platform_requirement_filter; let package = version_selector.find_best_candidate( &name, package_version.as_deref(), &stability, - None, + Some(platform_requirement_filter.clone()), 0, Some(io.clone()), PhpMixed::Bool(true), -- cgit v1.3.1