Repository navigation
chore(gen): regenerate 8.6 headers for the upstream EG/CG padding - #311
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this changes
Fixes the red CI on master after #310 (4bb4a15). The six failing jobs were the linux/darwin "Generated headers up to date" checks for PHP 8.6. Tests and PHPStan were green.
The cause is upstream, not the merge: php-src master (the 8.6 dev line) added an ABI-padding union to both
zend_compiler_globalsandzend_executor_globals(Zend/zend_globals.h):and bumped
ZEND_MODULE_API_NOfrom 20260924 to 20261112. The 8.6 nightly CI builds picked that up, so the committed artifacts drifted. The #310 merge itself touches nothing underinclude/,stubs/or the generator.The two commits here come from the repo's own Generate linux headers and Generate darwin headers workflows (
workflow_dispatchon this branch); nothing was hand-edited. Per target, the diff is:engine.h: the new trailingpaddingunion in both structslayouts.json:paddingat the end of each struct; EG 2224 → 2288 bytes, CG 616 → 680 (linux nts). No existing field offset moves.constants.php/ layoutsmeta.api: the API number bumpprobe.c: the two newoffsetofprobesstubs/zend-engine-structs.php: apublic \FFI\CData $paddingon both stubsWindows has no 8.6 artifacts, so it's unaffected.
Environment it was verified on
Checklist
masterdirectlycomposer testpasses on the matching PHP minor (left to CI on this PR)composer phpstan(level max) andcomposer cs:checkare green (left to CI)paddingis new and unreadinclude/orstubs/hand-editedGenerated by Claude Code