Simplify description of version variants

cataphract · cataphract · commit 9c628cba29b9 · 2026-04-09T10:03:05.000+01:00
diff --git a/.claude/ci/appsec-gradle-integration.md b/.claude/ci/appsec-gradle-integration.md
@@ -16,7 +16,7 @@ file.
 | `helper-rust integration coverage` | same | Integration coverage collection (not needed locally) |
 
 Runner: `docker-in-docker:amd64`
-Matrix: PHP 7.0--8.5 × release/debug/zts/musl/ssi (varies by job group)
+Matrix: PHP 7.0+ × release/debug/zts/musl/ssi (varies by job group)
 
 **Important:** `testX.Y-debug` are not gradle targets that are run on CI. They
 may, however, be useful for debugging.
diff --git a/.claude/ci/appsec-native-tests.md b/.claude/ci/appsec-native-tests.md
@@ -16,7 +16,7 @@ file.
 | `appsec code coverage` | `datadog/dd-trace-ci:php-8.3_bookworm-6` | Coverage instrumented build (not needed locally) |
 
 Runner: `arch:amd64` + `arch:arm64`
-Matrix: PHP 7.0--8.5 × {debug, debug-zts, debug-zts-asan (7.4+)}
+Matrix: PHP 7.0+ × {debug, debug-zts, debug-zts-asan (7.4+)}
 
 The `{arch}` dimension only controls the GitLab runner tag. It has no
 effect on the Docker image or commands run. On macOS (Apple Silicon),
@@ -38,8 +38,7 @@ source directory.  See [index.md](index.md) for how `--overlayfs` works.
 
 ### Full suite
 
-All commands are run from the repo root. Replace `8.3` with the desired
-PHP version (`7.0`--`8.5`) and `debug` with the desired variant
+All commands are run from the repo root. Replace `8.3` with the desired PHP version and `debug` with the desired variant
 (`debug`, `debug-zts`, `debug-zts-asan`).
 
 ```bash
diff --git a/.claude/ci/compile-artifacts.md b/.claude/ci/compile-artifacts.md
@@ -48,8 +48,8 @@ If you need to run this step outside a build script and your host lacks `binutil
 | `Prepare code` | `php:8.2-cli` | Runs `composer update` + `make generate` to produce `src/bridge/_generated_*.php` |
 
 Runner: `arch:{amd64,arm64}`
-Matrix (`compile extension: debug`): PHP 7.0--8.5 x {amd64, arm64}
-Matrix (`compile extension: debug-zts-asan`): PHP 7.4--8.5 x {amd64, arm64}
+Matrix (`compile extension: debug`): PHP 7.0+ x {amd64, arm64}
+Matrix (`compile extension: debug-zts-asan`): PHP 7.4+ x {amd64, arm64}
 
 **Note on `Prepare code` vs `prepare code`:** These are two distinct jobs. The tracer
 pipeline `Prepare code` uses `php:8.2-cli` (which has no Composer), installs Composer
@@ -83,10 +83,10 @@ files via `classpreloader`: `_generated_api.php`, `_generated_tracer.php`, and
 | `pecl build` | `dd-trace-ci:php-7.4_bookworm-6` | Runs `tooling/bin/pecl-build` via `make build_pecl_package`; regenerates PHP bridge files via `composer -dtooling/generation`; mutates `package.xml` (version, date, file list) and `Cargo.toml` (strips profiling workspace member) in-place; produces `datadog_trace-*.tgz` via `pear package`; requires a clean tree to re-run |
 
 Runner: `arch:{amd64,arm64}` (Linux jobs) or `windows-v2:2019` (Windows)
-Matrix (tracing/appsec extension): PHP 7.0--8.5 x 4 build platforms (x86_64-alpine-linux-musl, aarch64-alpine-linux-musl, x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu)
-Matrix (profiler extension): PHP 7.1--8.5 x same 4 platforms
-Matrix (ASAN tracing): PHP 7.4--8.5 x {x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu}
-Matrix (Windows): PHP 7.2--8.5
+Matrix (tracing/appsec extension): PHP 7.0+ x 4 build platforms (x86_64-alpine-linux-musl, aarch64-alpine-linux-musl, x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu)
+Matrix (profiler extension): PHP 7.1+ x same 4 platforms
+Matrix (ASAN tracing): PHP 7.4+ x {x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu}
+Matrix (Windows): PHP 7.2+
 
 ## What It Builds
 
