Merge tag 'php-8.1.22' into was-8.1.x

Tag for php-8.1.22

Author: MaxKellermann

.appveyor.yml

@@ -30,7 +30,7 @@ freebsd_task:
 arm_task:
   name: ARM_DEBUG_NTS
   arm_container:
-    image: gcc:10
+    image: debian:11
     additional_containers:
       - name: mysql
         image: mysql:8
@@ -52,6 +52,9 @@ arm_task:
     - apt-get update -y
     - >-
         apt-get install -y
+        gcc
+        g++
+        autoconf
         bison
         re2c
         locales
@@ -68,6 +71,7 @@ arm_task:
         libsasl2-dev
         libxpm-dev
         libzip-dev
+        libbz2-dev
         libsqlite3-dev
         libwebp-dev
         libonig-dev

.cirrus.yml

@@ -0,0 +1,10 @@
+name: Setup Caddy server
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+        sudo curl 'https://caddyserver.com/api/download?os=linux&arch=amd64' -o /usr/bin/caddy
+        sudo chmod +x /usr/bin/caddy
+        sudo caddy start --config ext/curl/tests/Caddyfile

.github/actions/setup-caddy/action.yml

@@ -44,8 +44,6 @@ DBDN=`sudo ldapsearch -Q -LLL -Y EXTERNAL -H ldapi:/// -b cn=config '(&(olcRootD
 
 sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/ppolicy.ldif
 
-sudo service slapd restart
-
 sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF
 dn: $DBDN
 changetype: modify
@@ -90,8 +88,6 @@ add: olcModuleLoad
 olcModuleLoad: dds
 EOF
 
-sudo service slapd restart
-
 sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// << EOF
 dn: olcOverlay=sssvlv,$DBDN
 objectClass: olcOverlayConfig
@@ -116,17 +112,13 @@ objectClass: olcDdsConfig
 olcOverlay: dds
 EOF
 
-sudo service slapd restart
-
 sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF
 dn: $DBDN
 changetype: modify
 add: olcDbIndex
 olcDbIndex: entryExpireTimestamp eq
 EOF
 
-sudo service slapd restart
-
 ldapadd -H ldapi:/// -D cn=Manager,dc=my-domain,dc=com -w secret <<EOF
 dn: dc=my-domain,dc=com
 objectClass: top
@@ -164,6 +156,8 @@ o: php ldap tests
 ## pwdSafeModify: FALSE
 EOF
 
+sudo service slapd restart
+
 # Verify TLS connection
 tries=0
 while : ; do

.github/scripts/setup-slapd.sh

@@ -1,6 +1,6 @@
 @echo off
 
-if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
+if /i "%GITHUB_ACTIONS%" neq "True" (
     echo for CI only
     exit /b 3
 )

.github/scripts/windows/build.bat

@@ -1,28 +1,10 @@
 @echo off
 
-if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
+if /i "%GITHUB_ACTIONS%" neq "True" (
     echo for CI only
     exit /b 3
 )
 
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\mingw >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\mingw-w64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\msys64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-Win32 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-Win64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-v11-Win32 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-v11-Win64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
 del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
 if %errorlevel% neq 0 exit /b 3
 del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL

.github/scripts/windows/build_task.bat

@@ -1,6 +1,6 @@
 @echo off
 
-if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
+if /i "%GITHUB_ACTIONS%" neq "True" (
     echo for CI only
     exit /b 3
 )

.github/scripts/windows/test.bat

@@ -1,6 +1,6 @@
 @echo off
 
-if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
+if /i "%GITHUB_ACTIONS%" neq "True" (
     echo for CI only
     exit /b 3
 )
@@ -32,11 +32,7 @@ set PDO_MYSQL_TEST_PASS=%MYSQL_PWD%
 set PDO_MYSQL_TEST_HOST=%MYSQL_TEST_HOST%
 set PDO_MYSQL_TEST_PORT=%MYSQL_TEST_PORT%
 set PDO_MYSQL_TEST_DSN=mysql:host=%PDO_MYSQL_TEST_HOST%;port=%PDO_MYSQL_TEST_PORT%;dbname=test
-if /i "%APPVEYOR%" equ "True" (
-    set TMP_MYSQL_BIN=%ProgramFiles%\MySql\MySQL Server 5.7\bin
-) else (
-    set TMP_MYSQL_BIN=C:\mysql\bin
-)
+set TMP_MYSQL_BIN=C:\mysql\bin
 "%TMP_MYSQL_BIN%\mysql.exe" --host=%PDO_MYSQL_TEST_HOST% --port=%MYSQL_TEST_PORT% --user=%MYSQL_TEST_USER% --password=%MYSQL_TEST_PASSWD% -e "CREATE DATABASE IF NOT EXISTS test"
 if %errorlevel% neq 0 exit /b 3
 
@@ -46,22 +42,14 @@ set PGPASSWORD=Password12!
 rem set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!
 echo ^<?php $conn_str = "host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%"; ?^> >> "./ext/pgsql/tests/config.inc"
 set PDO_PGSQL_TEST_DSN=pgsql:host=127.0.0.1 port=5432 dbname=test user=%PGUSER% password=%PGPASSWORD%
-if /i "%APPVEYOR%" equ "True" (
-    set TMP_POSTGRESQL_BIN=%ProgramFiles%\PostgreSQL\10\bin
-) else (
-    set TMP_POSTGRESQL_BIN=%PGBIN%
-)
+set TMP_POSTGRESQL_BIN=%PGBIN%
 "%TMP_POSTGRESQL_BIN%\createdb.exe" test
 if %errorlevel% neq 0 exit /b 3
 
 rem setup ODBC related exts
 set ODBC_TEST_USER=sa
 set ODBC_TEST_PASS=Password12!
-if /i "%APPVEYOR%" equ "True" (
-    set ODBC_TEST_DSN=Driver={ODBC Driver 13 for SQL Server};Server=^(local^)\SQL2017;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
-) else (
-    set ODBC_TEST_DSN=Driver={ODBC Driver 17 for SQL Server};Server=^(local^)\SQLEXPRESS;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
-)
+set ODBC_TEST_DSN=Driver={ODBC Driver 17 for SQL Server};Server=^(local^)\SQLEXPRESS;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
 set PDOTEST_DSN=odbc:%ODBC_TEST_DSN%
 
 rem prepare for ext/openssl
@@ -133,11 +121,4 @@ if %EXIT_CODE% GEQ 1 (
 	git diff > bless_tests.patch
 )
 
-if /i "%APPVEYOR%" equ "True" (
-	appveyor PushArtifact %TEST_PHP_JUNIT%
-	if %EXIT_CODE% GEQ 1 (
-		appveyor PushArtifact bless_tests.patch
-	)
-)
-
 exit /b %EXIT_CODE%

.github/scripts/windows/test_task.bat

@@ -42,6 +42,8 @@ jobs:
         uses: ./.github/actions/setup-mssql
       - name: Create Oracle container
         uses: ./.github/actions/setup-oracle
+      - name: Setup Caddy server
+        uses: ./.github/actions/setup-caddy
       - name: apt
         uses: ./.github/actions/apt-x64
       - name: ccache

.github/workflows/push.yml

@@ -140,7 +140,6 @@ locations.
     ├─ zend_vm_opcodes.c            # Generated by `Zend/zend_vm_gen.php`
     ├─ zend_vm_opcodes.h            # Generated by `Zend/zend_vm_gen.php`
     └─ ...
- ├─ appveyor/                       # Appveyor CI service files
  └─ build/                          # *nix build system files
     ├─ ax_*.m4                      # https://github.com/autoconf-archive/autoconf-archive
     ├─ config.guess                 # https://git.savannah.gnu.org/cgit/config.git