Merge branch 'master'

Author: mvorisek

.circleci/config.yml

@@ -4,8 +4,8 @@ jobs:
   arm:
     resource_class: arm.medium
     docker:
-      - image: cimg/base:current-22.04
-      - image: mysql:8.3
+      - image: cimg/base:current-24.04
+      - image: mysql:8.4
         environment:
           MYSQL_ALLOW_EMPTY_PASSWORD: true
           MYSQL_ROOT_PASSWORD: ''
@@ -60,7 +60,7 @@ jobs:
               libreadline-dev \
               libldap2-dev \
               libsodium-dev \
-              libargon2-0-dev \
+              libargon2-dev \
               libmm-dev \
               libsnmp-dev \
               snmpd \
@@ -78,7 +78,7 @@ jobs:
               libqdbm-dev \
               libjpeg-dev \
               libpng-dev \
-              libfreetype6-dev
+              libfreetype-dev
       - run:
           name: ./configure
           command: |

.gitattributes

@@ -21,6 +21,7 @@
 
 # Collapse generated files within git and pull request diff.
 **/*_arginfo.h linguist-generated -diff
+**/*_decl.h linguist-generated -diff
 /main/debug_gdb_scripts.c linguist-generated -diff
 /Zend/zend_vm_execute.h linguist-generated -diff
 /Zend/zend_vm_handlers.h linguist-generated -diff

.github/actions/brew/action.yml

@@ -13,11 +13,18 @@ runs:
 
         # 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 curl
-        brew install \
+        brew reinstall -v \
+          autoconf \
+          webp \
+          tidy-html5 \
+          libzip \
+          libsodium \
+          icu4c \
+          curl
+        brew install -v \
           bison \
           re2c
-        brew install \
+        brew install -v \
           bzip2 \
           enchant \
           libffi \

.github/actions/build-libmysqlclient/action.yml

@@ -5,8 +5,6 @@ inputs:
     required: false
   libmysql:
     required: true
-  withMysqli:
-    required: true
 runs:
   using: composite
   steps:
@@ -21,13 +19,11 @@ runs:
         wget -nv $URL
         tar -xf $LIBMYSQL --strip-components=1 -C $MYSQL_DIR
         PDO_MYSQL=${MYSQL_DIR}
-        ${{ inputs.withMysqli == 'true' && 'MYSQLI=${MYSQL_DIR}/bin/mysql_config' || '' }}
         ./buildconf --force
         ./configure ${{ inputs.configurationParameters }} \
           --enable-option-checking=fatal \
           --disable-all \
           --enable-pdo \
-          --with-pdo-mysql=${PDO_MYSQL} \
-          ${{ inputs.withMysqli == 'true' && '--with-mysqli=${MYSQLI}' || '' }}
+          --with-pdo-mysql=${PDO_MYSQL}
         make clean
         make -j$(/usr/bin/nproc) >/dev/null

.github/actions/freebsd/action.yml

@@ -15,6 +15,7 @@ runs:
         release: '13.5'
         usesh: true
         copyback: false
+        disable-cache: true
         # Temporarily disable sqlite, as FreeBSD ships it with disabled double quotes. We'll need to fix our tests.
         # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269889
         prepare: |

.github/actions/macos-update-clang/action.yml

@@ -0,0 +1,17 @@
+name: Update clang
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        softwareupdate -l
+        label=$((softwareupdate -l 2>/dev/null | grep 'Label:' | grep -o 'Command Line Tools for Xcode.*' | head -1) || echo '')
+        if [ -n "$label" ]; then
+          softwareupdate -i "$label"
+          xcode_path=$(ls -1 '/Applications' | grep 'Xcode_.*\.app' | sort -r | head -1)
+          sudo xcode-select -s "/Applications/$xcode_path"
+        else
+          echo "Not found."
+        fi
+        which clang
+        clang -v

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

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

.github/actions/test-libmysqlclient/action.yml

@@ -1,15 +1,10 @@
 name: Test libmysqlclient
-inputs:
-  withMysqli:
-    required: true
 runs:
   using: composite
   steps:
     - shell: bash
       run: |
         set -x
-        ${{ inputs.withMysqli == 'true' && 'export MYSQL_TEST_USER=root' || '' }}
-        ${{ inputs.withMysqli == 'true' && 'export MYSQL_TEST_PASSWD=root' || '' }}
         export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
         export PDO_MYSQL_TEST_HOST=127.0.0.1
         export PDO_MYSQL_TEST_USER=root

.github/nightly_matrix.php

@@ -6,7 +6,6 @@
     ['ref' => 'PHP-8.4', 'version' => [8, 4]],
     ['ref' => 'PHP-8.3', 'version' => [8, 3]],
     ['ref' => 'PHP-8.2', 'version' => [8, 2]],
-    ['ref' => 'PHP-8.1', 'version' => [8, 1]],
 ];
 
 function get_branch_commit_cache_file_path(): string {

.github/workflows/docs.yml

@@ -10,14 +10,14 @@ on:
       - docs/**
 jobs:
   pages:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       pages: write
       id-token: write
     if: github.repository == 'php/php-src'
     steps:
       - name: git checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Install dependencies
         run: pip install -r docs/requirements.txt
       - name: Check formatting