diff --git a/.claude/ci/github-actions-profiler.md b/.claude/ci/github-actions-profiler.md
@@ -15,8 +15,8 @@
 | `Profiling correctness / prof-correctness ({ver}, zts)` | `ubuntu-24.04` | Same + `exceptions_zts` (requires `parallel` PECL extension) |
 | `Profiling ASAN Tests / prof-asan ({ver}, {arch})` | `arm-8core-linux` / `ubuntu-8-core-latest` | Builds profiler with ASAN + runs `.phpt` profiling tests |
 
-Correctness matrix: PHP 8.0--8.5 × {nts, zts}.
-ASAN matrix: PHP {8.3, 8.4, 8.5} × {arm64, amd64}.
+Correctness matrix: PHP 8.0+ × {nts, zts}.
+ASAN matrix: PHP 8.3+ × {arm64, amd64}.
 
 ## What It Tests
 
diff --git a/.claude/ci/meta-job-group-doc.md b/.claude/ci/meta-job-group-doc.md
@@ -38,7 +38,7 @@ with columns `CI Job`, `Image`, `What it does`:
 | `appsec code coverage` | `dd-trace-ci:php-8.3_bookworm-6` | (not needed locally) |
 
 Runner: `arch:amd64` + `arch:arm64`
-Matrix: PHP 7.0--8.5 × {debug, debug-zts, debug-zts-asan (7.4+)}
+Matrix: PHP 7.0+ × {debug, debug-zts, debug-zts-asan (7.4+)}
 ```
 
 If there is only one source file, the single-line form is fine:
diff --git a/.claude/ci/package-native-verification.md b/.claude/ci/package-native-verification.md
@@ -36,7 +36,7 @@ in the `verify` stage of the **package-trigger** child pipeline and use native r
 
 **verify alpine:**
 Runner: `arch:amd64`
-Matrix: (Alpine 3.8--3.20 + latest with `php7`/`php` packages) + (`php:{ver}-fpm-alpine` for PHP 7.0--8.5)
+Matrix: (Alpine 3.8+ including latest, with `php7`/`php` packages) + (`php:{ver}-fpm-alpine` for PHP 7.0+)
 Install types: `php_installer` (uses `datadog-setup.php`) and `native_package` (uses `.apk`)
 
 **verify centos:**
@@ -45,7 +45,7 @@ Matrix: PHP 7.0--8.3 x {php_installer, native_package}
 
 **verify debian:**
 Runner: `arch:amd64`
-Matrix: PHP 7.0--8.5 x {php_installer, native_package} x {bullseye-slim, bookworm-slim}
+Matrix: PHP 7.0+ x {php_installer, native_package} x {bullseye-slim, bookworm-slim}
 
 **verify .tar.gz:**
 Runner: `arch:{amd64,arm64}` (amd64 tests PHP 7.0 package, arm64 tests PHP 8.1 package)
@@ -57,8 +57,8 @@ Runner: `arch:amd64`
 
 **Loader test on {arch} libc:**
 Runner: `arch:{amd64,arm64}`
-Matrix (amd64): PHP 5.6 (buster) + 7.0--7.3 (nts) + 7.4--8.5 (nts + zts, with valgrind)
-Matrix (arm64): PHP 7.0--7.3 (nts) + 7.4--8.5 (nts + zts)
+Matrix (amd64): PHP 5.6 (buster) + 7.0--7.3 (nts) + 7.4+ (nts + zts, with valgrind)
+Matrix (arm64): PHP 7.0--7.3 (nts) + 7.4+ (nts + zts)
 
 **Loader test on {arch} alpine:**
 Runner: `arch:{amd64,arm64}`
@@ -68,14 +68,14 @@ Runner: `arch:amd64`
 
 **pecl tests:**
 Runner: `arch:amd64`
-Matrix: PHP 7.0--8.5
+Matrix: PHP 7.0+
 
 **test early PHP 8.1:**
 Runner: `arch:amd64`
 
 **x-profiling phpt tests on Alpine:**
 Runner: `arch:amd64`
-Matrix: PHP 7.1--8.5
+Matrix: PHP 7.1+
 
 ## What It Tests
 
diff --git a/.claude/ci/shared-zai-tea-tests.md b/.claude/ci/shared-zai-tea-tests.md
@@ -18,12 +18,12 @@ child pipeline; all job definitions and matrices are inline.
 Runner: `arch:amd64` (all jobs in this pipeline are amd64-only)
 
 Matrix:
-- **Build & Test Tea**: PHP 7.0--8.5 x {debug, debug-zts-asan (7.4+),
+- **Build & Test Tea**: PHP 7.0+ x {debug, debug-zts-asan (7.4+),
   nts, zts}. Pre-7.4 versions skip `debug-zts-asan` and use
   `debug-zts` instead.
 - **ZAI Tests**: same matrix as TEA, plus UBSAN toolchain for `debug`
   variant on PHP 7.4+.
-- **Extension Tea Tests**: PHP 7.0--8.5 x {debug, debug-zts-asan
+- **Extension Tea Tests**: PHP 7.0+ x {debug, debug-zts-asan
   (7.4+), nts, zts}. Pre-7.4 skips `debug-zts-asan`.
 - **ZAI Shared Tests**: PHP 7.4, 8.0 only, `nts` variant only.
 - **C components ASAN**: three images (centos-7, alpine, bookworm-6);
diff --git a/.claude/ci/tracer-integration-tests.md b/.claude/ci/tracer-integration-tests.md
@@ -7,8 +7,9 @@
   pipeline; integration test jobs are generated from `TEST_INTEGRATIONS_{XY}`
   lists in the `Makefile`, expanded by the PHP loop starting at the
   `foreach ($jobs as $type => $type_jobs)` block
-- `Makefile` -- defines `TEST_INTEGRATIONS_70` through `TEST_INTEGRATIONS_85`
-  target lists and the individual `test_integrations_*`, `test_opentelemetry_*`,
+- `Makefile` -- defines per-version `TEST_INTEGRATIONS_{XY}` (where XY is the
+  PHP major+minor digits, e.g. `70` for PHP 7.0) target lists and the
+  individual `test_integrations_*`, `test_opentelemetry_*`,
   `test_opentracing_*` make targets
 - `.gitlab/generate-common.php` -- shared service definitions (test-agent,
   request-replayer, httpbin, mysql, redis, memcache, amqp, mongodb, kafka,
@@ -45,7 +46,7 @@
 | `test_opentracing_10: [{php}]` | same | OpenTracing 1.0 bridge tests |
 
 Runner: `arch:amd64`
-Matrix: PHP 7.0--8.5 (varies per integration; see `TEST_INTEGRATIONS_{XY}` in Makefile)
+Matrix: PHP 7.0+ (varies per integration; see `TEST_INTEGRATIONS_{XY}` in Makefile)
 
 Stage: `integrations test`
 
@@ -74,7 +75,7 @@ substring.
 | Service | Image | Alias | Port | Purpose |
 |---------|-------|-------|------|---------|
 | test-agent | `ddapm-test-agent:v1.22.1` | `test-agent` | 9126 | Receives traces; validates snapshots |
-| request-replayer | `dd-trace-ci:php-request-replayer-2.0` | `request-replayer` | 80 | HTTP request replay |
+| request-replayer | `dd-trace-ci:php-request-replayer-*` | `request-replayer` | 80 | HTTP request replay |
 | httpbin | `kong/httpbin:0.2.2` | `httpbin-integration` | 8080 | HTTP echo service |
 
 ### Additional services by target substring
diff --git a/.claude/ci/tracer-unit-tests.md b/.claude/ci/tracer-unit-tests.md
@@ -36,18 +36,18 @@ Runner: `arch:amd64` for all test jobs. Compile jobs also run on
 `arch:arm64`.
 
 Matrix:
-- **Non-ASAN jobs**: PHP 7.0--8.5, amd64 only.
-- **ASAN jobs**: PHP 7.4--8.5 x {amd64, arm64} for `ASAN test_c`;
-  PHP 7.4--8.5 amd64-only for other ASAN jobs. `ASAN test_c with
+- **Non-ASAN jobs**: PHP 7.0+, amd64 only.
+- **ASAN jobs**: PHP 7.4+ x {amd64, arm64} for `ASAN test_c`;
+  PHP 7.4+ amd64-only for other ASAN jobs. `ASAN test_c with
   multiple observers` is PHP 8.0+ only.
 - **xDebug tests**: specific (PHP, xdebug) version pairs; see the
   `$xdebug_test_matrix` array in `generate-tracer.php`. Xdebug is
   not yet supported on PHP 8.5.
