General: fix phpcs errors in jetpack.php #14134
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
This makes things less readable overall, but avoids having commits fail because of the pre-commit hook. I briefly considered just disabling phpcs for those few lines, but I don't think it would look very good to have a phpcs:disable as the first thing we do in the main plugin file.
jeherve
added
General
[Status] Needs Review
|
Thank you for the great PR description! When this PR is ready for review, please apply the Scheduled Jetpack release: December 3, 2019. |
ChaosExAnima
approved these changes
Nov 27, 2019
|
Looks good here! |
ChaosExAnima
added
[Status] Ready to Merge
matticbot
added
[Status] Needs Changelog
and removed
[Status] Ready to Merge
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.
Changes proposed in this Pull Request:
This makes things less readable overall, but avoids having commits fail because of the pre-commit hook. This has been annoying since we implemented the phpcs-changed changes, since you have to
--no-verifyfor simple things like updating the version number on a release branch. This also breaks automated committing like in #13977.I briefly considered just disabling phpcs for those few lines, but I don't think it would look very good to have a
phpcs:disableas the first thing we do in the main plugin file.Testing instructions:
vendor/bin/phpcs -w jetpack.phpProposed changelog entry for your changes: