4 files changed, 11 insertions, 37 deletions

diff --git a/crates/shirabe/src/package/dumper/array_dumper.rs b/crates/shirabe/src/package/dumper/array_dumper.rs
index 4217308..27fc415 100644
--- a/crates/shirabe/src/package/dumper/array_dumper.rs
+++ b/crates/shirabe/src/package/dumper/array_dumper.rs
@@ -1,7 +1,7 @@
 //! ref: composer/src/Composer/Package/Dumper/ArrayDumper.php
 
 use indexmap::IndexMap;
-use shirabe_php_shim::PhpMixed;
+use shirabe_php_shim::{DATE_RFC3339, PhpMixed};
 
 use crate::package::Mirror;
 use crate::package::PackageInterfaceHandle;
@@ -156,7 +156,7 @@ impl ArrayDumper {
         if let Some(release_date) = package.get_release_date() {
             data.insert(
                 "time".to_string(),
-                PhpMixed::String(release_date.to_rfc3339()),
+                PhpMixed::String(release_date.format(DATE_RFC3339).to_string()),
             );
         }
 
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,
-        }))
-    }
 }
diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs
index 5f13a31..2546780 100644
--- a/crates/shirabe/src/package/locker.rs
+++ b/crates/shirabe/src/package/locker.rs
@@ -876,7 +876,6 @@ impl Locker {
                             None,
                         );
                         if Preg::is_match(r"{^\s*\d+\s*$}", &output_str).unwrap_or(false) {
-                            // TODO(phase-b): new \DateTime('@'.trim($output), new \DateTimeZone('UTC'))
                             let ts = trim(&output_str, None).parse::<i64>().unwrap_or(0);
                             datetime = chrono::DateTime::from_timestamp(ts, 0);
                         }