-- **`test_distributed_tracing`**: PHP 7.0--8.5 x {cli-server,
+- **`test_distributed_tracing`**: PHP 7.0+ x {cli-server,
   cgi-fcgi}. The cgi-fcgi variant sets
   `DD_DISTRIBUTED_TRACING=false`.
 - **`test_auto_instrumentation`, `test_composer`, `test_integration`**:
-  PHP 7.0--8.5, amd64.
+  PHP 7.0+, amd64.
 
 ## Quick start: build once, run many
 
diff --git a/.claude/ci/tracer-web-tests.md b/.claude/ci/tracer-web-tests.md
@@ -7,7 +7,8 @@
   pipeline; the web test jobs are generated from `TEST_WEB_{XY}` lists in
   the `Makefile`, expanded by the PHP loop starting at the
   `foreach ($jobs as $type => $type_jobs)` block
-- `Makefile` -- defines `TEST_WEB_70` through `TEST_WEB_85` target lists
+- `Makefile` -- defines per-version `TEST_WEB_{XY}` target lists (where XY is
+  the PHP major+minor digits, e.g. `70` for PHP 7.0)
   and the individual `test_web_*` / `test_metrics` make targets
 - `.gitlab/generate-common.php` -- shared service definitions (test-agent,
   request-replayer, httpbin-integration, mysql)
@@ -31,7 +32,7 @@
 | `test_metrics: [{php}, {sapi}]` | same | Metrics integration tests |
 
 Runner: `arch:amd64`
-Matrix: PHP 7.0--8.5 (varies per framework) x SAPI {cli-server, cgi-fcgi, apache2handler}
+Matrix: PHP 7.0+ (varies per framework) x SAPI {cli-server, cgi-fcgi, apache2handler}
 (PHP >= 7.2 gets all three SAPIs; PHP 7.0--7.1 gets only a bare run without SAPI dimension.
 `test_web_custom` additionally gets `fpm-fcgi`.)
 
@@ -61,7 +62,7 @@ All web test jobs use four GitLab service containers:
 | Service | Image | Alias | Port | Purpose |
 |---------|-------|-------|------|---------|
 | test-agent | `ddapm-test-agent:v1.22.1` | `test-agent` | 9126 | Receives traces; validates snapshots |
-| request-replayer | `dd-trace-ci:php-request-replayer-2.0` | `request-replayer` | 80 | Replays HTTP requests for trace forwarding |
+| request-replayer | `dd-trace-ci:php-request-replayer-*` | `request-replayer` | 80 | Replays HTTP requests for trace forwarding |
 | httpbin | `kong/httpbin:0.2.2` | `httpbin-integration` | 80 | HTTP echo service for curl/guzzle tests |
 | mysql | `dd-trace-ci:php-mysql-dev-5.6` | `mysql-integration` | 3306 | MySQL for WordPress, Drupal, Magento, etc. |
 
diff --git a/.claude/ci/windows-tests.md b/.claude/ci/windows-tests.md
@@ -19,11 +19,11 @@
 
 Runner: `windows-v2:2019`
 Image: `registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-{ver}_windows`
-Matrix: PHP 7.2--8.5 (versions where `version_compare($v, "7.2", ">=")`)
+Matrix: PHP 7.2+
 
 ## What It Tests
 
-`windows test_c` starts `httpbin-windows` and `php-request-replayer-2.0-windows`
+`windows test_c` starts `httpbin-windows` and `php-request-replayer-*-windows`
 service containers, builds `php_ddtrace.dll` from source inline (no pre-built
 artifact needed), then runs `run-tests.php` against `tests/ext/`.
 
