aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/command/config_command.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-05 04:45:11 +0900
committernsfisis <nsfisis@gmail.com>2026-06-05 04:45:11 +0900
commitd0edb5b7ac3456f99c2f2576e8992cc12d60574a (patch)
treeb69546366676c06e1c8fabddb592c202436a92b2 /crates/shirabe/src/command/config_command.rs
parent53800ab77565de1c16fb8a95e047eba1cb3a160c (diff)
downloadphp-shirabe-d0edb5b7ac3456f99c2f2576e8992cc12d60574a.tar.gz
php-shirabe-d0edb5b7ac3456f99c2f2576e8992cc12d60574a.tar.zst
php-shirabe-d0edb5b7ac3456f99c2f2576e8992cc12d60574a.zip
refactor(json): model JsonFile encode/write options as a typed struct
Replace the i64 bitmask + encode_with_indent split with a JsonEncodeOptions struct (Default = JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE, default indent). encode/write each get a default form plus an explicit encode_with_options/write_with_options variant, mirroring PHP's optional $options argument. write_with_options always encodes with self.indent, matching PHP write(). Also reconcile call sites with the PHP sources: most ported sites passed 0 where Composer omits the argument (= default flags), so JsonManipulator/ShowCommand and JsonConfigSource now use the default options; only ComposerRepository and Locker genuinely pass 0. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/command/config_command.rs')
-rw-r--r--crates/shirabe/src/command/config_command.rs20
1 files changed, 13 insertions, 7 deletions
diff --git a/crates/shirabe/src/command/config_command.rs b/crates/shirabe/src/command/config_command.rs
index 476be75..40a12e1 100644
--- a/crates/shirabe/src/command/config_command.rs
+++ b/crates/shirabe/src/command/config_command.rs
@@ -8,12 +8,11 @@ use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
use shirabe_external_packages::symfony::component::console::input::InputInterface;
use shirabe_external_packages::symfony::component::console::output::OutputInterface;
use shirabe_php_shim::{
- ArrayObject, InvalidArgumentException, JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE,
- JsonObject, PhpMixed, RuntimeException, array_filter, array_filter_use_key, array_is_list,
- array_map, array_merge, array_unique, call_user_func, count, escapeshellcmd, exec, explode,
- file_exists, file_get_contents, implode, in_array, is_array, is_bool, is_dir, is_numeric,
- is_object, is_string, json_encode, key, sort, sprintf, str_replace, str_starts_with, strpos,
- strtolower, system, touch, var_export,
+ ArrayObject, InvalidArgumentException, JsonObject, PhpMixed, RuntimeException, array_filter,
+ array_filter_use_key, array_is_list, array_map, array_merge, array_unique, call_user_func,
+ count, escapeshellcmd, exec, explode, file_exists, file_get_contents, implode, in_array,
+ is_array, is_bool, is_dir, is_numeric, is_object, is_string, json_encode, key, sort, sprintf,
+ str_replace, str_starts_with, strpos, strtolower, system, touch, var_export,
};
use crate::advisory::Auditor;
@@ -26,6 +25,7 @@ use crate::console::input::InputArgument;
use crate::factory::Factory;
use crate::io::IOInterface;
use crate::io::IOInterfaceImmutable;
+use crate::json::JsonEncodeOptions;
use crate::json::JsonFile;
use crate::package::base_package::{self, BasePackage};
use crate::util::Filesystem;
@@ -476,7 +476,13 @@ impl ConfigCommand {
}
let value_str = if is_array(&value) || is_object(&value) || is_bool(&value) {
- JsonFile::encode(&value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)
+ JsonFile::encode_with_options(
+ &value,
+ JsonEncodeOptions {
+ pretty_print: false,
+ ..Default::default()
+ },
+ )
} else {
value.as_string().unwrap_or("").to_string()
};