diff options
12 files changed, 24 insertions, 5 deletions
@@ -2133,6 +2133,7 @@ dependencies = [ "shirabe-pcre", "shirabe-php-shim", "shirabe-semver", + "shirabe-symfony-string", ] [[package]] @@ -2214,6 +2215,13 @@ dependencies = [ ] [[package]] +name = "shirabe-symfony-string" +version = "0.0.1" +dependencies = [ + "shirabe-php-shim", +] + +[[package]] name = "shlex" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -17,6 +17,7 @@ shirabe-php-shim = { path = "crates/shirabe-php-shim" } shirabe-php-src = { path = "crates/shirabe-php-src" } shirabe-semver = { path = "crates/shirabe-semver" } shirabe-spdx-licenses = { path = "crates/shirabe-spdx-licenses" } +shirabe-symfony-string = { path = "crates/shirabe-symfony-string" } anyhow = "1.0.102" async-trait = "0.1.89" base64 = "0.22.1" diff --git a/crates/shirabe-external-packages/Cargo.toml b/crates/shirabe-external-packages/Cargo.toml index 331efcb7..c1e70046 100644 --- a/crates/shirabe-external-packages/Cargo.toml +++ b/crates/shirabe-external-packages/Cargo.toml @@ -7,6 +7,7 @@ edition.workspace = true shirabe-pcre.workspace = true shirabe-php-shim.workspace = true shirabe-semver.workspace = true +shirabe-symfony-string.workspace = true anyhow.workspace = true chrono.workspace = true indexmap.workspace = true diff --git a/crates/shirabe-external-packages/src/symfony.rs b/crates/shirabe-external-packages/src/symfony.rs index 9c572b26..e0d9e4fe 100644 --- a/crates/shirabe-external-packages/src/symfony.rs +++ b/crates/shirabe-external-packages/src/symfony.rs @@ -2,4 +2,3 @@ pub mod console; pub mod filesystem; pub mod finder; pub mod process; -pub mod string; diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs b/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs index a0562aef..08079a7c 100644 --- a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs +++ b/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs @@ -6,8 +6,8 @@ use crate::symfony::console::formatter::output_formatter_style::OutputFormatterS use crate::symfony::console::formatter::output_formatter_style_interface::OutputFormatterStyleInterface; use crate::symfony::console::formatter::output_formatter_style_stack::OutputFormatterStyleStack; use crate::symfony::console::formatter::wrappable_output_formatter_interface::WrappableOutputFormatterInterface; -use crate::symfony::string::b; use shirabe_php_shim::php_regex; +use shirabe_symfony_string::b; /// Formatter class for console output. #[derive(Debug)] diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs index 20103df8..471a8d8a 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs @@ -2,8 +2,8 @@ use crate::symfony::console::formatter::output_formatter_interface::OutputFormatterInterface; use crate::symfony::console::helper::helper_set::HelperSet; -use crate::symfony::string::unicode_string::UnicodeString; use shirabe_php_shim::php_regex; +use shirabe_symfony_string::unicode_string::UnicodeString; /// Helper is the base class for all helper classes. #[derive(Debug, Default)] diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs index 8ec8d15c..91fb5bf0 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs @@ -18,8 +18,8 @@ use crate::symfony::console::output::output_interface::OutputInterface; use crate::symfony::console::question::ChoiceQuestion; use crate::symfony::console::question::QuestionInterface; use crate::symfony::console::terminal::Terminal; -use crate::symfony::string::s; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_string::s; /// The QuestionHelper class provides helpers to interact with the user. #[derive(Debug, Default)] diff --git a/crates/shirabe-symfony-string/Cargo.toml b/crates/shirabe-symfony-string/Cargo.toml new file mode 100644 index 00000000..110118e7 --- /dev/null +++ b/crates/shirabe-symfony-string/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "shirabe-symfony-string" +version.workspace = true +edition.workspace = true + +[dependencies] +shirabe-php-shim.workspace = true + +[lints] +workspace = true diff --git a/crates/shirabe-external-packages/src/symfony/string/byte_string.rs b/crates/shirabe-symfony-string/src/byte_string.rs index 8ad183e3..cf597bbf 100644 --- a/crates/shirabe-external-packages/src/symfony/string/byte_string.rs +++ b/crates/shirabe-symfony-string/src/byte_string.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/symfony/string/ByteString.php -use crate::symfony::string::code_point_string::CodePointString; +use crate::code_point_string::CodePointString; #[derive(Debug, Clone)] pub struct ByteString { diff --git a/crates/shirabe-external-packages/src/symfony/string/code_point_string.rs b/crates/shirabe-symfony-string/src/code_point_string.rs index dcbaa1f6..dcbaa1f6 100644 --- a/crates/shirabe-external-packages/src/symfony/string/code_point_string.rs +++ b/crates/shirabe-symfony-string/src/code_point_string.rs diff --git a/crates/shirabe-external-packages/src/symfony/string.rs b/crates/shirabe-symfony-string/src/lib.rs index 139d726f..139d726f 100644 --- a/crates/shirabe-external-packages/src/symfony/string.rs +++ b/crates/shirabe-symfony-string/src/lib.rs diff --git a/crates/shirabe-external-packages/src/symfony/string/unicode_string.rs b/crates/shirabe-symfony-string/src/unicode_string.rs index 9048f77b..9048f77b 100644 --- a/crates/shirabe-external-packages/src/symfony/string/unicode_string.rs +++ b/crates/shirabe-symfony-string/src/unicode_string.rs |