CS: remove unnecessary ignore annotations [1] (Trac 59650) #5517
Conversation
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 this one regex to use the `x` modifier and gets rid of the unnecessary `phpcs:disable` comments. The tests in the `tests/phpunit/tests/kses.php` file cover this change.
jrfnl
force-pushed
the
trac-59650/no-need-for-ignore-annotation-1
branch
from
ee4e590 to
e05da6c
Compare
|
Thanks for the PR! Merged in r57056. |
|
Thanks again @SergeyBiryukov ! |
|
@SergeyBiryukov Looks like the commit message is a bit borked - it references the changes from PR #5518, not the changes from this PR ? |
Yeah, I mixed up the descriptions of the two PRs, sorry for that! Commit messages cannot be edited afterwards. At least the first sentence is accurate 🙂 |
@SergeyBiryukov It happens ;-) |
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 this one regex to use the
xmodifier and gets rid of the unnecessaryphpcs:disablecomments.The tests in the
tests/phpunit/tests/kses.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.