From a3171eefd8f8e520329bdd8f613e83ba6f0a7c13 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 21 Jun 2026 18:49:24 +0900 Subject: refactor(php-shim): remove ArrayObject, inline IndexMap into PhpMixed::Object ArrayObject was only a thin wrapper around IndexMap used as an empty-{} vs empty-[] marker and as the assoc=false JSON object representation; no reference semantics were involved. Inline its payload directly into PhpMixed::Object and drop the type along with the now-dead StdClass. Side effects of the unification: - ArrayObject::new was todo!(); the config --global / object-typed get paths that built PhpMixed::Object(ArrayObject::new(None)) no longer panic. - base_config_command wrote 'config' as PhpMixed::Array(empty), emitting [] instead of {}; now matches PHP's new \ArrayObject ({}). - The dead is::()/is::() instanceof checks in JsonManipulator are replaced with the faithful as_object() mapping. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe-php-shim/src/json.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'crates/shirabe-php-shim/src/json.rs') diff --git a/crates/shirabe-php-shim/src/json.rs b/crates/shirabe-php-shim/src/json.rs index 23c4c41..3d3ee5b 100644 --- a/crates/shirabe-php-shim/src/json.rs +++ b/crates/shirabe-php-shim/src/json.rs @@ -1,4 +1,3 @@ -use crate::ArrayObject; use crate::PhpMixed; use indexmap::IndexMap; @@ -58,7 +57,7 @@ pub fn json_encode_ex( // PHP's two-argument `json_decode`: without JSON_THROW_ON_ERROR it never throws, // returning null on malformed input. With `assoc` false, JSON objects decode to -// stdClass-equivalent ArrayObject values; with `assoc` true, to associative arrays. +// stdClass-equivalent `PhpMixed::Object` values; with `assoc` true, to associative arrays. pub fn json_decode(s: &str, assoc: bool) -> anyhow::Result { match serde_json::from_str::(s) { Ok(value) => Ok(json_value_to_php_mixed(value, assoc)), @@ -91,9 +90,7 @@ fn json_value_to_php_mixed(value: serde_json::Value, assoc: bool) -> PhpMixed { if assoc { PhpMixed::Array(data) } else { - PhpMixed::Object(ArrayObject { - data: data.into_iter().collect(), - }) + PhpMixed::Object(data) } } } -- cgit v1.3.1