[php-src] PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5

Author: Ilija Tovilo (iluuu1994)
Date: 2026-07-07T12:57:34+02:00

Commit: https://github.com/php/php-src/commit/3cf46eb144680935cc3bdf1590358411f6a30501
Raw diff: https://github.com/php/php-src/commit/3cf46eb144680935cc3bdf1590358411f6a30501.diff

Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  [skip ci] Add -DZEND_VERIFY_TYPE_INFERENCE to CXXFLAGS for variation build

Changed paths:
  M  .github/workflows/test-suite.yml


Diff:

diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index 4c28ccca3561..e8f698e4e091 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -166,7 +166,7 @@ jobs:
         with:
           configurationParameters: >-
             ${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address"' || '' }}
-            ${{ matrix.variation && 'CFLAGS="-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1 -DZEND_VERIFY_TYPE_INFERENCE"' || '' }}
+            ${{ matrix.variation && 'CFLAGS="-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1 -DZEND_VERIFY_TYPE_INFERENCE" CXXFLAGS="-DZEND_VERIFY_TYPE_INFERENCE"' || '' }}
             ${{ (matrix.variation && fromJson(inputs.branch).jobs.LINUX_X64.config.variation_enable_zend_max_execution_timers) && '--enable-zend-max-execution-timers' || '' }}
             --${{ matrix.debug && 'enable' || 'disable' }}-debug
             ${{ matrix.debug && 'CXXFLAGS="-D_GLIBCXX_ASSERTIONS"' || '' }}