Skip to content

[Backport #2008 to 5.x] Make AbstractAnnotation::$_context non-nullable#2009

Merged
DerManoMann merged 2 commits into
5.xfrom
backport-2008-to-5.x
Apr 29, 2026
Merged

[Backport #2008 to 5.x] Make AbstractAnnotation::$_context non-nullable#2009
DerManoMann merged 2 commits into
5.xfrom
backport-2008-to-5.x

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

Automated backport of #2008 to branch 5.x.

Do not modify this pull request.

Closes #2007

Summary

  • Change AbstractAnnotation::$_context type from ?Context to Context
  • The constructor guarantees a non-null Context across all three initialization branches
  • The nullable type was a leftover from the pre-native-type PHPDoc @var Context|null, converted in Code cleanup #1947

Test plan

  • Full test suite passes (1037 tests)
  • CI matrix

@github-actions

Copy link
Copy Markdown
Contributor Author

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-2008-to-5.x
git worktree add --checkout .worktree/backport-2008-to-5.x backport-2008-to-5.x
cd .worktree/backport-2008-to-5.x
git reset --hard HEAD^
git cherry-pick -x ede7ae7d989edb272f73172d5c33e1476b8dba26

@DerManoMann DerManoMann marked this pull request as ready for review April 29, 2026 22:49
@DerManoMann DerManoMann merged commit 60264a9 into 5.x Apr 29, 2026
23 checks passed
@DerManoMann DerManoMann deleted the backport-2008-to-5.x branch April 29, 2026 22:51
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