Skip to content

merge: cascade 8.4 into 8.5 (preload-mode configuration) - #299

Merged
lisachenko merged 1 commit into
8.5from
merge/cascade-8.4-into-8.5-preload
Oct 10, 2026
Merged

lisachenko merged 1 commit into
8.5from
merge/cascade-8.4-into-8.5-preload

Conversation

@lisachenko

Copy link
Copy Markdown
Owner

What this changes

The resolved form of the automated cascade #298 (8.4 → 8.5), carrying #297 (the preload-mode configuration hint, Core::engineHeaderPath() / Core::preloadScriptPath() / Core::preloadConfigurationHint(), the guard that lets ffi.preload and opcache.preload coexist, and the php-cgi PreloadModeTest).

The only conflict was in README.md: 8.5 has a paragraph on Windows binding right where 8.4 inserted the new "Web SAPIs and ffi.enable=preload" section. Both are kept, the Windows paragraph first. Everything else merged cleanly; the diff against 8.5 is exactly the five files of #297.

Merge with a merge commit so 8.4 stays an ancestor of 8.5; #298 is then closed as superseded.

Environment it was verified on

Checklist

  • Targets the minimum affected version branch — this is the cascade step itself; the change lives on 8.4
  • composer test passes on the matching PHP minor — CI
  • composer phpstan (level max) and composer cs:check are green on the merged tree
  • Tests added or updated; structs the code dereferences are listed in layout_structs (nothing new)
  • If tools/generator/symbols.php changed: regenerated — unchanged
  • Conventional Commits used for the commit messages

🤖 Generated with Claude Code

https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2


Generated by Claude Code

Carries the preload-mode configuration hint, the ffi.preload/opcache.preload
guard and the php-cgi preload tests (#297) into the 8.5 line. README: the 8.5
paragraph on Windows binding stays, followed by the new "Web SAPIs and
ffi.enable=preload" section.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
@lisachenko
lisachenko marked this pull request as ready for review October 10, 2026 20:28
@lisachenko
lisachenko merged commit f68dd33 into 8.5 Oct 10, 2026
21 checks passed
@lisachenko
lisachenko deleted the merge/cascade-8.4-into-8.5-preload branch October 10, 2026 20:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant