Skip to content

merge: cascade 8.5 into master - #310

Merged
lisachenko merged 4 commits into
masterfrom
8.5
Nov 15, 2026
Merged

lisachenko merged 4 commits into
masterfrom
8.5

Conversation

@github-actions

@github-actions github-actions Bot commented Nov 7, 2026

Copy link
Copy Markdown
Contributor

Automated cascade merge of 8.5 into master (branch flow defined in .github/branch-flow.json).

Resolve conflicts in favour of the newer engine structures where they touch include/ - regenerate headers on the target branch instead of merging them textually. See AGENTS.md.

claude and others added 4 commits November 7, 2026 11:54
Apply one rule across src/Type and src/Reflection: a public method that
returns a raw FFI\CData/CType or a generated struct stub view carries
@internal (issue #194).

- Add @internal to the unmarked escape hatches: StringEntry/ObjectEntry/
  ReflectionValue/ReflectionClassConstant::getRawValue(), the
  ReflectionValue::getRaw*() getters, ClosureEntry::getRawFunction(),
  ResourceEntry::getRawData(), OpLine::getHandler(),
  ReflectionExtension::getGlobals(), ReflectionClass::newInstanceRaw()
  and PersistentObjectFactory::persistentClone().
- Merge stacked docblocks. PHP and PHPStan read only the last one, so
  the @internal on ReflectionClass::getRawValue(),
  FunctionLikeTrait::getEntryPointer(), ReflectionMethod::fromRawEntry()
  and ObjectEntry::setDynamicPropertiesPointer() was silently lost. Move
  the displaced docblocks of ReflectionMethod::fromClosureEntry(),
  dereferenceMapPointerSlot() and STORAGE_CE_FLAGS back to their owners.
- Add RawEngineAccessorRule (tools/phpstan) so PHPStan enforces the rule.
- Document the rule and the accessor naming convention in AGENTS.md.

AbstractModule::getGlobals() is left as is: whether that consumer-facing
override may return CData is decided in #192.

Closes #194

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FxhC1ER6GtpZr8k2beJQqx
…#192

AbstractModule::getGlobals() exposes the module globals through this
method, and that API contract is decided in #192. Drop its @internal
marker again and exempt it in RawEngineAccessorRule with a TODO(#192).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FxhC1ER6GtpZr8k2beJQqx
chore(reflection): mark every raw-CData accessor @internal
merge: cascade 8.4 into 8.5
@lisachenko
lisachenko merged commit 4bb4a15 into master Nov 15, 2026
44 checks passed
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.

2 participants