aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/util/platform.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
committernsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
commit530d085d4f3e19f94ac3cf8f8ac3b17000214b2e (patch)
treeb4de2c2443e2bb2cfc692454ac284dc1d2313e59 /crates/shirabe/src/util/platform.rs
parent0caac63bacefb9a1f62848636d47fca07f592bba (diff)
downloadphp-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.tar.gz
php-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.tar.zst
php-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.zip
refactor(pcre): inline Preg into its call sites and drop the crate
Preg had shed everything it owned: after the last few rounds its methods were one-line forwards to the shim's preg_*(), differing only in a default argument or a wrapper the caller unwrapped anyway. The 460 call sites now name the shim function, and shirabe-pcre is gone from the workspace along with its LICENSE entry. The forwards expand as they read: isMatch becomes preg_match2(.., 0).is_some() (is_none() where PHP negates it), isMatch3 and match3 drop the .is_some(), matchAll counts through preg_match_all2(..).occurrence_count(), and replace4/replace5 spell out the limit and count arguments preg_replace2 takes. Callbacks are the one place the shapes differ: preg_replace_callback carries an error out of the callback, so the fourteen infallible closures wrap their result in Ok() and expect() it back. Config::process() is the fifteenth, and it drops the `error` cell it captured to smuggle a failure past a closure that could only return a String. The `?` in the closure now carries it, which is what the PHP does -- a throw from the callback leaves preg_replace_callback at the failing match rather than running the remaining replacements and reporting the last error. The module doc that explained why composer/pcre's exceptions and *StrictGroups() variants have no counterpart moves to the shim's preg module, where the functions it describes live. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/util/platform.rs')
-rw-r--r--crates/shirabe/src/util/platform.rs27
1 files changed, 14 insertions, 13 deletions
diff --git a/crates/shirabe/src/util/platform.rs b/crates/shirabe/src/util/platform.rs
index 606ff43d..91039c17 100644
--- a/crates/shirabe/src/util/platform.rs
+++ b/crates/shirabe/src/util/platform.rs
@@ -2,12 +2,12 @@
use crate::util::ProcessExecutor;
use crate::util::Silencer;
-use shirabe_pcre::{Preg, PregMatches};
use shirabe_php_shim::{
- PHP_ENV, PHP_SERVER, PhpMixed, PhpResource, RuntimeException, defined, file_exists,
- file_get_contents, fstat, function_exists, getcwd, getenv, ini_get, is_readable, mb_strlen,
- php_os_family, php_regex, posix_geteuid, posix_getpwuid, posix_getuid, posix_isatty, putenv,
- putenv_clear, realpath, stream_isatty, stripos, strlen, strtoupper, substr, usleep,
+ PHP_ENV, PHP_SERVER, PhpMixed, PhpResource, PregMatches, RuntimeException, defined,
+ file_exists, file_get_contents, fstat, function_exists, getcwd, getenv, ini_get, is_readable,
+ mb_strlen, php_os_family, php_regex, posix_geteuid, posix_getpwuid, posix_getuid, posix_isatty,
+ preg_match2, preg_replace_callback, putenv, putenv_clear, realpath, stream_isatty, stripos,
+ strlen, strtoupper, substr, usleep,
};
use std::sync::Mutex;
@@ -83,7 +83,7 @@ impl Platform {
/// Parses tildes and environment variables in paths.
pub fn expand_path(path: &str) -> String {
- if Preg::is_match(php_regex!(r"#^~[\\/]#"), path) {
+ if preg_match2(php_regex!(r"#^~[\\/]#"), path, 0).is_some() {
return format!(
"{}{}",
Self::get_user_directory().unwrap(),
@@ -95,9 +95,9 @@ impl Platform {
// The original pattern uses a conditional subpattern to make the trailing `%` required
// only for the `%VAR%` form. The Rust regex crate does not support conditionals, so the
// two forms are written as an explicit alternation: `$VAR` or `%VAR%`.
- Preg::replace_callback(
+ preg_replace_callback(
php_regex!(r"#^(?:\$(?P<dvar>\w+)|%(?P<pvar>\w+)%)(?P<path>.*)#"),
- |matches: &PregMatches| -> String {
+ |matches: &PregMatches| -> anyhow::Result<String> {
let var = matches
.name("dvar")
.or_else(|| matches.name("pvar"))
@@ -108,24 +108,25 @@ impl Platform {
let home =
Platform::get_env("HOME").filter(|v| PhpMixed::String(v.clone()).to_bool());
if let Some(home) = home {
- return format!("{}{}", home, path_part);
+ return Ok(format!("{}{}", home, path_part));
}
- return format!(
+ return Ok(format!(
"{}{}",
Platform::get_env("USERPROFILE").unwrap_or_default(),
path_part,
- );
+ ));
}
- format!(
+ Ok(format!(
"{}{}",
Platform::get_env(var).unwrap_or_default(),
path_part,
- )
+ ))
},
path,
)
+ .expect("the replacement callback cannot fail")
}
/// @throws \RuntimeException If the user home could not reliably be determined