make preserve_none check lto compatible, fix #20806

.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/actions/verify-generated-files/action.yml

@@ -12,5 +12,5 @@ runs:
         Zend/zend_vm_gen.php
         ext/tokenizer/tokenizer_data_gen.php
         build/gen_stub.php -f --generate-optimizer-info --verify
-        # Use the -a flag for a bug in git 2.46.0, which doesn't consider changed -diff files.
-        git add . -N && git diff -a --exit-code
+        ext/phar/makestub.php
+        .github/scripts/test-directory-unchanged.sh .

.github/scripts/download-bundled/pcre2.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+set -ex
+cd "$(dirname "$0")/../../.."
+
+revision=refs/tags/pcre2-10.44
+
+git clone --depth 1 --recurse-submodules --revision="$revision" https://github.com/PCRE2Project/pcre2.git /tmp/php-src-bundled/pcre2
+
+rm -rf ext/pcre/pcre2lib
+cp -R /tmp/php-src-bundled/pcre2/src ext/pcre/pcre2lib
+
+cd ext/pcre/pcre2lib
+
+# remove unneeded files
+rm config.h.generic
+rm pcre2.h.in
+rm pcre2_dftables.c
+rm pcre2_fuzzsupport.c
+rm pcre2_jit_test.c
+rm pcre2demo.c
+rm pcre2grep.c
+rm pcre2posix.c
+rm pcre2posix.h
+rm pcre2posix_test.c
+rm pcre2test.c
+
+# move renamed files
+mv pcre2.h.generic pcre2.h
+mv pcre2_chartables.c.dist pcre2_chartables.c
+
+# add extra files
+git restore config.h # based on config.h.generic but with many changes

.github/scripts/test-directory-unchanged.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -ex
+
+cd "$(dirname "$0")/../../$1"
+
+# notify git about untracked (except ignored) files
+git add -N .
+
+# display overview of changed files
+git status .
+
+# display diff of working directory vs HEAD commit and set exit code
+git diff -a --exit-code HEAD .

.github/workflows/nightly.yml

@@ -14,6 +14,9 @@ on:
       libmysqlclient_with_mysqli:
         required: true
         type: boolean
+      macos_arm64_version:
+        required: true
+        type: string
       run_alpine:
         required: true
         type: boolean
@@ -350,11 +353,11 @@ jobs:
       matrix:
         debug: [true, false]
         zts: [true, false]
-        os: ['13', '14']
+        arch: ['X64', 'ARM64']
         exclude:
-          - os: ${{ !inputs.run_macos_arm64 && '14' || '*never*' }}
-    name: "MACOS_${{ matrix.os == '13' && 'X64' || 'ARM64' }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: macos-${{ matrix.os }}
+          - arch: ${{ !inputs.run_macos_arm64 && 'ARM64' || '*never*' }}
+    name: "MACOS_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
+    runs-on: macos-${{ matrix.arch == 'X64' && '15-intel' || inputs.macos_arm64_version }}
     steps:
       - name: git checkout
         uses: actions/checkout@v6
@@ -379,7 +382,7 @@ jobs:
       - name: Test
         uses: ./.github/actions/test-macos
       - name: Test Tracing JIT
-        if: matrix.os != '14' || !matrix.zts
+        if: matrix.arch == 'X64' || !matrix.zts
         uses: ./.github/actions/test-macos
         with:
           jitType: tracing
@@ -391,7 +394,7 @@ jobs:
           runTestsParameters: >-
             -d opcache.enable_cli=1
       - name: Test Function JIT
-        if: matrix.os != '14' || !matrix.zts
+        if: matrix.arch == 'X64' || !matrix.zts
         uses: ./.github/actions/test-macos
         with:
           jitType: function
@@ -989,7 +992,7 @@ jobs:
       PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
       PHP_BUILD_OBJ_DIR: C:\obj
       PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
-      PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
+      PHP_BUILD_SDK_BRANCH: php-sdk-2.5.0
       PHP_BUILD_CRT: ${{ inputs.vs_crt_version }}
       PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
       THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"

.github/workflows/push.yml

