[pull] master from php:master

.cirrus.yml

@@ -3,8 +3,10 @@ env:
 
 freebsd_task:
   name: FREEBSD_DEBUG_NTS
+  timeout_in: 50m
   freebsd_instance:
     image_family: freebsd-13-3
+  skip: "changesIncludeOnly('docs/**', 'NEWS', 'UPGRADING', 'UPGRADING.INTERNALS', '**/README.*', 'CONTRIBUTING.md', 'CODING_STANDARDS.md', '.circleci/**', 'EXTENSIONS', '**.md', 'docs-old/**')"
   env:
     ARCH: amd64
   install_script:

.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
@@ -31,7 +31,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
@@ -54,27 +54,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_frameless_function.* @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/apk/action.yml

@@ -19,9 +19,6 @@ runs:
             re2c \
             pkgconf \
             mysql-client \
-            aspell-dev \
-            hunspell-dev \
-            hunspell-en \
             bzip2-dev \
             curl-dev \
             freetype-dev \
@@ -44,12 +41,10 @@ runs:
             readline-dev \
             sqlite-dev \
             tidyhtml-dev \
-            krb5-dev \
             gdbm-dev \
             lmdb-dev \
             argon2-dev \
             enchant2-dev \
-            enchant2-hunspell \
             freetds-dev \
             imap-dev \
             net-snmp-dev \

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

@@ -1,4 +1,8 @@
 name: apt
+inputs:
+  asan:
+    default: false
+    required: false
 runs:
   using: composite
   steps:
@@ -39,6 +43,7 @@ runs:
           libsqlite3-dev \
           libsqlite3-mod-spatialite \
           libwebp-dev \
+          ${{ inputs.asan == 'false' && 'libavif-dev' || '' }} \
           libonig-dev \
           libcurl4-openssl-dev \
           libxml2-dev \
@@ -47,7 +52,7 @@ runs:
           libedit-dev \
           libldap2-dev \
           libsodium-dev \
-          libargon2-0-dev \
+          libargon2-dev \
           libmm-dev \
           libsnmp-dev \
           postgresql \

.github/actions/brew/action.yml

@@ -11,32 +11,19 @@ runs:
         code=" keg.link\(verbose: verbose\?"
         sudo sed -Ei '' "s/$code.*/$code, overwrite: true\)/" "$formula_installer"
 
+        # Some packages exist on x86 but not arm, or vice versa.
+        # Install them with reinstall to avoid warnings.
+        brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c
         brew install \
-          pkg-config \
-          autoconf \
           bison \
           re2c
         brew install \
-          [email protected] \
-          curl \
           bzip2 \
           enchant \
           libffi \
-          libpng \
-          webp \
-          freetype \
           intltool \
-          icu4c \
           libiconv \
-          zlib \
           t1lib \
-          gd \
-          libzip \
-          gmp \
-          tidy-html5 \
           libxml2 \
           libjpeg \
-          libsodium \
-          libxslt \
-          postgresql
-        brew link icu4c gettext --force
+          libxslt

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

@@ -6,6 +6,9 @@ inputs:
   skipSlow:
     default: false
     required: false
+  asan:
+    default: false
+    required: false
 runs:
   using: composite
   steps:
@@ -28,6 +31,7 @@ runs:
           --enable-gd \
           --with-jpeg \
           --with-webp \
+          ${{ inputs.asan == 'false' && '--with-avif' || '' }} \
           --with-freetype \
           --with-xpm \
           --enable-exif \

.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

@@ -389,3 +389,109 @@
   - changed-files:
       - any-glob-to-any-file:
         - sapi/phpdbg/**/*
