Skip to content

Merge 2.1.x into 2.2.x#5691

Closed
staabm wants to merge 7 commits into
phpstan:2.2.xfrom
staabm:merge21
Closed

Merge 2.1.x into 2.2.x#5691
staabm wants to merge 7 commits into
phpstan:2.2.xfrom
staabm:merge21

Conversation

@staabm
Copy link
Copy Markdown
Contributor

@staabm staabm commented May 17, 2026

No description provided.

staabm and others added 7 commits May 16, 2026 17:17
phpstan#5685)

Co-authored-by: VincentLanglet <9052536+VincentLanglet@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
…n#5682)

Co-authored-by: VincentLanglet <9052536+VincentLanglet@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
… comes from `diff()` (phpstan#5674)

Co-authored-by: VincentLanglet <9052536+VincentLanglet@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
@phpstan-bot
Copy link
Copy Markdown
Collaborator

You've opened the pull request against the latest branch 2.2.x. PHPStan 2.2 is not going to be released for months. If your code is relevant on 2.1.x and you want it to be released sooner, please rebase your pull request and change its target to 2.1.x.

@staabm
Copy link
Copy Markdown
Contributor Author

staabm commented May 17, 2026

@ondrejmirtes please merge

@ondrejmirtes
Copy link
Copy Markdown
Member

I'm sorry, I noticed the merge workflow failing before your PR, so I merged 2.1.x myself 😊

@staabm staabm deleted the merge21 branch May 18, 2026 07:35
@staabm
Copy link
Copy Markdown
Contributor Author

staabm commented May 18, 2026

thank you!

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.

4 participants