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

Author: Tim Düsterhus (TimWolla)
Date: 2026-07-12T19:53:12+02:00

Commit: https://github.com/php/php-src/commit/a182b7f1b10bd27a4aaa15ad2609bea486577ff0
Raw diff: https://github.com/php/php-src/commit/a182b7f1b10bd27a4aaa15ad2609bea486577ff0.diff

Merge branch 'PHP-8.5'

* PHP-8.5:
  Fix macOS compatibility of update-lexbor.sh

Changed paths:
  M  ext/lexbor/patches/update-lexbor.sh


Diff:

diff --git a/ext/lexbor/patches/update-lexbor.sh b/ext/lexbor/patches/update-lexbor.sh
index ae288285453d..92ef8aa58f66 100755
--- a/ext/lexbor/patches/update-lexbor.sh
+++ b/ext/lexbor/patches/update-lexbor.sh
@@ -15,7 +15,10 @@ git clone "$LEXBOR_REPO" "$LEXBOR_TMP_DIR"
 (cd "$LEXBOR_TMP_DIR" && git checkout "$LEXBOR_REF")
 
 # Apply patches
-mapfile -t patches < <(ls "$PATCHES_DIR"/*.patch)
+patches=()
+for f in "$PATCHES_DIR"/*.patch; do
+    [ -e "$f" ] && patches+=("$f")
+done
 cd "$LEXBOR_TMP_DIR"
 for patch in "${patches[@]}"; do
     if ! git am -3 "$patch"; then