diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d5bd3e..575ae3b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,17 +12,14 @@ on: # on PHP 8.4, 8.5 and 8.6 in parallel, and every engine-touching job runs # against every minor. # -# PHP 8.6 is pre-release: z-engine has no stable 8.6 tag yet, so that leg -# resolves its 8.6.x-dev line (master), and both the interpreter and z-engine's -# definitions move with every RC. Its legs are therefore non-blocking -# (continue-on-error) - a red 8.6 leg is a signal to look at, not a gate. Once -# PHP 8.6.0 is GA and z-engine tags 8.6.0, drop the `@dev` flag and the -# continue-on-error lines and the leg becomes as binding as the others. +# PHP 8.6 is a GA release and its legs are as binding as the 8.4 and 8.5 ones: +# none of them is allowed to fail. Until z-engine tags 8.6.0 that leg resolves +# its 8.6.x-dev line (master) through the `@dev` flag; "prefer-stable" moves it +# to the tag on its own as soon as one exists, and the flag can then be dropped. jobs: tests: name: Tests (release, NTS, PHP ${{ matrix.php }}) runs-on: ubuntu-latest - continue-on-error: ${{ matrix.php == '8.6' }} strategy: fail-fast: false matrix: @@ -46,7 +43,6 @@ jobs: tests-opcache: name: Tests (opcache, save_comments=0, PHP ${{ matrix.php }}) runs-on: ubuntu-latest - continue-on-error: ${{ matrix.php == '8.6' }} strategy: fail-fast: false matrix: @@ -86,7 +82,6 @@ jobs: benchmarks-smoke: name: Benchmarks (smoke, PHP ${{ matrix.php }}) runs-on: ubuntu-latest - continue-on-error: ${{ matrix.php == '8.6' }} strategy: fail-fast: false matrix: @@ -112,7 +107,6 @@ jobs: analysis-tests: name: PHPStan extension tests (FFI disabled, PHP ${{ matrix.php }}) runs-on: ubuntu-latest - continue-on-error: ${{ matrix.php == '8.6' }} strategy: fail-fast: false matrix: @@ -139,7 +133,6 @@ jobs: generated-stubs: name: Generated stubs are up to date (PHP ${{ matrix.php }}) runs-on: ubuntu-latest - continue-on-error: ${{ matrix.php == '8.6' }} strategy: fail-fast: false matrix: @@ -166,7 +159,6 @@ jobs: tests-internal-debug: name: Internal group (debug build, PHP ${{ matrix.php }}) runs-on: ubuntu-latest - continue-on-error: ${{ matrix.php == '8.6' }} strategy: fail-fast: false matrix: @@ -297,7 +289,6 @@ jobs: static-analysis: name: PHPStan (level max, PHP ${{ matrix.php }}) runs-on: ubuntu-latest - continue-on-error: ${{ matrix.php == '8.6' }} strategy: fail-fast: false matrix: diff --git a/AGENTS.md b/AGENTS.md index 77a1f2e..335b907 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -116,13 +116,12 @@ z-engine owns all version-dependent header complexity, and CI exercises the whol rule is unchanged: never run the suite on a minor the resolved z-engine does not target, and never try to defeat `Core::init()`'s guard. -PHP 8.6 is **pre-release** support. z-engine has no stable 8.6 tag yet, so its 8.6 line is the -`master` branch (`8.6.x-dev`); the `@dev` flag lets this repository's own installs reach it, -and `"prefer-stable": true` keeps 8.4 and 8.5 on their stable tags rather than drifting onto -`8.4.x-dev`/`8.5.x-dev`. The 8.6 CI legs are `continue-on-error`: the interpreter and the -definitions both move with every RC, so a red 8.6 leg is a signal, not a gate. When PHP 8.6.0 -is GA and z-engine tags 8.6.0, drop the `@dev` flag and the `continue-on-error` lines in one -change. +PHP 8.6 is GA and **fully supported**: its CI legs are required, exactly like the 8.4 and 8.5 +ones — never mark them `continue-on-error`. z-engine has no stable 8.6 tag yet, so its 8.6 line +is the `master` branch (`8.6.x-dev`); the `@dev` flag lets this repository's own installs reach +it, and `"prefer-stable": true` keeps 8.4 and 8.5 on their stable tags rather than drifting onto +`8.4.x-dev`/`8.5.x-dev` (and moves 8.6 onto the 8.6.0 tag by itself once it exists). When +z-engine tags 8.6.0, drop the `@dev` flag. Running anything that touches the engine requires: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index de31d6a..fac32fc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,8 +10,8 @@ about the engine itself. - **Run only supported PHP minors.** Engine struct layouts are version-specific; z-engine tracks one minor per release line, and the `~8.4.2 || ~8.5.0 || ~8.6.0@dev` constraint makes composer resolve the line matching your PHP, so this package supports all three minors in - parallel. PHP 8.6 is pre-release: it resolves z-engine's `8.6.x-dev` line and its CI legs are - non-blocking until 8.6.0 ships. + parallel. Every leg is required, 8.6 included; until z-engine tags 8.6.0 the 8.6 leg + resolves its `8.6.x-dev` line. - **Develop against a debug build** (`--enable-debug`, FFI on). It turns silent memory corruption into loud assertion failures. - FFI must be enabled (`ffi.enable=1`) and the JIT disabled (`opcache.jit=off`). diff --git a/README.md b/README.md index b363cc8..454f303 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ real class whose `int` is enforced by the Zend Engine itself — the same `TypeError` you get from a hand-written class, on a class that did not exist a microsecond ago.** -[![PHP Version](https://img.shields.io/badge/php-8.4%20%7C%208.5%20%7C%208.6%20(beta)-8892BF.svg)](https://www.php.net/) +[![PHP Version](https://img.shields.io/badge/php-8.4%20%7C%208.5%20%7C%208.6-8892BF.svg)](https://www.php.net/) [![License](https://img.shields.io/packagist/l/lisachenko/userland-php-generics.svg)](LICENSE) [![PHPStan](https://img.shields.io/badge/PHPStan-level%20max-brightgreen.svg)](https://phpstan.org/) @@ -210,8 +210,8 @@ autoloader is a side effect a library should not impose. ## Requirements and installation -- PHP 8.4 or 8.5 (supported in parallel), NTS, x86-64 — PHP 8.6 is supported as a - pre-release while it is in beta/RC, see below +- PHP 8.4, 8.5 or 8.6 (supported in parallel), NTS, x86-64 — on PHP 8.6 see the note below + until z-engine tags 8.6.0 - `ext-ffi` with `ffi.enable=1` - `opcache.jit=off` (the JIT rewrites the executor internals z-engine hooks into) - [`lisachenko/z-engine`](https://github.com/lisachenko/z-engine) — the @@ -223,19 +223,18 @@ autoloader is a side effect a library should not impose. composer require --dev lisachenko/userland-php-generics ``` -### PHP 8.6 (pre-release) +### PHP 8.6 -z-engine carries definitions for PHP 8.6 on its `8.6.x-dev` line (its `master` branch), but -there is no stable 8.6 tag until PHP 8.6.0 itself is released. Composer only lets a *root* -package opt into a dev dependency, so on PHP 8.6 allow it in your own `composer.json` first: +PHP 8.6 is supported on the same footing as 8.4 and 8.5: its CI legs are required. z-engine +carries the 8.6 definitions on its `8.6.x-dev` line (its `master` branch) and has not tagged +8.6.0 yet. Composer only lets a *root* package opt into a dev dependency, so on PHP 8.6 allow it +in your own `composer.json` first: ```bash composer require --dev lisachenko/z-engine:8.6.x-dev lisachenko/userland-php-generics ``` -Treat it as a preview: the interpreter's internals and z-engine's definitions can still move -between RCs, so track the latest RC and update both together. Once z-engine tags 8.6.0 the -explicit z-engine requirement can be dropped again. +Once z-engine tags 8.6.0 the explicit z-engine requirement can be dropped again. ```php use Lisachenko\Generics\Generic;