Merge remote-tracking branch 'upstream/stable' into stable

Author: dries-c

.github/workflows/main-pm-matrix.yml

@@ -198,7 +198,7 @@ jobs:
           removeArtifacts: true
           bodyFile: ${{ github.workspace }}/changelog.md
           makeLatest: ${{ inputs.special-release == 'default-latest' }}
-          prerelease: ${{ inputs.pm-preview == 'true' }}
+          prerelease: ${{ inputs.pm-preview == true }}
 
       - name: Update php-version PM release
         uses: ncipollo/release-action@v1.20.0
@@ -214,5 +214,5 @@ jobs:
           removeArtifacts: true
           bodyFile: ${{ github.workspace }}/changelog.md
           makeLatest: false
-          prerelease: ${{ inputs.pm-preview == 'true' }}
+          prerelease: ${{ inputs.pm-preview == true }}
 

compile.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-PHP_VERSIONS=("8.1.33" "8.2.29" "8.3.25" "8.4.12")
+PHP_VERSIONS=("8.1.33" "8.2.29" "8.3.25" "8.4.12" "8.5.0beta3")
 
 #### NOTE: Tags with "v" prefixes behave weirdly in the GitHub API. They'll be stripped in some places but not others.
 #### Use commit hashes to avoid this.
@@ -46,6 +46,10 @@ EXT_ZSTD_VERSION="0.15.2"
 EXT_GRPC_VERSION="1.57.3"
 EXT_VANILLAGENERATOR_VERSION="abd059fd2ca79888aab3b9c5070d83ceea55fada"
 
+EXT_PMMPTHREAD_VERSION_PHP85="4aa34a27feaa43adba5f1e93939828d1d7afdefc"
+EXT_XDEBUG_VERSION_PHP85="86727b0b05b5d0a9c4fb85021f05d7931e2c3a35"
+EXT_IGBINARY_VERSION_PHP85="8f8b7175c7859f1845bcdee6f7d0baeea7d07cb8"
+
 function write_out {
 	echo "[$1] $2"
 }
@@ -315,6 +319,11 @@ fi
 PHP_VERSION_ID=$(php_version_id "$PHP_VERSION")
 write_out "opt" "Selected PHP $PHP_VERSION ($PHP_VERSION_ID)"
 
+if [ $PHP_VERSION_ID -ge 80500 ]; then
+  EXT_PMMPTHREAD_VERSION="$EXT_PMMPTHREAD_VERSION_PHP85"
+  EXT_XDEBUG_VERSION="$EXT_XDEBUG_VERSION_PHP85"
+  EXT_IGBINARY_VERSION="$EXT_IGBINARY_VERSION_PHP85"
+fi
 if [ $PHP_VERSION_ID -ge 80400 ]; then
   HAVE_OPCACHE_JIT="yes"
 fi
@@ -1774,7 +1783,9 @@ echo "recursionguard.enabled=0 ;disabled due to minor performance impact, only e
 echo "extension_dir=./$INSTALL_DIR/lib/php/extensions/no-debug-zts-20230831" >> "$INSTALL_DIR/bin/php.ini"
 
 if [ "$HAVE_OPCACHE" == "yes" ]; then
-	echo "zend_extension=opcache.so" >> "$INSTALL_DIR/bin/php.ini"
+	if [ "$PHP_VERSION_ID" -lt 80500 ]; then
+		echo "zend_extension=opcache.so" >> "$INSTALL_DIR/bin/php.ini"
+	fi
 	echo "opcache.enable=1" >> "$INSTALL_DIR/bin/php.ini"
 	echo "opcache.enable_cli=1" >> "$INSTALL_DIR/bin/php.ini"
 	echo "opcache.save_comments=1" >> "$INSTALL_DIR/bin/php.ini"

windows-compile-vs.ps1

@@ -1,9 +1,9 @@
 $ErrorActionPreference="Stop"
 $ProgressPreference="SilentlyContinue"
 
-$PHP_VERSIONS=@("8.1.33", "8.2.29", "8.3.25", "8.4.12")
+$PHP_VERSIONS=@("8.1.33", "8.2.29", "8.3.25", "8.4.12", "8.5.0beta3")
 
-$PHP_SDK_VER="2.3.0"
+$PHP_SDK_VER="2.4.0"
 $ARCH="x64"
 
 #### NOTE: Tags with "v" prefixes behave weirdly in the GitHub API. They'll be stripped in some places but not others.
@@ -37,6 +37,10 @@ $PHP_LIBKAFKA_VER="6.0.3"
 $PHP_ZSTD_VER="0.15.2"
 $PHP_GRPC_VER="1.57.3"
 
+$PHP_PMMPTHREAD_VER_PHP85="4aa34a27feaa43adba5f1e93939828d1d7afdefc"
+$PHP_IGBINARY_VER_PHP85="8f8b7175c7859f1845bcdee6f7d0baeea7d07cb8"
+$PHP_XDEBUG_VER_PHP85="86727b0b05b5d0a9c4fb85021f05d7931e2c3a35"
+
 function pm-echo {
     param ([string] $message)
 
@@ -209,6 +213,11 @@ if ($PHP_VERSION_ID -ge 80400) {
 
 pm-echo "Selected PHP $PHP_VER ($PHP_VERSION_ID), SDK target $VC_VER ($SDK_TOOLSET_FLAG), CMake target $CMAKE_TARGET ($CMAKE_TOOLSET_FLAG)"
 
+if ($PHP_VERSION_ID -ge 80500) {
+    $PHP_PMMPTHREAD_VER=$PHP_PMMPTHREAD_VER_PHP85
+    $PHP_IGBINARY_VER=$PHP_IGBINARY_VER_PHP85
+    $PHP_XDEBUG_VER=$PHP_XDEBUG_VER_PHP85
+}
 $PHP_JIT_ENABLE_ARG="no"
 if ($PHP_VERSION_ID -ge 80400 -or $env:PHP_JIT_SUPPORT -eq 1) {
     $PHP_JIT_ENABLE_ARG="yes"
@@ -797,7 +806,9 @@ append-file-utf8 "extension=php_crypto.dll" $php_ini
 append-file-utf8 "extension=php_libdeflate.dll" $php_ini
 append-file-utf8 "extension=php_encoding.dll" $php_ini
 append-file-utf8 "igbinary.compact_strings=0" $php_ini
-append-file-utf8 "zend_extension=php_opcache.dll" $php_ini
+if ($PHP_VERSION_ID -lt 80500) {
+    append-file-utf8 "zend_extension=php_opcache.dll" $php_ini
+}
 append-file-utf8 "opcache.enable=1" $php_ini
 append-file-utf8 "opcache.enable_cli=1" $php_ini
 append-file-utf8 "opcache.save_comments=1" $php_ini