Merge tag 'php-8.3.13' into was-8.3.x

Tag for php-8.3.13

Author: MaxKellermann

.cirrus.yml

@@ -3,6 +3,7 @@ env:
 
 freebsd_task:
   name: FREEBSD_DEBUG_NTS
+  skip: "changesIncludeOnly('NEWS', 'EXTENSIONS', 'UPGRADING', 'UPGRADING.INTERNALS', '**.md', 'docs/*', 'docs-old/*', '**/README.*', 'CONTRIBUTING.md', 'CODING_STANDARDS.md')"
   freebsd_instance:
     image_family: freebsd-13-3
   env:

.github/CODEOWNERS

@@ -14,7 +14,7 @@
 # For more information, see the GitHub CODEOWNERS documentation:
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-/.github @iluuu1994 @TimWolla
+/.github @TimWolla
 /build/gen_stub.php @kocsismate
 /ext/bcmath @Girgias @nielsdos @SakiTakamachi
 /ext/curl @adoy
@@ -32,7 +32,7 @@
 /ext/mbstring @alexdowad @youkidearitai
 /ext/mysqlnd @SakiTakamachi
 /ext/odbc @NattyNarwhal
-/ext/opcache @dstogov @iluuu1994
+/ext/opcache @dstogov
 /ext/openssl @bukka
 /ext/pcntl @devnexen
 /ext/pdo @SakiTakamachi
@@ -55,26 +55,24 @@
 /ext/xsl @nielsdos
 /main @bukka
 /sapi/fpm @bukka
-/Zend/Optimizer @dstogov @iluuu1994
+/Zend/Optimizer @dstogov
 /Zend/zend.* @dstogov
 /Zend/zend_alloc.* @dstogov
-/Zend/zend_API.* @dstogov @iluuu1994
+/Zend/zend_API.* @dstogov
 /Zend/zend_call_stack.* @arnaud-lb
 /Zend/zend_closures.* @dstogov
-/Zend/zend_compile.* @iluuu1994
-/Zend/zend_enum.* @iluuu1994
-/Zend/zend_execute.* @dstogov @iluuu1994
-/Zend/zend_execute_API.c @dstogov @iluuu1994
+/Zend/zend_execute.* @dstogov
+/Zend/zend_execute_API.c @dstogov
 /Zend/zend_gc.* @dstogov @arnaud-lb
 /Zend/zend_hash.* @dstogov
-/Zend/zend_inheritance.* @dstogov @iluuu1994
+/Zend/zend_inheritance.* @dstogov
 /Zend/zend_max_execution_timer.* @arnaud-lb
-/Zend/zend_object_handlers.* @dstogov @iluuu1994
-/Zend/zend_objects.* @dstogov @iluuu1994
-/Zend/zend_objects_API.* @dstogov @iluuu1994
-/Zend/zend_opcode.* @dstogov @iluuu1994
+/Zend/zend_object_handlers.* @dstogov
+/Zend/zend_objects.* @dstogov
+/Zend/zend_objects_API.* @dstogov
+/Zend/zend_opcode.* @dstogov
 /Zend/zend_string.* @dstogov
-/Zend/zend_type*.h @dstogov @iluuu1994
+/Zend/zend_type*.h @dstogov
 /Zend/zend_variables.* @dstogov
-/Zend/zend_vm* @dstogov @iluuu1994
+/Zend/zend_vm* @dstogov
 *.stub.php @kocsismate

.github/actions/apt-x64/action.yml

@@ -50,7 +50,7 @@ runs:
           libreadline-dev \
           libldap2-dev \
           libsodium-dev \
-          libargon2-0-dev \
+          libargon2-dev \
           libmm-dev \
           libsnmp-dev \
           postgresql \

.github/actions/brew/action.yml

@@ -12,31 +12,15 @@ runs:
         sudo sed -Ei '' "s/$code.*/$code, overwrite: true\)/" "$formula_installer"
 
         brew install \
-          pkg-config \
-          autoconf \
           bison \
           re2c
         brew install \
-          [email protected] \
-          curl \
-          krb5 \
           bzip2 \
           enchant \
           libffi \
