From e3e8806aec771e482899ed3470e920f7b291fa95 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 9 Aug 2026 11:17:08 +0900 Subject: refactor(symfony-finder): extract symfony/finder into the shirabe-symfony-finder crate Move `Symfony\Component\Finder` out of shirabe-external-packages and into its own crate, so the path is `shirabe_symfony_finder::Finder` instead of `shirabe_external_packages::symfony::finder::Finder`. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/cache.rs | 2 +- crates/shirabe/src/command/create_project_command.rs | 2 +- crates/shirabe/src/downloader/archive_downloader.rs | 2 +- crates/shirabe/src/package/archiver/archivable_files_finder.rs | 2 +- crates/shirabe/src/package/archiver/base_exclude_filter.rs | 2 +- crates/shirabe/src/util/filesystem.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/shirabe/src') diff --git a/crates/shirabe/src/cache.rs b/crates/shirabe/src/cache.rs index 11afe2cb..435e45c6 100644 --- a/crates/shirabe/src/cache.rs +++ b/crates/shirabe/src/cache.rs @@ -6,13 +6,13 @@ use crate::util::Filesystem; use crate::util::Platform; use crate::util::Silencer; use chrono::Utc; -use shirabe_external_packages::symfony::finder::Finder; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ ErrorException, bin2hex, clearstatcache, date_format_to_strftime, dirname, disk_free_space, file_exists, file_get_contents, file_put_contents, filemtime, function_exists, hash_file, is_dir, is_writable, mkdir, php_regex, random_bytes, random_int, rename, time, unlink, }; +use shirabe_symfony_finder::Finder; use std::sync::Mutex; /// Reads/writes to a filesystem cache diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs index 4d2f259b..7a11e44e 100644 --- a/crates/shirabe/src/command/create_project_command.rs +++ b/crates/shirabe/src/command/create_project_command.rs @@ -40,7 +40,6 @@ use shirabe_external_packages::seld::signal::SignalHandler; use shirabe_external_packages::symfony::console::command::command::Command; use shirabe_external_packages::symfony::console::input::InputInterface; use shirabe_external_packages::symfony::console::output::OutputInterface; -use shirabe_external_packages::symfony::finder::Finder; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ @@ -48,6 +47,7 @@ use shirabe_php_shim::{ chdir, explode_with_limit, file_exists, getcwd, impl_php_class, implode, is_dir, is_file, mkdir, realpath, rtrim, strtolower, unlink, }; +use shirabe_symfony_finder::Finder; use std::path::PathBuf; /// Install a package as new project into new directory. diff --git a/crates/shirabe/src/downloader/archive_downloader.rs b/crates/shirabe/src/downloader/archive_downloader.rs index 097fc1af..894782e4 100644 --- a/crates/shirabe/src/downloader/archive_downloader.rs +++ b/crates/shirabe/src/downloader/archive_downloader.rs @@ -8,11 +8,11 @@ use crate::package::PackageInterfaceHandle; use crate::util::Filesystem; use crate::util::Platform; use indexmap::IndexMap; -use shirabe_external_packages::symfony::finder::Finder; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ PhpMixed, RuntimeException, bin2hex, file_exists, is_dir, random_bytes, realpath, }; +use shirabe_symfony_finder::Finder; use std::path::{Path, PathBuf}; pub trait ArchiveDownloader { diff --git a/crates/shirabe/src/package/archiver/archivable_files_finder.rs b/crates/shirabe/src/package/archiver/archivable_files_finder.rs index 7c524283..72fe0646 100644 --- a/crates/shirabe/src/package/archiver/archivable_files_finder.rs +++ b/crates/shirabe/src/package/archiver/archivable_files_finder.rs @@ -4,9 +4,9 @@ use crate::package::archiver::BaseExcludeFilter; use crate::package::archiver::ComposerExcludeFilter; use crate::package::archiver::GitExcludeFilter; use crate::util::Filesystem; -use shirabe_external_packages::symfony::finder::Finder; use shirabe_pcre::Preg; use shirabe_php_shim::{RuntimeException, preg_quote, realpath}; +use shirabe_symfony_finder::Finder; use std::path::{Path, PathBuf}; pub struct ArchivableFilesFinder { diff --git a/crates/shirabe/src/package/archiver/base_exclude_filter.rs b/crates/shirabe/src/package/archiver/base_exclude_filter.rs index a899d90f..e5487038 100644 --- a/crates/shirabe/src/package/archiver/base_exclude_filter.rs +++ b/crates/shirabe/src/package/archiver/base_exclude_filter.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Package/Archiver/BaseExcludeFilter.php -use shirabe_external_packages::symfony::finder::Glob; use shirabe_pcre::Preg; +use shirabe_symfony_finder::Glob; #[derive(Debug)] pub struct BaseExcludeFilterBase { diff --git a/crates/shirabe/src/util/filesystem.rs b/crates/shirabe/src/util/filesystem.rs index bf7107f7..b46e7913 100644 --- a/crates/shirabe/src/util/filesystem.rs +++ b/crates/shirabe/src/util/filesystem.rs @@ -3,7 +3,6 @@ use crate::util::Platform; use crate::util::ProcessExecutor; use crate::util::Silencer; -use shirabe_external_packages::symfony::finder::Finder; use shirabe_pcre::Preg; use shirabe_php_shim::{ ErrorException, LogicException, PhpMixed, RuntimeException, array_pop, basename, chdir, @@ -15,6 +14,7 @@ use shirabe_php_shim::{ var_export, }; use shirabe_symfony_filesystem::exception::IOException; +use shirabe_symfony_finder::Finder; use std::path::Path; #[derive(Debug)] -- cgit v1.3.1-4-g156e