CS: remove unnecessary ignore annotations [2] (Trac 59650) #5518
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
jrfnl
changed the title
It is perfectly possible to write a commented regex with layout for readability by using the `x` modifier. As per the manual: > x (PCRE_EXTENDED) > If this modifier is set, whitespace data characters in the pattern are totally ignored except when escaped or inside a character class, and characters between an unescaped # outside a character class and the next newline character, inclusive, are also ignored. This is equivalent to Perl's /x modifier, and makes it possible to include commentary inside complicated patterns. > Note, however, that this applies only to data characters. Whitespace characters may never appear within special character sequences in a pattern, for example within the sequence (?( which introduces a conditional subpattern. Ref: https://www.php.net/manual/en/reference.pcre.pattern.modifiers.php This commit rewrites these two regexes to use the `x` modifier and gets rid of the unnecessary `phpcs:disable` comments. The tests in the `tests/phpunit/tests/db/dbDelta.php` file cover this change.
jrfnl
force-pushed
the
trac-59650/no-need-for-ignore-annotation-2
branch
from
447def3
to
be2ee42
Compare
|
Thanks for the PR! Merged in r57061. |
|
Thanks @SergeyBiryukov ! |
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.
It is perfectly possible to write a commented regex with layout for readability by using the
xmodifier.As per the manual:
Ref: https://www.php.net/manual/en/reference.pcre.pattern.modifiers.php
This commit rewrites these two regexes to use the
xmodifier and gets rid of the unnecessaryphpcs:disablecomments.The tests in the
tests/phpunit/tests/db/dbDelta.phpfile cover this change.Trac ticket: https://core.trac.wordpress.org/ticket/59650
This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See GitHub Pull Requests for Code Review in the Core Handbook for more details.