diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-23 12:43:10 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-23 13:24:29 +0900 |
| commit | 0b48f4a46d24248e4c012ef37d25b5963c27a78c (patch) | |
| tree | a4c189be4419ded8e2252bc0c250aecfc66b3c36 /crates/shirabe/src/console | |
| parent | 890a50de2a740cc4c4edba12b37cc9aa4d0efdc5 (diff) | |
| download | php-shirabe-0b48f4a46d24248e4c012ef37d25b5963c27a78c.tar.gz php-shirabe-0b48f4a46d24248e4c012ef37d25b5963c27a78c.tar.zst php-shirabe-0b48f4a46d24248e4c012ef37d25b5963c27a78c.zip | |
fix(fs): carry file_get_contents results as bytes
file_get_contents() and file_get_contents_with_max_length() return
Vec<u8> instead of a from_utf8_lossy'd String.
Call sites whose consumer takes a &str still convert lossily and are
marked TODO(bytes).
file_get_contents_with_max_length() now reads at most the requested
number of bytes instead of the whole file.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/console')
| -rw-r--r-- | crates/shirabe/src/console/application.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs index 24aee249..233ff751 100644 --- a/crates/shirabe/src/console/application.rs +++ b/crates/shirabe/src/console/application.rs @@ -2263,7 +2263,7 @@ impl ApplicationHandle { bin2hex(&random_bytes(5)) ); if !(file_put_contents(&tempfile, file!().as_bytes()).is_some_and(|n| n > 0) - && file_get_contents(&tempfile).as_deref() == Some(file!()) + && file_get_contents(&tempfile).as_deref().ok() == Some(file!().as_bytes()) && unlink(&tempfile).is_ok() && !file_exists(&tempfile)) { @@ -2280,9 +2280,11 @@ impl ApplicationHandle { // add non-standard scripts as own commands let file = Factory::get_composer_file().unwrap_or_default(); if may_need_script_command && is_file(&file) && Filesystem::is_readable(&file) { - let composer_json: PhpMixed = - json_decode_assoc(&file_get_contents(&file).unwrap_or_default()) - .unwrap_or(PhpMixed::Null); + // TODO(bytes): json_decode_assoc takes the JSON as a &str. + let composer_json: PhpMixed = json_decode_assoc(&String::from_utf8_lossy( + &file_get_contents(&file).unwrap_or_default(), + )) + .unwrap_or(PhpMixed::Null); if let Some(arr) = composer_json.as_array() && let Some(scripts) = arr.get("scripts").and_then(|v| v.as_array()) { |