Merge branch 'master' into fix/multicurl-shutdown

Author: a.stecher

.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: |
@@ -166,6 +166,7 @@ jobs:
           name: Test
           no_output_timeout: 30m
           command: |
+            export RUN_RESOURCE_HEAVY_TESTS=1
             sapi/cli/php run-tests.php \
               -d opcache.enable_cli=1 \
               -d opcache.jit_buffer_size=64M \

.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/ccache/action.yml

@@ -0,0 +1,39 @@
+name: ccache
+inputs:
+  name:
+    required: true
+  php_directory:
+    required: false
+    default: '.'
+  cc:
+    required: false
+    default: 'gcc'
+  cxx:
+    required: false
+    default: 'g++'
+runs:
+  using: composite
+  steps:
+    - name: Get cache key
+      shell: bash
+      id: cache_key
+      run: |
+        major=$(cat ${{ inputs.php_directory }}/main/php_version.h | sed -En 's/^#define PHP_MAJOR_VERSION ([0-9]+)/\1/p')
+        minor=$(cat ${{ inputs.php_directory }}/main/php_version.h | sed -En 's/^#define PHP_MINOR_VERSION ([0-9]+)/\1/p')
+        release=$(cat ${{ inputs.php_directory }}/main/php_version.h | sed -En 's/^#define PHP_RELEASE_VERSION ([0-9]+)/\1/p')
+        week=$(date +"%Y-%W")
+        prefix="${{ inputs.name }}-$major.$minor.$release"
+        echo "key=$prefix-$week" >> $GITHUB_OUTPUT
+        echo "prefix=$prefix-" >> $GITHUB_OUTPUT
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2
+      with:
+        key: "${{ steps.cache_key.outputs.key }}"
+        append-timestamp: false
+        restore-keys: "${{ steps.cache_key.outputs.prefix }}"
+        save: ${{ github.event_name != 'pull_request' }}
+    - name: Export CC/CXX
+      shell: bash
+      run: |
+        echo "CC=ccache ${{ inputs.cc }}" >> $GITHUB_ENV
+        echo "CXX=ccache ${{ inputs.cxx }}" >> $GITHUB_ENV

.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: |
@@ -106,6 +107,7 @@ runs:
           export SKIP_IO_CAPTURE_TESTS=1
           export CI_NO_IPV6=1
           export STACK_LIMIT_DEFAULTS_CHECK=1
+          export RUN_RESOURCE_HEAVY_TESTS=1
           sapi/cli/php run-tests.php \
             -P -q -j2 \
             -g FAIL,BORK,LEAK,XLEAK \

.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/solaris/action.yml

@@ -0,0 +1,88 @@
+name: Solaris
+inputs:
+  configurationParameters:
+    default: ''
+    required: false
+  runExtraTests:
+    default: false
+    required: false
+runs:
+  using: composite
+  steps:
+    - name: Solaris
+      uses: vmactions/solaris-vm@v1
+      with:
+        release: "11.4-gcc"
+        usesh: true
+        copyback: false
+        disable-cache: true
+        prepare: |
+          cd $GITHUB_WORKSPACE
+          pkg install bison developer/icu libzip oniguruma re2c
+
+          ./buildconf -f
+          CC=gcc CXX=g++ \
+          CFLAGS="-Wno-char-subscripts" \
+          PATH=/usr/gnu/bin:/usr/bin \
+          PKG_CONFIG_PATH=/usr/lib/amd64/pkgconfig \
+          ./configure \
+            --prefix=/usr/local \
+            --enable-debug \
+            --enable-werror \
+            --enable-option-checking=fatal \
+            --enable-fpm \
+            --without-pear \
+            --with-bz2 \
+            --with-jpeg \
+            --with-webp \
+            --with-freetype \
+            --enable-gd \
+            --enable-exif \
+            --with-zip \
+            --with-zlib \
+            --enable-soap \
+            --enable-xmlreader \
+            --with-xsl \
+            --with-libxml \
+            --enable-shmop \
+            --enable-pcntl \
+            --enable-mbstring \
+            --with-curl \
+            --enable-sockets \
+            --with-openssl \
+            --enable-bcmath \
+            --enable-calendar \
+            --enable-ftp \
+            --enable-zend-test \
+            --enable-dl-test=shared \
+            --enable-intl \
+            --with-mhash \
+            --with-config-file-path=/etc \
+            --with-config-file-scan-dir=/etc/php.d \
+            ${{ inputs.configurationParameters }}
+
+          gmake -j2
+          mkdir /etc/php.d
+          gmake install > /dev/null
+          echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
+          echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
+          echo opcache.preload_user=root >> /etc/php.d/opcache.ini
+        run: |
+          cd $GITHUB_WORKSPACE
+
+          export SKIP_IO_CAPTURE_TESTS=1
+          export CI_NO_IPV6=1
+          export STACK_LIMIT_DEFAULTS_CHECK=1
+          PATH=/usr/gnu/bin:/usr/bin \
+          sapi/cli/php run-tests.php \
+            -P -q -j1 \
+            -g FAIL,BORK,LEAK,XLEAK \
+            --no-progress \
+            --offline \
+            --show-diff \
+            --show-slow 1000 \
+            --set-timeout 120
+
+          if test "${{ inputs.runExtraTests }}" = "true"; then
+            sapi/cli/php run-extra-tests.php
+          fi

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

@@ -3,6 +3,9 @@ inputs:
   runTestsParameters:
     default: ''
     required: false
+  enableOpcache:
+    default: 'false'
+    required: false
   jitType:
     default: 'disable'
     required: false
@@ -15,6 +18,7 @@ runs:
         export SKIP_IO_CAPTURE_TESTS=1
         export STACK_LIMIT_DEFAULTS_CHECK=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
+          ${{ inputs.enableOpcache == 'true' && '-d opcache.enable_cli=1' || '' }} \
           -d opcache.jit=${{ inputs.jitType }} \
           -d opcache.jit_buffer_size=64M \
           -j$(nproc) \