-          libpng \
-          webp \
-          freetype \
           intltool \
-          icu4c \
           libiconv \
-          zlib \
           t1lib \
-          gd \
-          libzip \
-          gmp \
-          tidy-html5 \
           libxml2 \
           libjpeg \
-          libxslt \
-          postgresql
-        brew link icu4c gettext --force
+          libxslt

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

@@ -11,4 +11,4 @@ runs:
           -p 1433:1433 \
           --name sql1 \
           -h sql1 \
-          -d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04
+          -d mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04

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

@@ -6,16 +6,12 @@ runs:
       run: |
         set -x
 
-        sudo service mysql start
         sudo service slapd start
-        mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
-        # Ensure local_infile tests can run.
-        mysql -uroot -proot -e "SET GLOBAL local_infile = true"
-        docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
-        docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login odbc_test with password='password', check_policy=off; create user odbc_test for login odbc_test; grant alter, control, delete to odbc_test;"
-        docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "ALTER SERVER ROLE sysadmin ADD MEMBER odbc_test;"
-        docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE odbc;"
-        docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE pdo_odbc;"
+        docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
+        docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "create login odbc_test with password='password', check_policy=off; create user odbc_test for login odbc_test; grant alter, control, delete to odbc_test;"
+        docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "ALTER SERVER ROLE sysadmin ADD MEMBER odbc_test;"
+        docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE odbc;"
+        docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE pdo_odbc;"
         sudo locale-gen de_DE
 
         ./.github/scripts/setup-slapd.sh

.github/labeler.yml

@@ -247,3 +247,80 @@
 
 "SAPI: phpdbg":
 - sapi/phpdbg/**/*
+
+"ABI break":
+- 'TSRM/*.h'
+- 'Zend/*.h'
+- 'Zend/Optimizer/zend_call_graph.h'
+- 'Zend/Optimizer/zend_cfg.h'
+- 'Zend/Optimizer/zend_dump.h'
+- 'Zend/Optimizer/zend_func_info.h'
+- 'Zend/Optimizer/zend_inference.h'
+- 'Zend/Optimizer/zend_optimizer.h'
+- 'Zend/Optimizer/zend_ssa.h'
+- 'ext/date/lib/timelib.h'
+- 'ext/date/lib/timelib_config.h'
+- 'ext/date/php_date.h'
+- 'ext/filter/php_filter.h'
+- 'ext/hash/php_hash.h'
+- 'ext/hash/php_hash_adler32.h'
+- 'ext/hash/php_hash_crc32.h'
+- 'ext/hash/php_hash_gost.h'
+- 'ext/hash/php_hash_haval.h'
+- 'ext/hash/php_hash_md.h'
+- 'ext/hash/php_hash_murmur.h'
+- 'ext/hash/php_hash_ripemd.h'
+- 'ext/hash/php_hash_sha.h'
+- 'ext/hash/php_hash_sha3.h'
+- 'ext/hash/php_hash_snefru.h'
+- 'ext/hash/php_hash_tiger.h'
+- 'ext/hash/php_hash_whirlpool.h'
+- 'ext/hash/php_hash_xxhash.h'
+- 'ext/json/php_json.h'
+- 'ext/json/php_json_parser.h'
+- 'ext/json/php_json_scanner.h'
+- 'ext/mbstring/libmbfl/config.h'
+- 'ext/mbstring/libmbfl/mbfl/eaw_table.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfilter.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfilter_pass.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_consts.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_convert.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_defs.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_encoding.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_language.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_string.h'
+- 'ext/mbstring/mbstring.h'
+- 'ext/mysqli/php_mysqli_structs.h'
+- 'ext/mysqlnd/*.h'
+- 'ext/pcre/pcre2lib/*.h'
+- 'ext/pcre/php_pcre.h'
+- 'ext/pdo/php_pdo.h'
+- 'ext/pdo/php_pdo_driver.h'
+- 'ext/pdo/php_pdo_error.h'
+- 'ext/random/php_random.h'
+- 'ext/session/mod_files.h'
+- 'ext/session/mod_mm.h'
+- 'ext/session/mod_user.h'
+- 'ext/session/php_session.h'
+- 'ext/sockets/php_sockets.h'
+- 'ext/sockets/windows_common.h'
+- 'ext/spl/php_spl.h'
+- 'ext/spl/spl_array.h'
+- 'ext/spl/spl_directory.h'
+- 'ext/spl/spl_dllist.h'
+- 'ext/spl/spl_engine.h'
+- 'ext/spl/spl_exceptions.h'
+- 'ext/spl/spl_fixedarray.h'
+- 'ext/spl/spl_functions.h'
+- 'ext/spl/spl_heap.h'
+- 'ext/spl/spl_iterators.h'
+- 'ext/spl/spl_observer.h'
+- 'ext/standard/*.h'
+- 'main/*.h'
+- 'main/streams/*.h'
+- 'sapi/embed/php_embed.h'
+- 'win32/*.h'

