From 66c3eba15ba6302d43de057a9063f7feee8c6fb3 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 9 Aug 2026 11:10:53 +0900 Subject: refactor(pcre): extract composer/pcre into the shirabe-pcre crate Move `Composer\Pcre` out of shirabe-external-packages and into its own crate, so the path is `shirabe_pcre::preg::Preg` instead of `shirabe_external_packages::composer::pcre::preg::Preg`. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/tests/all_functional_test.rs | 2 +- crates/shirabe/tests/common/io_mock.rs | 2 +- crates/shirabe/tests/dependency_resolver/pool_builder_test.rs | 2 +- crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs | 2 +- crates/shirabe/tests/installer_test.rs | 2 +- crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/shirabe/tests') diff --git a/crates/shirabe/tests/all_functional_test.rs b/crates/shirabe/tests/all_functional_test.rs index 72e1cbec..eaf37558 100644 --- a/crates/shirabe/tests/all_functional_test.rs +++ b/crates/shirabe/tests/all_functional_test.rs @@ -8,7 +8,7 @@ use indexmap::IndexMap; use serial_test::serial; use shirabe::util::filesystem::Filesystem; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_pcre::preg::Preg; use shirabe_php_shim::{CaptureKey, PREG_SPLIT_DELIM_CAPTURE, PhpMixed, intval, php_regex}; use std::path::{Path, PathBuf}; diff --git a/crates/shirabe/tests/common/io_mock.rs b/crates/shirabe/tests/common/io_mock.rs index ad8d72cd..edb5806f 100644 --- a/crates/shirabe/tests/common/io_mock.rs +++ b/crates/shirabe/tests/common/io_mock.rs @@ -5,8 +5,8 @@ use shirabe::io::buffer_io::BufferIO; use shirabe::io::io_interface; use shirabe::io::{IOInterface, IOInterfaceImmutable, IOInterfaceMutable}; use shirabe::util::platform::Platform; -use shirabe_external_packages::composer::pcre::Preg; use shirabe_external_packages::symfony::console::output::output_interface; +use shirabe_pcre::Preg; use shirabe_php_shim::{PHP_EOL, PhpMixed, php_regex, preg_quote}; use std::collections::VecDeque; diff --git a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs index 40ae115d..23f25957 100644 --- a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs +++ b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs @@ -19,7 +19,7 @@ use shirabe::repository::handle::{LockArrayRepositoryHandle, RepositoryInterface use shirabe::repository::lock_array_repository::LockArrayRepository; use shirabe::repository::repository_factory::RepositoryFactory; use shirabe::repository::repository_set::{RepositorySet, RootAliasInput}; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_pcre::preg::Preg; use shirabe_php_shim::PhpMixed; use shirabe_php_shim::{PREG_SPLIT_DELIM_CAPTURE, php_regex}; use std::path::PathBuf; diff --git a/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs b/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs index d5cdbc78..5e5ab1d6 100644 --- a/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs +++ b/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs @@ -11,7 +11,7 @@ use shirabe::package::loader::{ArrayLoader, LoaderInterface}; use shirabe::package::version::version_parser::VersionParser; use shirabe::repository::handle::LockArrayRepositoryHandle; use shirabe::repository::lock_array_repository::LockArrayRepository; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_pcre::preg::Preg; use shirabe_php_shim::PhpMixed; use shirabe_php_shim::{PREG_SPLIT_DELIM_CAPTURE, php_regex}; use std::path::PathBuf; diff --git a/crates/shirabe/tests/installer_test.rs b/crates/shirabe/tests/installer_test.rs index 90dca3ca..4c6ce981 100644 --- a/crates/shirabe/tests/installer_test.rs +++ b/crates/shirabe/tests/installer_test.rs @@ -42,7 +42,6 @@ use shirabe::util::r#loop::Loop; use shirabe::util::platform::Platform; use shirabe::util::process_executor::ProcessExecutor; use shirabe_class_map_generator::class_map::ClassMap; -use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_external_packages::symfony::console::command::command::Command as SymfonyCommand; use shirabe_external_packages::symfony::console::command::command::CommandData; use shirabe_external_packages::symfony::console::input::input_argument::InputArgument; @@ -53,6 +52,7 @@ use shirabe_external_packages::symfony::console::output::output_interface::{ OutputInterface, VERBOSITY_NORMAL, }; use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput; +use shirabe_pcre::preg::Preg; use shirabe_php_shim::{PREG_SPLIT_DELIM_CAPTURE, PhpMixed, php_regex}; use shirabe_semver::VersionParser; use shirabe_semver::constraint::AnyConstraint; diff --git a/crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs b/crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs index 50e6a66a..2e5aa738 100644 --- a/crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs +++ b/crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs @@ -3,8 +3,8 @@ use indexmap::IndexMap; use shirabe::package::archiver::ArchivableFilesFinder; use shirabe::util::Filesystem; -use shirabe_external_packages::composer::pcre::Preg; use shirabe_external_packages::symfony::process::Process; +use shirabe_pcre::Preg; use shirabe_php_shim::{PhpMixed, ZipArchive, dirname, file_put_contents, preg_quote}; use tempfile::TempDir; -- cgit v1.3.1-4-g156e