From 791ef1cd465597ff43dab4216c4b00e9e4160da8 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Thu, 6 Aug 2026 06:25:10 +0900 Subject: refactor(php-shim): split in_array into strict and loose variants --- crates/shirabe/src/dependency_resolver/pool_builder.rs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'crates/shirabe/src/dependency_resolver/pool_builder.rs') diff --git a/crates/shirabe/src/dependency_resolver/pool_builder.rs b/crates/shirabe/src/dependency_resolver/pool_builder.rs index c56090f5..137a36ba 100644 --- a/crates/shirabe/src/dependency_resolver/pool_builder.rs +++ b/crates/shirabe/src/dependency_resolver/pool_builder.rs @@ -21,8 +21,8 @@ use crate::repository::RootPackageRepository; use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ - LogicException, PhpMixed, array_flip_strings, array_map, in_array, microtime, number_format, - round, strpos, + LogicException, PhpMixed, array_flip_strings, array_map, in_array_strict, microtime, + number_format, round, strpos, }; use shirabe_semver::CompilingMatcher; use shirabe_semver::Intervals; @@ -540,25 +540,23 @@ impl PoolBuilder { .insert(pkg_version.clone(), package.clone()); let pkg_type_mixed: PhpMixed = pkg_type.clone().into(); - let ignored_mixed: PhpMixed = self + let ignored_mixed: Vec = self .ignored_types .iter() .cloned() .map(PhpMixed::from) - .collect::>() - .into(); - if in_array(pkg_type_mixed.clone(), &ignored_mixed, true) + .collect(); + if in_array_strict(pkg_type_mixed.clone(), &ignored_mixed) || (self.allowed_types.is_some() && { - let allowed_mixed: PhpMixed = self + let allowed_mixed: Vec = self .allowed_types .as_ref() .unwrap() .iter() .cloned() .map(PhpMixed::from) - .collect::>() - .into(); - !in_array(pkg_type_mixed.clone(), &allowed_mixed, true) + .collect(); + !in_array_strict(pkg_type_mixed.clone(), &allowed_mixed) }) { continue; -- cgit v1.3.1