Merge branch 'master' into empty-switch-default-case-inline

Author: TimWolla

.gdbinit

@@ -42,7 +42,7 @@ define print_cvs
 
 	printf "Compiled variables count: %d\n\n", $cv_count
 	while $cv_idx < $cv_count
-		printf "[%d] '%s'\n", $cv_idx, $cv[$cv_idx].val
+		printf "[%d] '$%s'\n", $cv_idx, $cv[$cv_idx].val@$cv[$cv_idx].len
 		set $zvalue = ((zval *) $cv_ex_ptr) + $callFrameSize + $cv_idx
 		printzv $zvalue
 		set $cv_idx = $cv_idx + 1

.github/actions/apk/action.yml

@@ -7,6 +7,9 @@ runs:
         set -x
 
         OPCACHE_TLS_TESTS_DEPS="clang gcc binutils-gold lld"
+        # compiler-rt provides libclang_rt.asan-x86_64.a for clang20
+        # https://pkgs.alpinelinux.org/contents?file=libclang_rt.asan-x86_64.a&path=&name=&branch=v3.22
+        ASAN_DEPS="clang20 compiler-rt"
 
         apk update -q
         apk add \
@@ -52,8 +55,9 @@ runs:
             net-snmp-dev \
             openldap-dev \
             unixodbc-dev \
-            postgresql14-dev \
+            postgresql-dev \
             tzdata \
             musl-locales \
             musl-locales-lang \
-            $OPCACHE_TLS_TESTS_DEPS
+            $OPCACHE_TLS_TESTS_DEPS \
+            $ASAN_DEPS

.github/actions/configure-unit-tests/action.yml

@@ -0,0 +1,10 @@
+name: ./configure (unit tests)
+description: Configure PHP with minimal settings for unit testing
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+        ./buildconf --force
+        ./configure --disable-all --enable-embed=static

.github/workflows/nightly.yml

@@ -93,21 +93,16 @@ jobs:
   ALPINE:
     if: inputs.run_alpine
     name: ALPINE_X64_ASAN_UBSAN_DEBUG_ZTS
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: 'alpine:3.20.1'
+      image: 'alpine:3.22'
     steps:
       - name: git checkout
         uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
       - name: apk
         uses: ./.github/actions/apk
-      - name: LLVM 17 (ASAN-only)
-        # libclang_rt.asan-x86_64.a is provided by compiler-rt, and only for clang17:
-        # https://pkgs.alpinelinux.org/contents?file=libclang_rt.asan-x86_64.a&path=&name=&branch=v3.20
-        run: |
-          apk add clang17 compiler-rt
       - name: System info
         run: |
           echo "::group::Show host CPU info"
@@ -122,8 +117,8 @@ jobs:
           configurationParameters: >-
             CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
             LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
-            CC=clang-17
-            CXX=clang++-17
+            CC=clang-20
+            CXX=clang++-20
             --enable-debug
             --enable-zts
           skipSlow: true # FIXME: This should likely include slow extensions

.github/workflows/push.yml

@@ -16,6 +16,7 @@ on:
       - PHP-8.2
       - PHP-8.3
       - PHP-8.4
+      - PHP-8.5
       - master
   pull_request:
     paths-ignore: *ignore_paths
@@ -31,6 +32,47 @@ env:
   CC: ccache gcc
   CXX: ccache g++
 jobs:
+  ALPINE:
+    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    name: ALPINE_X64_ASAN_UBSAN_DEBUG_ZTS
+    runs-on: ubuntu-24.04
+    container:
+      image: 'alpine:3.22'
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v5
+      - name: apk
+        uses: ./.github/actions/apk
+      - name: System info
+        run: |
+          echo "::group::Show host CPU info"
+          lscpu
+          echo "::endgroup::"
+          echo "::group::Show installed package versions"
+          apk list
+          echo "::endgroup::"
+      - name: ./configure
+        uses: ./.github/actions/configure-alpine
+        with:
+          configurationParameters: >-
+            CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
+            LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
+            CC=clang-20
+            CXX=clang++-20
+            --enable-debug
+            --enable-zts
+          skipSlow: true # FIXME: This should likely include slow extensions
+      - name: make
+        run: make -j$(/usr/bin/nproc) >/dev/null
+      - name: make install
+        uses: ./.github/actions/install-alpine
+      - name: Test Tracing JIT
+        uses: ./.github/actions/test-alpine
+        with:
+          jitType: tracing
+          runTestsParameters: >-
+            --asan -x
+            -d opcache.enable_cli=1
   LINUX_X64:
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
     services:
@@ -166,6 +208,7 @@ jobs:
         with:
           key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: ./configure
         uses: ./.github/actions/configure-x32
         with:

