[php-src] PHP-8.4: [skip ci] Fix CXXFLAGS for type verification build

Author: Ilija Tovilo (iluuu1994)
Date: 2026-07-08T18:58:28+02:00

Commit: https://github.com/php/php-src/commit/6f1beedb446a32ea3f41028a729ddf737c19c91c
Raw diff: https://github.com/php/php-src/commit/6f1beedb446a32ea3f41028a729ddf737c19c91c.diff

[skip ci] Fix CXXFLAGS for type verification build

The attempted fix in ba32d70 was incorrect as the flags are later overwritten
with -D_GLIBCXX_ASSERTIONS.

Closes GH-22639

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


Diff:

diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index e8f698e4e091..e269ed336408 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -166,10 +166,10 @@ 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" CXXFLAGS="-DZEND_VERIFY_TYPE_INFERENCE"' || '' }}
+            ${{ matrix.variation && 'CFLAGS="-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1 -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"' || '' }}
+            ${{ (matrix.variation || matrix.debug) && format('CXXFLAGS="{0} {1}"', matrix.variation && '-DZEND_VERIFY_TYPE_INFERENCE' || '', matrix.debug && '-D_GLIBCXX_ASSERTIONS' || '') || '' }}
             --${{ matrix.zts && 'enable' || 'disable' }}-zts
           asan: ${{ matrix.asan && 'true' || 'false' }}
           skipSlow: ${{ (matrix.asan && !inputs.all_variations) && 'true' || 'false' }}