+
+"ABI break":
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'TSRM/*.h'
+      - 'Zend/*.h'
+      - 'Zend/Optimizer/zend_call_graph.h'
+      - 'Zend/Optimizer/zend_cfg.h'
+      - 'Zend/Optimizer/zend_dfg.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'
+      - 'Zend/Optimizer/zend_worklist.h'
+      - 'ext/curl/php_curl.h'
+      - 'ext/date/lib/timelib.h'
+      - 'ext/date/lib/timelib_config.h'
+      - 'ext/date/php_date.h'
+      - 'ext/dom/dom_ce.h'
+      - 'ext/dom/namespace_compat.h'
+      - 'ext/dom/xml_common.h'
+      - 'ext/dom/xpath_callbacks.h'
+      - 'ext/filter/php_filter.h'
+      - 'ext/gd/libgd/*.h'
+      - 'ext/gd/php_gd.h'
+      - 'ext/gmp/php_gmp_int.h'
+      - 'ext/hash/php_hash.h'
+      - 'ext/hash/php_hash_adler32.h'
+      - 'ext/hash/php_hash_crc32.h'
+      - 'ext/hash/php_hash_fnv.h'
+      - 'ext/hash/php_hash_gost.h'
+      - 'ext/hash/php_hash_haval.h'
+      - 'ext/hash/php_hash_joaat.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/hash/xxhash/xxhash.h'
+      - 'ext/iconv/php_iconv.h'
+      - 'ext/json/php_json.h'
+      - 'ext/json/php_json_parser.h'
+      - 'ext/json/php_json_scanner.h'
+      - 'ext/libxml/php_libxml.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/mbstring/php_mbregex.h'
+      - 'ext/mbstring/php_onig_compat.h'
+      - 'ext/mysqli/mysqli_mysqlnd.h'
+      - 'ext/mysqli/php_mysqli_structs.h'
+      - 'ext/mysqlnd/*.h'
+      - 'ext/pcre/pcre2lib/*.h'
+      - 'ext/pcre/php_pcre.h'
+      - 'ext/pdo/pdo_sql_parser.h'
+      - 'ext/pdo/php_pdo.h'
+      - 'ext/pdo/php_pdo_driver.h'
+      - 'ext/pdo/php_pdo_error.h'
+      - 'ext/phar/php_phar.h'
+      - 'ext/random/php_random.h'
+      - 'ext/random/php_random_csprng.h'
+      - 'ext/random/php_random_uint128.h'
+      - 'ext/session/mod_files.h'
+      - 'ext/session/mod_mm.h'
+      - 'ext/session/mod_user.h'
+      - 'ext/session/php_session.h'
+      - 'ext/simplexml/php_simplexml.h'
+      - 'ext/simplexml/php_simplexml_exports.h'
+      - 'ext/sockets/php_sockets.h'
+      - 'ext/sockets/windows_common.h'
+      - 'ext/sodium/php_libsodium.h'
+      - 'ext/spl/php_spl.h'
+      - 'ext/spl/spl_array.h'
+      - 'ext/spl/spl_directory.h'
+      - 'ext/spl/spl_dllist.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'
+      - 'ext/xml/expat_compat.h'
+      - 'ext/xml/php_xml.h'
+      - 'main/*.h'
+      - 'main/streams/*.h'
+      - 'sapi/cli/cli.h'
+      - 'sapi/embed/php_embed.h'
+      - 'win32/*.h'

.github/nightly_matrix.php

@@ -1,7 +1,8 @@
 <?php
 
 const BRANCHES = [
-    ['name' => 'master', 'ref' => 'master', 'version' => ['major' => 8, 'minor' => 4]],
+    ['name' => 'master', 'ref' => 'master', 'version' => ['major' => 8, 'minor' => 5]],
+    ['name' => 'PHP-8.4', 'ref' => 'PHP-8.4', 'version' => ['major' => 8, 'minor' => 4]],
     ['name' => 'PHP-8.3', 'ref' => 'PHP-8.3', 'version' => ['major' => 8, 'minor' => 3]],
     ['name' => 'PHP-8.2', 'ref' => 'PHP-8.2', 'version' => ['major' => 8, 'minor' => 2]],
     ['name' => 'PHP-8.1', 'ref' => 'PHP-8.1', 'version' => ['major' => 8, 'minor' => 1]],
@@ -101,7 +102,7 @@ function get_macos_matrix_include(array $branches) {
                     'branch' => $branch,
                     'debug' => $debug,
                     'zts' => $zts,
-                    'os' => $branch['name'] === 'master' ? '13' : '12',
+                    'os' => in_array($branch['name'], ['master', 'PHP-8.4'], true) ? '13' : '12',
                     'arch' => 'X64',
                     'test_jit' => true,
                 ];

.github/scripts/windows/build_task.bat

@@ -31,12 +31,7 @@ if %errorlevel% neq 0 exit /b 3
 if "%THREAD_SAFE%" equ "0" set ADD_CONF=%ADD_CONF% --disable-zts
 if "%INTRINSICS%" neq "" set ADD_CONF=%ADD_CONF% --enable-native-intrinsics=%INTRINSICS%
 
-rem Some undefined behavior is reported on 32-bit, this should be fixed
-if "%PLATFORM%" == "x86" (
-	set CFLAGS=/W1
-) else (
-	set CFLAGS=/W1 /WX
-)
+set CFLAGS=/W1 /WX
 
 cmd /c configure.bat ^
 	--enable-snapshot-build ^

.github/scripts/windows/find-target-branch.bat

@@ -3,6 +3,6 @@
 for /f "usebackq tokens=3" %%i in (`findstr PHP_MAJOR_VERSION main\php_version.h`) do set BRANCH=%%i
 for /f "usebackq tokens=3" %%i in (`findstr PHP_MINOR_VERSION main\php_version.h`) do set BRANCH=%BRANCH%.%%i
 
-if /i "%BRANCH%" equ "8.4" (
+if /i "%BRANCH%" equ "8.5" (
 	set BRANCH=master
 )