From b291e714bc739262140323e08fe2fb9e91e00ee7 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 22 Jun 2026 23:41:12 +0900 Subject: feat(php-shim): implement fopen-family stream API on PhpResource Redesign PhpResource into a real stream handle (File/Memory backing with tracked position, eof, closed state) and unify the whole fopen family (fopen/fwrite/fread/fgets/fgetc/feof/fclose/ftell/fseek/rewind/fstat/ ftruncate/fflush and stream_get_contents/stream_copy_to_stream) on &PhpResource, replacing the split PhpMixed/PhpResource APIs and their todo!() stubs. fopen now returns Result; read functions stay String for now (TODO(phase-e) to move to byte strings). Propagate the signatures through callers: Process stdout/stderr, Cursor input, curl header/body handles (extracted into typed maps keyed by job id), Filesystem copy/safe_copy/files_are_equal, BufferIO, error_handler, platform, perforce, zip. The proc_open pipe paths cannot carry a PhpResource in a PhpMixed list, so they are left as todo!() with notes. --- crates/shirabe/src/util/platform.rs | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'crates/shirabe/src/util/platform.rs') diff --git a/crates/shirabe/src/util/platform.rs b/crates/shirabe/src/util/platform.rs index 449874e..442b4d9 100644 --- a/crates/shirabe/src/util/platform.rs +++ b/crates/shirabe/src/util/platform.rs @@ -291,13 +291,7 @@ impl Platform { /// @param ?resource $fd Open file descriptor or null to default to STDOUT pub fn is_tty(fd: Option) -> bool { - let fd = match fd { - Some(f) => f, - None => { - // TODO(phase-c): STDOUT is not yet modeled as a `PhpResource` constant. - todo!("STDOUT resource constant") - } - }; + let fd = fd.unwrap_or(shirabe_php_shim::STDOUT); // detect msysgit/mingw and assume this is a tty because detection // does not work correctly, see https://github.com/composer/composer/issues/9690 @@ -323,19 +317,18 @@ impl Platform { return true; } - let stat = Silencer::call(|| Ok(fstat(fd))); + let stat = Silencer::call(|| Ok(fstat(&fd))); let stat = match stat { Ok(s) => s, Err(_) => return false, }; - if matches!(stat, PhpMixed::Bool(false)) { - return false; - } + let stat = match stat { + Some(stat) => stat, + None => return false, + }; // Check if formatted mode is S_IFCHR - if let Some(arr) = stat.as_array() - && let Some(mode) = arr.get("mode").and_then(|v| v.as_int()) - { + if let Some(mode) = stat.get("mode").and_then(|v| v.as_int()) { return 0o020000 == (mode & 0o170000); } -- cgit v1.3.1