Merge branch 'master' into feat/zend-class-use-traits

Author: khaledalam

.circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
   arm:
     resource_class: arm.medium
     docker:
-      - image: cimg/base:current-22.04
+      - image: cimg/base:current-24.04
       - image: mysql:8.3
         environment:
           MYSQL_ALLOW_EMPTY_PASSWORD: true
@@ -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: |

.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/workflows/docs.yml

@@ -10,7 +10,7 @@ on:
       - docs/**
 jobs:
   pages:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       pages: write
       id-token: write

.github/workflows/nightly.yml

@@ -429,7 +429,7 @@ jobs:
           FIREBIRD_DATABASE: test.fdb
           FIREBIRD_USER: test
           FIREBIRD_PASSWORD: test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: git checkout
         uses: actions/checkout@v6
@@ -862,7 +862,7 @@ jobs:
         uses: ./.github/actions/verify-generated-files
   PECL:
     if: inputs.branch == 'master'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       CC: ccache gcc
       CXX: ccache g++
@@ -909,6 +909,8 @@ jobs:
           sudo apt-get install -y --no-install-recommends \
             ccache \
             libmemcached-dev \
+            imagemagick \
+            libmagickwand-dev \
             bison \
             re2c
       - name: ccache

.github/workflows/real-time-benchmark.yml

@@ -24,24 +24,6 @@ on:
         options:
           - "0"
           - "1"
-      opcache:
-        description: 'Whether opcache is enabled for the benchmarked commit'
-        required: true
-        default: "1"
-        type: choice
-        options:
-          - "0"
-          - "1"
-          - "2"
-      baseline_opcache:
-        description: 'Whether opcache is enabled for the baseline commit'
-        required: true
-        default: "1"
-        type: choice
-        options:
-          - "0"
-          - "1"
-          - "2"
       run_micro_bench:
         description: 'Whether to run the micro_bench.php test'
         required: true
@@ -60,17 +42,15 @@ jobs:
   REAL_TIME_BENCHMARK:
     name: REAL_TIME_BENCHMARK
     if: github.repository == 'php/php-src' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       REPOSITORY: ${{ github.repository }}
       BRANCH: "master"
       COMMIT: ${{ github.sha }}
       BASELINE_COMMIT: "d5f6e56610c729710073350af318c4ea1b292cfe"
       ID: "master"
-      OPCACHE: "1"
-      BASELINE_OPCACHE: "2"
       JIT: "1"
-      INSTRUCTION_COUNT: "1"
+      INSTRUCTION_COUNT: "0"
       RUN_MICRO_BENCH: "0"
       YEAR: ""
     steps:
@@ -82,7 +62,7 @@ jobs:
           echo "YEAR=$YEAR" >> $GITHUB_ENV
 
           if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            PR_INFO=$(gh pr view ${{ inputs.pull_request }} --json headRepositoryOwner,headRepository,headRefName,headRefOid,baseRefOid --repo ${{ github.repository }} | jq -r '.headRepositoryOwner.login, .headRepository.name, .headRefName, .headRefOid, .baseRefOid')
+            PR_INFO=$(gh pr view ${{ inputs.pull_request }} --json headRepositoryOwner,headRepository,headRefName,headRefOid,baseRefName --repo ${{ github.repository }} | jq -r '.headRepositoryOwner.login, .headRepository.name, .headRefName, .headRefOid, .baseRefName')
 
             REPOSITORY="$(echo "$PR_INFO" | sed -n '1p')/$(echo "$PR_INFO" | sed -n '2p')"
             echo "REPOSITORY=$REPOSITORY" >> $GITHUB_ENV
@@ -93,13 +73,13 @@ jobs:
             COMMIT=$(echo "$PR_INFO" | sed -n '4p')
             echo "COMMIT=$COMMIT" >> $GITHUB_ENV
 
-            BASELINE_COMMIT=$(echo "$PR_INFO" | sed -n '5p')
+            BASELINE_BRANCH=$(echo "$PR_INFO" | sed -n '5p')
+
+            BASELINE_COMMIT=$(gh api /repos/${{ github.repository }}/compare/$BASELINE_BRANCH...$COMMIT --jq '.merge_base_commit.sha')
             echo "BASELINE_COMMIT=$BASELINE_COMMIT" >> $GITHUB_ENV
 
             echo "ID=benchmarked" >> $GITHUB_ENV
 
-            echo "OPCACHE=${{ inputs.opcache }}" >> $GITHUB_ENV
-            echo "BASELINE_OPCACHE=${{ inputs.baseline_opcache }}" >> $GITHUB_ENV
             echo "JIT=${{ inputs.jit }}" >> $GITHUB_ENV
             echo "INSTRUCTION_COUNT=${{ inputs.instruction_count }}" >> $GITHUB_ENV
             echo "RUN_MICRO_BENCH=${{ inputs.run_micro_bench }}" >> $GITHUB_ENV
@@ -151,18 +131,6 @@ jobs:
           repository: php/real-time-benchmark-data
           ssh-key: ${{ secrets.PHP_VERSION_BENCHMARK_RESULTS_DEPLOY_KEY }}
           path: 'php-version-benchmarks/docs/results'
-      - name: Setup infra config
-        run: |
-          set -e
-
-          cp ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini.dist ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
-          ESCAPED_DOCKER_REGISTRY=$(printf '%s\n' "${{ secrets.PHP_VERSION_BENCHMARK_DOCKER_REGISTRY }}" | sed -e 's/[\/&]/\\&/g')
-          sed -i "s/INFRA_DOCKER_REGISTRY=public.ecr.aws\/abcdefgh/INFRA_DOCKER_REGISTRY=$ESCAPED_DOCKER_REGISTRY/g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
-          sed -i "s/INFRA_MEASURE_INSTRUCTION_COUNT=0/INFRA_MEASURE_INSTRUCTION_COUNT=${{ env.INSTRUCTION_COUNT }}/g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
-          cp ./php-version-benchmarks/build/infrastructure/config/aws.tfvars.dist ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
-          sed -i 's/access_key = ""/access_key = "${{ secrets.PHP_VERSION_BENCHMARK_AWS_ACCESS_KEY }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
-          sed -i 's/secret_key = ""/secret_key = "${{ secrets.PHP_VERSION_BENCHMARK_AWS_SECRET_KEY }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
-          sed -i 's/github_token = ""/github_token = "${{ secrets.GITHUB_TOKEN }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
       - name: Setup PHP config - baseline PHP version
         run: |
           set -e
@@ -173,11 +141,10 @@ jobs:
             PHP_NAME="PHP - baseline@$BASELINE_SHORT_SHA"
             PHP_ID=php_baseline
 
-            PHP_REPO=https://github.com/${{ env.REPOSITORY }}.git
+            PHP_REPO=${{ github.server_url }}/${{ env.REPOSITORY }}.git
             PHP_BRANCH=${{ env.BRANCH }}
             PHP_COMMIT=${{ env.BASELINE_COMMIT }}
 
-            PHP_OPCACHE=${{ env.BASELINE_OPCACHE }}
             PHP_JIT=0
           EOF
       - name: Setup PHP config - baseline PHP version with JIT
@@ -191,11 +158,10 @@ jobs:
             PHP_NAME="PHP - baseline@$BASELINE_SHORT_SHA (JIT)"
             PHP_ID=php_baseline_jit
 
-            PHP_REPO=https://github.com/${{ env.REPOSITORY }}.git
+            PHP_REPO=${{ github.server_url }}/${{ env.REPOSITORY }}.git
             PHP_BRANCH=${{ env.BRANCH }}
             PHP_COMMIT=${{ env.BASELINE_COMMIT }}
 
-            PHP_OPCACHE=${{ env.BASELINE_OPCACHE }}
             PHP_JIT=${{ env.JIT }}
           EOF
 
@@ -213,15 +179,16 @@ jobs:
             LAST_RESULT_SHA="$(cd ./php-version-benchmarks/tmp/php_${{ env.ID }}/ && git --no-pager log --until="$YESTERDAY" -n 1 --pretty='%H')"
           fi
 
+          echo "LAST_RESULT_SHA=$LAST_RESULT_SHA" >> $GITHUB_ENV
+
           cat << EOF > ./php-version-benchmarks/config/php/previous.ini
             PHP_NAME="PHP - previous ${{ env.BRANCH }}"
             PHP_ID=php_previous
 
-            PHP_REPO=https://github.com/${{ env.REPOSITORY }}.git
+            PHP_REPO=${{ github.server_url }}/${{ env.REPOSITORY }}.git
             PHP_BRANCH=${{ env.BRANCH }}
             PHP_COMMIT=$LAST_RESULT_SHA
 
-            PHP_OPCACHE=1
             PHP_JIT=0
           EOF
       - name: Setup PHP config - benchmarked PHP version
@@ -232,11 +199,10 @@ jobs:
             PHP_NAME="PHP - ${{ env.BRANCH }}"
             PHP_ID=php_${{ env.ID }}
 
-            PHP_REPO=https://github.com/${{ env.REPOSITORY }}.git
+            PHP_REPO=${{ github.server_url }}/${{ env.REPOSITORY }}.git
             PHP_BRANCH=${{ env.BRANCH }}
             PHP_COMMIT=${{ env.COMMIT }}
 
-            PHP_OPCACHE=${{ env.OPCACHE }}
             PHP_JIT=0
           EOF
       - name: Setup PHP config - benchmarked PHP version with JIT
@@ -248,11 +214,10 @@ jobs:
             PHP_NAME="PHP - ${{ env.BRANCH }} (JIT)"
             PHP_ID=php_${{ env.ID }}_jit
 
-            PHP_REPO=https://github.com/${{ env.REPOSITORY }}.git
+            PHP_REPO=${{ github.server_url }}/${{ env.REPOSITORY }}.git
             PHP_BRANCH=${{ env.BRANCH }}
             PHP_COMMIT=${{ env.COMMIT }}
 
-            PHP_OPCACHE=${{ env.OPCACHE }}
             PHP_JIT=${{ env.JIT }}
           EOF
 
@@ -269,6 +234,37 @@ jobs:
           if [ "${{ env.RUN_MICRO_BENCH }}" -eq "1" ]; then
             cp ./php-version-benchmarks/config/test/6_micro_bench.php.ini.dist ./php-version-benchmarks/config/test/6_micro_bench.php.ini
           fi
+      - name: Setup infra config
+        run: |
+          set -e
+          
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            WORKSPACE="manual"
+            BASE_COMMIT="$(echo "${{ env.BASELINE_COMMIT }}" | cut -c 1-6)"
+          else
+            WORKSPACE="nightly"
+            BASE_COMMIT="$(echo "${{ env.LAST_RESULT_SHA }}" | cut -c 1-6)"
+          fi
+          COMPARE_COMMIT="$(echo "${{ env.COMMIT }}" | cut -c 1-6)"
+
+          cp ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini.dist ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
+          sed -i "s|INFRA_DOCKER_REGISTRY=public.ecr.aws/abcdefgh|INFRA_DOCKER_REGISTRY=${{ secrets.PHP_VERSION_BENCHMARK_DOCKER_REGISTRY }}|g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
+          sed -i "s|INFRA_WORKSPACE=|INFRA_WORKSPACE=$WORKSPACE|g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
+          sed -i "s/INFRA_MEASURE_INSTRUCTION_COUNT=0/INFRA_MEASURE_INSTRUCTION_COUNT=${{ env.INSTRUCTION_COUNT }}/g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
+
+          cp ./php-version-benchmarks/build/infrastructure/config/aws.tfvars.dist ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+          sed -i 's/access_key = ""/access_key = "${{ secrets.PHP_VERSION_BENCHMARK_AWS_ACCESS_KEY }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+          sed -i 's/secret_key = ""/secret_key = "${{ secrets.PHP_VERSION_BENCHMARK_AWS_SECRET_KEY }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+          sed -i 's/state_bucket = ""/state_bucket = "${{ secrets.PHP_VERSION_BENCHMARK_STATE_BUCKET }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+          sed -i 's/github_token = ""/github_token = "${{ secrets.GITHUB_TOKEN }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+
+          WORKFLOW_RUN_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          sed -i "s|log_url = \"\"|log_url = \"$WORKFLOW_RUN_URL\"|g" ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+          sed -i 's|artifact_url = ""|artifact_url = "#ARTIFACT_URL#"|g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+
+          CHANGESET_URL="${{ github.server_url }}/${{ github.repository }}/compare/$BASE_COMMIT..$COMPARE_COMMIT"
+          sed -i 's|extra_title = ""|extra_title = "Changeset"|g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
+          sed -i "s|extra_text = \"\"|extra_text = \"$CHANGESET_URL\"|g" ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
       - name: Run benchmark
         run: ./php-version-benchmarks/benchmark.sh run aws
       - name: Store results
@@ -288,12 +284,13 @@ jobs:
           fi
           git commit -m "Add result for ${{ github.repository }}@${{ github.sha }}"
           git push
-      - name: Upload artifact
-        if: github.event_name == 'workflow_dispatch'
+      - name: Upload artifacts
+        id: upload
         uses: actions/upload-artifact@v6
         with:
           name: results
-          path: ./php-version-benchmarks/docs/results/${{ env.YEAR }}
+          path: |
+            ./php-version-benchmarks/tmp/results/${{ env.YEAR }}/**/*
           retention-days: 30
       - name: Comment results
         if: github.event_name == 'workflow_dispatch'