.github/workflows/unit-tests.yml

@@ -0,0 +1,75 @@
+name: Unit Tests
+on:
+  push:
+    paths:
+      - 'main/network.c'
+      - 'tests/unit/**'
+      - '.github/workflows/unit-tests.yml'
+    branches:
+      - master
+  pull_request:
+    paths:
+      - 'main/network.c'
+      - 'tests/unit/**'
+      - '.github/workflows/unit-tests.yml'
+    branches:
+      - '**'
+  workflow_dispatch: ~
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.url || github.run_id }}
+  cancel-in-progress: true
+
+env:
+  CC: ccache gcc
+  CXX: ccache g++
+
+jobs:
+  UNIT_TESTS:
+    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    name: UNIT_TESTS_LINUX_X64
+    runs-on: ubuntu-24.04
+    timeout-minutes: 20
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v4
+        
+      - name: Install dependencies
+        run: |
+          set -x
+          sudo apt-get update
+          sudo apt-get install -y \
+            libcmocka-dev \
+            autoconf \
+            gcc \
+            make \
+            unzip \
+            bison \
+            re2c \
+            locales \
+            ccache
+
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: "unit-tests-${{hashFiles('main/php_version.h')}}"
+          append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
+          
+      - name: ./configure (minimal build)
+        uses: ./.github/actions/configure-unit-tests
+        
+      - name: make libphp.a
+        run: |
+          set -x
+          make -j$(/usr/bin/nproc) >/dev/null
+          
+      - name: Run unit tests
+        run: |
+          set -x
+          cd tests/unit
+          make test
+

NEWS

@@ -2,9 +2,26 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.6.0alpha1
 
+- Core:
+  . Added first-class callable cache to share instances for the duration of the
+    request. (ilutov)
+  . It is now possible to use reference assign on WeakMap without the key
+    needing to be present beforehand. (nielsdos)
+
+- Hash:
+  . Upgrade xxHash to 0.8.2. (timwolla)
+
 - Intl:
   . Added IntlNumberRangeFormatter class to format an interval of two numbers
     with a given skeleton, locale, collapse type and identity fallback.
     (BogdanUngureanu)
 
+- Opcache:
+  . Fixed bug GH-20051 (apache2 shutdowns when restart is requested during
+    preloading). (Arnaud, welcomycozyhom)
+
+- Standard:
+  . Fixed bug GH-19926 (reset internal pointer earlier while splicing array
+    while COW violation flag is still set). (alexandre-daubois)
+
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

UPGRADING

@@ -23,6 +23,10 @@ PHP 8.6 UPGRADE NOTES
 2. New Features
 ========================================
 
+- Core:
+  . It is now possible to use reference assign on WeakMap without the key
+    needing to be present beforehand.
+
 - Intl:
   . Added IntlNumberRangeFormatter class to format an interval of two numbers with a given skeleton, locale, IntlNumberRangeFormatter::COLLAPSE_AUTO, IntlNumberRangeFormatter::COLLAPSE_NONE, IntlNumberRangeFormatter::COLLAPSE_UNIT, IntlNumberRangeFormatter::COLLAPSE_ALL collapse and
     IntlNumberRangeFormatter::IDENTITY_FALLBACK_SINGLE_VALUE, IntlNumberRangeFormatter::IDENTITY_FALLBACK_APPROXIMATELY_OR_SINGLE_VALUE, IntlNumberRangeFormatter::IDENTITY_FALLBACK_APPROXIMATELY and
@@ -56,6 +60,9 @@ PHP 8.6 UPGRADE NOTES
 9. Other Changes to Extensions
 ========================================
 
+- Hash:
+  . The bundled version of xxHash was upgraded to 0.8.2.
+
 ========================================
 10. New Global Constants
 ========================================
@@ -84,3 +91,6 @@ PHP 8.6 UPGRADE NOTES
 ========================================
 14. Performance Improvements
 ========================================
+
+- JSON:
+  . Improve performance of encoding arrays and objects.

UPGRADING.INTERNALS

@@ -20,6 +20,8 @@ PHP 8.6 INTERNALS UPGRADE NOTES
   . The misnamed ZVAL_IS_NULL() has been removed. Use Z_ISNULL() instead.
   . New zend_class_entry.ce_flags2 and zend_function.fn_flags2 fields were
     added, given the primary flags were running out of bits.
+  . The zval_is_true() alias of zend_is_true() has been removed. Call
+    zend_is_true() directly instead.
   . The EMPTY_SWITCH_DEFAULT_CASE() macro has been removed. Use
     `default: ZEND_UNREACHABLE();` instead.