Commit 5d0ccdb6f74 for php
commit 5d0ccdb6f74df918ff1b2a58afc8ae64be468524
Merge: 0614b703d85 030d2f274b2
Author: Daniel Scherzer <daniel.e.scherzer+phpf@gmail.com>
Date: Mon Nov 2 15:24:52 2026 -0800
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Persist the `pear/install-pear-nozlib.phar` file
Update PEAR failed download installation banner (#14216)
diff --cc .gitattributes
index 8dea3f8bbaf,5e0446c0762..d1fa824bb59
--- a/.gitattributes
+++ b/.gitattributes
@@@ -30,5 -30,7 +30,8 @@@
/ext/date/tests/ossfuzz*.txt binary
# Vendored libraries
-/ext/dom/lexbor/lexbor linguist-vendored
+/ext/lexbor/lexbor linguist-vendored
+/ext/uri/uriparser linguist-vendored
+
+ # The phar has some binary
+ /pear/install-pear-nozlib.phar binary
diff --cc pear/Makefile.frag
index 642267cc242,366ad4a9575..fc56dfcbcbc
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@@ -1,13 -1,10 +1,10 @@@
peardir=$(PEAR_INSTALLDIR)
# Skip all php.ini files altogether
-PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0
+PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1
- WGET = `which wget 2>/dev/null`
- FETCH = `which fetch 2>/dev/null`
PEAR_PREFIX = -dp a${program_prefix}
PEAR_SUFFIX = -ds a$(program_suffix)
- PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
install-pear-installer: $(SAPI_CLI_PATH)
@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}