@@ -302,6 +299,7 @@ jobs:
         run: |
           cd ./php-version-benchmarks/tmp/php_${{ env.ID }}
           NEWEST_RESULT_DIRECTORY=$(ls -td ${{ github.workspace }}/php-version-benchmarks/docs/results/${{ env.YEAR }}/*/ | head -1)
+          sed -i "s|#ARTIFACT_URL#|${{ steps.upload.outputs.artifact-url }}|g" "${NEWEST_RESULT_DIRECTORY}result.md"
           gh pr comment ${{ inputs.pull_request }} --body-file "${NEWEST_RESULT_DIRECTORY}result.md" --repo ${{ github.repository }}
       - name: Cleanup
         if: always()

NEWS

@@ -8,6 +8,20 @@ PHP                                                                        NEWS
   . It is now possible to use reference assign on WeakMap without the key
     needing to be present beforehand. (ndossche)
   . Added `clamp()`. (kylekatarnls, thinkverse)
+  . Fix OSS-Fuzz #429429090 (Failed assertion on unset() with uninitialized
+    container). (ilutov)
+  . Fixed GH-20564 (Don't call autoloaders with pending exception). (ilutov)
+
+- Date:
+  . Update timelib to 2022.16. (Derick)
+
+- DOM:
+  . Removed LIBXML_XINCLUDE from valid options for XMLDocument,
+    as it was a no-op. (ndossche)
+
+- Fileinfo:
+  . Fixed bug GH-20679 (finfo_file() doesn't work on remote resources).
+    (ndossche)
 
 - Hash:
   . Upgrade xxHash to 0.8.2. (timwolla)
@@ -19,25 +33,33 @@ PHP                                                                        NEWS
   . Fixed bug GH-20426 (Spoofchecker::setRestrictionLevel() error message
     suggests missing constants). (DanielEScherzer)
 
-- Mbstring
-  . Fixed bug GH-20674 (Fix GH-20674 mb_decode_mimeheader does not handle
-    separator). (Yuya Hamada)
+- JSON:
+  . Enriched JSON last error / exception message with error location.
+    (Juan Morales)
 
 - Fibers:
   . Fixed bug GH-20483 (ASAN stack overflow with fiber.stack_size INI
     small value). (David Carlier)
 
+- Mail:
+  . Fixed bug GH-20862 (null pointer dereference in 
+    php_mail_detect_multiple_crlf via error_log (jordikroon)
+
 - Mbstring:
   . ini_set() with mbstring.detect_order changes the order of mb_detect_order
     as intended, since mbstring.detect_order is an INI_ALL setting. (tobee94)
   . Added GB18030-2022 to default encoding list for zh-CN. (HeRaNO)
-  . Fixed bug GH-20674 (Fix GH-20674 mb_decode_mimeheader does not handle
-    separator). (Yuya Hamada)
+  . Fixed bug GH-20836 (Stack overflow in mb_convert_variables with
+    recursive array references). (alexandre-daubois)
 
 - Opcache:
   . Fixed bug GH-20051 (apache2 shutdowns when restart is requested during
     preloading). (Arnaud, welcomycozyhom)
 
+- OpenSSL:
+  . Implemented GH-20310 (No critical extension indication in
+    openssl_x509_parse() output). (StephenWall)
+
 - PDO_PGSQL:
   . Clear session-local state disconnect-equivalent processing.
     (KentarouTakeda)
@@ -48,6 +70,8 @@ PHP                                                                        NEWS
     ignored. (ndossche)
   . Support overridden methods in SplFileInfo for getMTime() and getPathname()
     when building a phar. (ndossche)
+  . Mark Phar::buildFromIterator() base directory argument as a path.
+    (ndossche)
 
 - Reflection:
   . Fixed bug GH-20217 (ReflectionClass::isIterable() incorrectly returns true
@@ -59,7 +83,9 @@ PHP                                                                        NEWS
 
 - Sockets:
   . Added the TCP_USER_TIMEOUT constant for Linux to set the maximum time in milliseconds
-        transmitted data can remain unacknowledged. (James Lucas)
+    transmitted data can remain unacknowledged. (James Lucas)
+  . Added AF_UNSPEC support for sock_addrinfo_lookup() as a sole umbrella for
+    AF_INET* family only. (David Carlier)
 
 - SPL:
   . DirectoryIterator key can now work better with filesystem supporting larger
@@ -73,10 +99,13 @@ PHP                                                                        NEWS
     while COW violation flag is still set). (alexandre-daubois)
 
 - Streams:
+  . Added so_keepalive, tcp_keepidle, tcp_keepintvl and tcp_keepcnt stream
+    socket context options.
   . Added so_reuseaddr streams context socket option that allows disabling
     address resuse.
   . Fixed bug GH-20370 (User stream filters could violate typed property
     constraints). (alexandre-daubois)
+  . Allowed filtered streams to be casted as fd for select. (Jakub Zelenka)
 
 - Zip:
   . Fixed ZipArchive callback being called after executor has shut down.