Commit 030d2f274b2 for php
commit 030d2f274b28f70450a0930f58c11cd7b0a83b8d
Merge: 6e6ec4b267e 8ce6fe83290
Author: Daniel Scherzer <daniel.e.scherzer+phpf@gmail.com>
Date: Mon Nov 2 15:24:10 2026 -0800
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
Persist the `pear/install-pear-nozlib.phar` file
Update PEAR failed download installation banner (#14216)
diff --cc .gitattributes
index 86797917210,440904fd492..5e0446c0762
--- a/.gitattributes
+++ b/.gitattributes
@@@ -26,8 -25,8 +26,11 @@@
/Zend/zend_vm_handlers.h linguist-generated -diff
/Zend/zend_vm_opcodes.[ch] linguist-generated -diff
-# The OSS fuzz files are bunary
+# The OSS fuzz files are binary
/ext/date/tests/ossfuzz*.txt binary
+# Vendored libraries
+/ext/dom/lexbor/lexbor linguist-vendored
++
+ # The phar has some binary
+ /pear/install-pear-nozlib.phar binary
diff --cc scripts/dev/makedist
index 9417515fe1d,75ef434967f..6c8ef3c1dc8
--- a/scripts/dev/makedist
+++ b/scripts/dev/makedist
@@@ -160,25 -152,12 +160,12 @@@ f
# Remove not needed files.
rm -rf autom4te.cache/
- # Download PEAR.
- echo ""
- echo "makedist: Attempting to download PEAR's phar archive."
- if test ! -x wget; then
- wget https://pear.php.net/install-pear-nozlib.phar -nd -P pear/
- if [ "x$?" != "x0" ]; then
- echo "makedist: PEAR download failed." >&2
- exit 1
- fi
- else
- echo "makedist: Missing wget binary needed for PEAR download." >&2
- exit 1
- fi
-
# Reset the modification and access times of all files to be packaged.
commitDate="$(git log -1 --format=%cI $treeish)"
+ echo ""
echo "makedist: Resetting the modification and access times of package files to $commitDate"
-touch -c -d"$commitDate" NEWS
-find . -exec touch -r NEWS -c {} \;
+"$touch" -c -d"$commitDate" NEWS
+find . -exec "$touch" -r NEWS -c {} \;
cd ..