.github/scripts/windows/test_task.bat

@@ -52,7 +52,12 @@ set ODBC_TEST_DSN=Driver={ODBC Driver 17 for SQL Server};Server=^(local^)\SQLEXP
 set PDOTEST_DSN=odbc:%ODBC_TEST_DSN%
 
 rem setup Firebird related exts
-curl -sLo Firebird.zip https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0_x64.zip
+if "%PLATFORM%" == "x64" (
+	set PHP_FIREBIRD_DOWNLOAD_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0_x64.zip
+) else (
+	set PHP_FIREBIRD_DOWNLOAD_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0_Win32.zip
+)
+curl -sLo Firebird.zip %PHP_FIREBIRD_DOWNLOAD_URL%
 7z x -oC:\Firebird Firebird.zip
 set PDO_FIREBIRD_TEST_DATABASE=C:\test.fdb
 set PDO_FIREBIRD_TEST_DSN=firebird:dbname=%PDO_FIREBIRD_TEST_DATABASE%
@@ -105,7 +110,7 @@ popd
 
 rem prepare for snmp
 set MIBDIRS=%DEPS_DIR%\share\mibs
-start %DEPS_DIR%\bin\snmpd.exe -C -c %APPVEYOR_BUILD_FOLDER%\ext\snmp\tests\snmpd.conf -Ln
+start %DEPS_DIR%\bin\snmpd.exe -C -c %GITHUB_WORKSPACE%\ext\snmp\tests\snmpd.conf -Ln
 
 set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
 if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS

.github/workflows/nightly.yml

@@ -42,6 +42,13 @@ jobs:
     needs: GENERATE_MATRIX
     if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
     services:
+      mysql:
+        image: mysql:8.3
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: root
       postgres:
         image: postgres
         env:
@@ -286,6 +293,13 @@ jobs:
   COVERAGE_DEBUG_NTS:
     if: github.repository_owner == 'php' || github.event_name == 'workflow_dispatch'
     services:
+      mysql:
+        image: mysql:8.3
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: root
       postgres:
         image: postgres
         env:
@@ -501,6 +515,13 @@ jobs:
     needs: GENERATE_MATRIX
     if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
     services:
+      mysql:
+        image: mysql:8.3
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: root
       postgres:
         image: postgres
         env:

.github/workflows/push.yml

@@ -73,9 +73,7 @@ jobs:
             zts: true
             asan: true
     name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
-    runs-on: ubuntu-${{ !matrix.asan && '22' || '20' }}.04
-    container:
-      image: ${{ matrix.asan && 'ubuntu:23.04' || null }}
+    runs-on: ubuntu-${{ !matrix.asan && '22' || '24' }}.04
     steps:
       - name: git checkout
         uses: actions/checkout@v4
@@ -112,7 +110,7 @@ jobs:
           configurationParameters: >-
             --${{ matrix.debug && 'enable' || 'disable' }}-debug
             --${{ matrix.zts && 'enable' || 'disable' }}-zts
-            ${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang CXX=clang++ --disable-opcache-jit' || '' }}
+            ${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function" CC=clang CXX=clang++ --disable-opcache-jit' || '' }}
           skipSlow: ${{ matrix.asan }}
       - name: make
         run: make -j$(/usr/bin/nproc) >/dev/null