@@ -276,7 +276,7 @@ jobs:
       PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
       PHP_BUILD_OBJ_DIR: C:\obj
       PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
-      PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
+      PHP_BUILD_SDK_BRANCH: php-sdk-2.5.0
       PHP_BUILD_CRT: vs17
       PLATFORM: x64
       THREAD_SAFE: "1"

.github/workflows/root.yml

@@ -47,6 +47,7 @@ jobs:
       branch: ${{ matrix.branch.ref }}
       community_verify_type_inference: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
       libmysqlclient_with_mysqli: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1) }}
+      macos_arm64_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 5) || matrix.branch.version[0] >= 9) && '15' || '14' }}
       run_alpine: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
       run_linux_ppc64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
       run_macos_arm64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}

.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@v6
+
+      - 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
+

.github/workflows/verify-bundled-files.yml

@@ -0,0 +1,43 @@
+name: Verify Bundled Files
+
+on:
+  push:
+    paths: &paths
+      - '.github/scripts/download-bundled/pcre2.sh'
+      - 'ext/pcre/pcre2lib/**'
+  pull_request:
+    paths: *paths
+  schedule:
+    - cron: "0 1 * * *"
+  workflow_dispatch: ~
+
+permissions:
+  contents: read
+
+jobs:
+  VERIFY_BUNDLED_FILES:
+    name: Verify Bundled Files
+    runs-on: ubuntu-24.04
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v6
+
+      - name: Detect changed files
+        uses: dorny/paths-filter@v3
+        id: changes
+        with:
+          base: master
+          filters: |
+            pcre2:
+              - '.github/scripts/download-bundled/pcre2.sh'
+              - 'ext/pcre/pcre2lib/**'
+
+      - name: PCRE2
+        if: ${{ !cancelled() && (steps.changes.outputs.pcre2 == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') }}
+        run: |
+          echo "::group::Download"
+          .github/scripts/download-bundled/pcre2.sh
+          echo "::endgroup::"
+          echo "::group::Verify files"
+          .github/scripts/test-directory-unchanged.sh ext/pcre/pcre2lib
+          echo "::endgroup::"

CODING_STANDARDS.md

@@ -276,7 +276,7 @@ rewritten to comply with these rules.
 
 1. The length of constant string literals should be calculated via ``strlen()``
    instead of using ``sizeof()-1`` as it is clearer and any modern compiler
-   will optimize it away. Legacy usages of the latter style exists within the
+   will optimize it away. Legacy usages of the latter style exist within the
    codebase but should not be refactored, unless larger refactoring around that
    code is taking place.
 

CONTRIBUTING.md

@@ -100,6 +100,7 @@ scattered across different websites, and often outdated. Nonetheless, they can
 provide a good starting point for learning about the fundamentals of the code
 base.
 
+* https://php.github.io/php-src/
 * https://www.phpinternalsbook.com/
 * https://www.npopov.com/
   * [Internal value representation](https://www.npopov.com/2015/05/05/Internal-value-representation-in-PHP-7-part-1.html), [part 2](https://www.npopov.com/2015/06/19/Internal-value-representation-in-PHP-7-part-2.html)
@@ -357,7 +358,8 @@ Currently, we have the following branches in use:
 
 | Branch    |           |
 | --------- | --------- |
-| master    | Active development branch for PHP 8.5, which is open for backwards incompatible changes and major internal API changes. |
+| master    | Active development branch for PHP 8.6, which is open for backwards incompatible changes and major internal API changes. |
+| PHP-8.5   | Is used to release the PHP 8.5.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-8.4   | Is used to release the PHP 8.4.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-8.3   | Is used to release the PHP 8.3.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-8.2   | Is used to release the PHP 8.2.x series. This is an old stable version and is open for security fixes only. |

LICENSE

@@ -1,6 +1,6 @@
 --------------------------------------------------------------------
                   The PHP License, version 3.01
-Copyright (c) 1999 - 2024 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2025 The PHP Group. All rights reserved.
 --------------------------------------------------------------------
 
 Redistribution and use in source and binary forms, with or without