Merge 3.9.x up into 4.2.x #6722
Merged
Conversation
This file contains 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
As per the decision we made during the hackathon. psalm-immutable annotations have been dropped, as they were only introduced to sastisfy Psalm
In the cases at hand, having an unprefixed phpdoc annotation should not confused any up-to-date IDE.
Drop Psalm in favor of PHPStan
SenseException
approved these changes
Jan 15, 2025
morozov
approved these changes
Jan 15, 2025
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.
I used
-X ours(so kept using theortstrategy), and reapplied commands I used to do the drop-psalm PR. After obtaining a satisfying working directory I started from scratch, used-s oursand then restored the working directory to the previously obtained result, then amended the merge commit.