diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-06-09 00:00:12 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-06-09 00:00:49 +0900 |
| commit | 1c0eb589741de4aa52ef941ff9315b34dbe48aa0 (patch) | |
| tree | 8d821cf3a7fb3f8c753dec7861ad9597f6948493 /crates/shirabe/src/package/loader | |
| parent | e5b789616ec4c1cbd152c5ccbefe2d27ced4a18f (diff) | |
| download | php-shirabe-1c0eb589741de4aa52ef941ff9315b34dbe48aa0.tar.gz php-shirabe-1c0eb589741de4aa52ef941ff9315b34dbe48aa0.tar.zst php-shirabe-1c0eb589741de4aa52ef941ff9315b34dbe48aa0.zip | |
feat(datetime): resolve datetime TODOs
Introduce shim functions and constants, replacing the ad-hoc chrono
format strings and parse helpers used as phase-b placeholders.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/package/loader')
| -rw-r--r-- | crates/shirabe/src/package/loader/array_loader.rs | 15 | ||||
| -rw-r--r-- | crates/shirabe/src/package/loader/validating_array_loader.rs | 28 |
2 files changed, 9 insertions, 34 deletions
diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs index d2aeac6..4df022b 100644 --- a/crates/shirabe/src/package/loader/array_loader.rs +++ b/crates/shirabe/src/package/loader/array_loader.rs @@ -1,12 +1,12 @@ //! ref: composer/src/Composer/Package/Loader/ArrayLoader.php use anyhow::Result; -use chrono::{DateTime, TimeZone, Utc}; +use chrono::Utc; use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ - E_USER_DEPRECATED, Exception, PhpMixed, UnexpectedValueException, is_scalar, is_string, - json_encode, ltrim, sprintf, stripos, strpos, strtolower, strval, substr, trigger_error, trim, + E_USER_DEPRECATED, PhpMixed, UnexpectedValueException, is_scalar, is_string, json_encode, + ltrim, sprintf, stripos, strpos, strtolower, strval, substr, trigger_error, trim, }; use crate::package::CompleteAliasPackageHandle; @@ -527,14 +527,7 @@ impl ArrayLoader { time_str.to_string() }; - let result: std::result::Result<DateTime<Utc>, Exception> = - // TODO(phase-b): port PHP `new \DateTime($time, new \DateTimeZone('UTC'))` - Utc.datetime_from_str(&time, "%Y-%m-%dT%H:%M:%S%z") - .map_err(|e| Exception { - message: e.to_string(), - code: 0, - }); - if let Ok(date) = result { + if let Ok(date) = shirabe_php_shim::date_create::<Utc>(&time) { package.package_mut().set_release_date(Some(date)); } } diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs index 4994d5a..e6db19e 100644 --- a/crates/shirabe/src/package/loader/validating_array_loader.rs +++ b/crates/shirabe/src/package/loader/validating_array_loader.rs @@ -6,10 +6,10 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::Preg; use shirabe_external_packages::composer::spdx_licenses::SpdxLicenses; use shirabe_php_shim::{ - E_USER_DEPRECATED, Exception, FILTER_VALIDATE_EMAIL, PHP_EOL, PhpMixed, array_intersect_key, - array_values, filter_var, get_debug_type, is_array, is_bool, is_int, is_numeric, is_scalar, - is_string, json_encode, parse_url_all, php_to_string, sprintf, str_replace, strcasecmp, - strtolower, strtotime, substr, trigger_error, trim, var_export, + E_USER_DEPRECATED, FILTER_VALIDATE_EMAIL, PHP_EOL, PhpMixed, array_intersect_key, array_values, + filter_var, get_debug_type, is_array, is_bool, is_int, is_numeric, is_scalar, is_string, + json_encode, parse_url_all, php_to_string, sprintf, str_replace, strcasecmp, strtolower, + strtotime, substr, trigger_error, trim, var_export, }; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MatchNoneConstraint; @@ -166,7 +166,7 @@ impl ValidatingArrayLoader { self.validate_string("time", false); if self.config.contains_key("time") { let time_str = self.config["time"].as_string().unwrap_or("").to_string(); - match Self::parse_datetime_utc(&time_str) { + match shirabe_php_shim::date_create::<chrono::Utc>(&time_str) { Ok(dt) => { release_date = Some(dt); } @@ -1591,22 +1591,4 @@ impl ValidatingArrayLoader { None => true, } } - - fn parse_datetime_utc(s: &str) -> anyhow::Result<chrono::DateTime<chrono::Utc>> { - // TODO(phase-b): PHP's `new \DateTime($s, new \DateTimeZone('UTC'))` accepts - // many free-form formats; approximate with chrono for now. - if let Ok(dt) = chrono::DateTime::parse_from_rfc3339(s) { - return Ok(dt.with_timezone(&chrono::Utc)); - } - if let Ok(dt) = chrono::NaiveDateTime::parse_from_str(s, "%Y-%m-%d %H:%M:%S") { - return Ok(chrono::Utc.from_utc_datetime(&dt)); - } - if let Ok(d) = chrono::NaiveDate::parse_from_str(s, "%Y-%m-%d") { - return Ok(chrono::Utc.from_utc_datetime(&d.and_hms_opt(0, 0, 0).unwrap())); - } - Err(anyhow::anyhow!(Exception { - message: format!("Failed to parse date: {}", s), - code: 0, - })) - } } |
