From fce44d4587ba11b080fe0266c483d0be684ffd0d Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 16 Aug 2026 12:51:24 +0900 Subject: refactor(php-shim): split json_decode into assoc and obj variants The assoc flag was always a literal at every call site, so the boolean carried no information the function name could not. json_decode_assoc and json_decode_obj make the resulting PhpMixed shape visible at the call site. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/tests/json/json_file_test.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/shirabe/tests/json/json_file_test.rs') diff --git a/crates/shirabe/tests/json/json_file_test.rs b/crates/shirabe/tests/json/json_file_test.rs index 27b43a05..490571ec 100644 --- a/crates/shirabe/tests/json/json_file_test.rs +++ b/crates/shirabe/tests/json/json_file_test.rs @@ -198,9 +198,9 @@ fn test_double_escaped_unicode() { wrapper.insert("t".to_string(), PhpMixed::String(encoded_data)); let double_encoded_data = JsonFile::encode(&PhpMixed::Array(wrapper)).unwrap(); - let decoded_data = shirabe_php_shim::json_decode(&double_encoded_data, true).unwrap(); + let decoded_data = shirabe_php_shim::json_decode_assoc(&double_encoded_data).unwrap(); let t = decoded_data.as_array().unwrap().get("t").unwrap(); - let double_data = shirabe_php_shim::json_decode(t.as_string().unwrap(), true).unwrap(); + let double_data = shirabe_php_shim::json_decode_assoc(t.as_string().unwrap()).unwrap(); assert_eq!(data, double_data); } @@ -439,7 +439,7 @@ fn test_auth_schema_validation_with_custom_data_source() { // INCOMPATIBILITY NOTE: upstream asserts justinrainbow's "github-oauth : String value found, but an // object is required". The jsonschema crate reports the same type violation with different // wording. - let json = shirabe_php_shim::json_decode("{\"github-oauth\": \"foo\"}", false).unwrap(); + let json = shirabe_php_shim::json_decode_obj("{\"github-oauth\": \"foo\"}").unwrap(); let expected_message = "\"COMPOSER_AUTH\" does not match the expected JSON schema".to_string(); let expected_error = "github-oauth : \"foo\" is not of type \"object\"".to_string(); -- cgit v1.3.1-4-g156e