[php-src] master: Merge branch 'PHP-8.4' into PHP-8.5

Author: Jorg Sowa (jorgsowa) Date: 2026-10-24T21:20:18+02:00 Commit: https://github.com/php/php-src/commit/24f80278225cd5ffcbf959f9d7a6e99d5cf928de Raw diff: https://github.com/php/php-src/commit/24f80278225cd5ffcbf959f9d7a6e99d5cf928de.diff Merge branch 'PHP-8.4' into PHP-8.5 Changed paths: M ext/standard/tests/general_functions/proc_open_descriptor_0_setup_failure.phpt M ext/standard/tests/general_functions/proc_open_socket_descriptor_0_setup_failure.phpt Diff: diff --git a/ext/standard/tests/general_functions/proc_open_descriptor_0_setup_failure.phpt b/ext/standard/tests/general_functions/proc_open_descriptor_0_setup_failure.phpt index ea654b0f497a..0aca62b2903a 100644 --- a/ext/standard/tests/general_functions/proc_open_descriptor_0_setup_failure.phpt +++ b/ext/standard/tests/general_functions/proc_open_descriptor_0_setup_failure.phpt @@ -5,8 +5,8 @@ proc_open() closes descriptor 0 when setup fails after pipe allocation if (!function_exists("proc_open")) { die("skip proc_open() unavailable"); } -if (!@is_dir("/proc/self/fd")) { - die("skip requires /proc/self/fd"); +if (!@is_link("/proc/self/fd/1")) { + die("skip requires /proc/self/fd symlinks"); } ?> --FILE-- diff --git a/ext/standard/tests/general_functions/proc_open_socket_descriptor_0_setup_failure.phpt b/ext/standard/tests/general_functions/proc_open_socket_descriptor_0_setup_failure.phpt index 88e4eee1b20b..f2b30c89309c 100644 --- a/ext/standard/tests/general_functions/proc_open_socket_descriptor_0_setup_failure.phpt +++ b/ext/standard/tests/general_functions/proc_open_socket_descriptor_0_setup_failure.phpt @@ -5,8 +5,8 @@ proc_open() closes descriptor 0 when setup fails after socket allocation if (!function_exists("proc_open")) { die("skip proc_open() unavailable"); } -if (!@is_dir("/proc/self/fd")) { - die("skip requires /proc/self/fd"); +if (!@is_link("/proc/self/fd/1")) { + die("skip requires /proc/self/fd symlinks"); } ?> --FILE--