Fix CS as per trailing comma rules. #18047
Merged
Conversation
This file contains hidden or 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
571a96e to
d02ca88
Compare
|
I would recommend merging asap, as there will be conflicts piling up also on new PRs opened. |
ADmad
approved these changes
Nov 30, 2024
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.
This would make CI green for
cakephp/cakephp-codesniffer#369
update
and allows less merge conflicts in the future, and to be in sync with
https://www.php-fig.org/per/coding-style/#26-trailing-commas
I checked and these changes and additional rules are additive.
That means the old standard would not complain about it, all stays green.
And so we can apply them to 5.x and merge upstream.
We can also apply them to 5.next directly, but then we lose some of the usefulness of less merge conflicts in the future.
The current conflicts are about ~13 files, so managable.