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. --- .../src/symfony/console/terminal.rs | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'crates/shirabe-external-packages/src/symfony/console/terminal.rs') diff --git a/crates/shirabe-external-packages/src/symfony/console/terminal.rs b/crates/shirabe-external-packages/src/symfony/console/terminal.rs index e0de3f2..ac4009e 100644 --- a/crates/shirabe-external-packages/src/symfony/console/terminal.rs +++ b/crates/shirabe-external-packages/src/symfony/console/terminal.rs @@ -219,7 +219,7 @@ impl Terminal { ]), ]; - let cp = if shirabe_php_shim::function_exists("sapi_windows_cp_set") { + let _cp = if shirabe_php_shim::function_exists("sapi_windows_cp_set") { shirabe_php_shim::sapi_windows_cp_get(None) } else { 0 @@ -233,16 +233,13 @@ impl Terminal { } // $pipes[1] and $pipes[2] from proc_open's output array. - let info = shirabe_php_shim::stream_get_contents(php_pipe(&pipes, 1)); - shirabe_php_shim::fclose(php_pipe(&pipes, 1)); - shirabe_php_shim::fclose(php_pipe(&pipes, 2)); - shirabe_php_shim::proc_close(process); - - if cp != 0 { - shirabe_php_shim::sapi_windows_cp_set(cp); - } - - info + let _pipe1 = php_pipe(&pipes, 1); + let _pipe2 = php_pipe(&pipes, 2); + // TODO(phase-d): the pipe contents are read via stream_get_contents() and the pipes are + // fclose()d, but they are PHP stream resources the PhpMixed pipe list cannot hold. + todo!( + "Terminal: reading proc_open pipes needs PhpResource handles the PhpMixed pipe list cannot carry" + ); } } -- cgit v1.3.1