Skip to content

Commit fe679bd

Browse files
amieiroamieiro
committed
Change the regexs to use hex codes and reorganize some code
1 parent 8be3ea1 commit fe679bd

4 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎WordPress/Sniffs/WP/I18nSniff.php‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -824,14 +824,14 @@ private function check_string_has_no_leading_trailing_spaces( $matched_content,
824824
$first_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, $param_info['start'], ( $param_info['end'] + 1 ), true );
825825

826826
// Define regex patterns.
827-
$pattern_leading_spaces = '/^[ ]+/u';
828-
$pattern_trailing_spaces = '/[ ]+$/u';
829-
$pattern_leading_tabs = '/^\t+/u';
830-
$pattern_trailing_tabs = '/\t+$/u';
831-
$pattern_leading_newlines = '/^[\r\n]+/u';
832-
$pattern_trailing_newlines = '/[\r\n]+$/u';
827+
$pattern_leading_spaces = '/^[\x20]+/u';
828+
$pattern_trailing_spaces = '/[\x20]+$/u';
829+
$pattern_leading_tabs = '/^\x09+/u';
830+
$pattern_trailing_tabs = '/\x09+$/u';
833831
$pattern_leading_vtabs = '/^\x0B+/u';
834832
$pattern_trailing_vtabs = '/\x0B+$/u';
833+
$pattern_leading_newlines = '/^\x0A+/u';
834+
$pattern_trailing_newlines = '/\x0A+$/u';
835835

836836
// Check for leading spaces.
837837
if ( preg_match( $pattern_leading_spaces, $content_without_quotes ) ) {
@@ -873,42 +873,42 @@ private function check_string_has_no_leading_trailing_spaces( $matched_content,
873873
);
874874
}
875875

876-
// Check for leading new lines.
877-
if ( preg_match( $pattern_leading_newlines, $content_without_quotes ) ) {
876+
// Check for leading vertical tabs.
877+
if ( preg_match( $pattern_leading_vtabs, $content_without_quotes ) ) {
878878
$this->phpcsFile->addError(
879-
'Translatable string should not have leading new lines. Found: %s',
879+
'Translatable string should not have leading vertical tabs. Found: %s',
880880
$first_non_empty,
881-
'LeadingNewLines',
881+
'LeadingVTabs',
882882
array( $param_info['clean'] )
883883
);
884884
}
885885

886-
// Check for trailing new lines.
887-
if ( preg_match( $pattern_trailing_newlines, $content_without_quotes ) ) {
886+
// Check for trailing vertical tabs.
887+
if ( preg_match( $pattern_trailing_vtabs, $content_without_quotes ) ) {
888888
$this->phpcsFile->addError(
889-
'Translatable string should not have trailing new lines. Found: %s',
889+
'Translatable string should not have trailing vertical tabs. Found: %s',
890890
$first_non_empty,
891-
'TrailingNewLines',
891+
'TrailingVTabs',
892892
array( $param_info['clean'] )
893893
);
894894
}
895-
896-
// Check for leading vertical tabs.
897-
if ( preg_match( $pattern_leading_vtabs, $content_without_quotes ) ) {
895+
896+
// Check for leading new lines.
897+
if ( preg_match( $pattern_leading_newlines, $content_without_quotes ) ) {
898898
$this->phpcsFile->addError(
899-
'Translatable string should not have leading vertical tabs. Found: %s',
899+
'Translatable string should not have leading new lines. Found: %s',
900900
$first_non_empty,
901-
'LeadingVTabs',
901+
'LeadingNewLines',
902902
array( $param_info['clean'] )
903903
);
904904
}
905905

906-
// Check for trailing vertical tabs.
907-
if ( preg_match( $pattern_trailing_vtabs, $content_without_quotes ) ) {
906+
// Check for trailing new lines.
907+
if ( preg_match( $pattern_trailing_newlines, $content_without_quotes ) ) {
908908
$this->phpcsFile->addError(
909-
'Translatable string should not have trailing vertical tabs. Found: %s',
909+
'Translatable string should not have trailing new lines. Found: %s',
910910
$first_non_empty,
911-
'TrailingVTabs',
911+
'TrailingNewLines',
912912
array( $param_info['clean'] )
913913
);
914914
}

‎WordPress/Tests/WP/I18nUnitTest.1.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,11 @@ __( 'string ', 'my-slug' ); // Bad: trailing tab.
344344
__( ' string ', 'my-slug' ); // Bad: leading and trailing tabs.
345345
__( ' string', 'my-slug' ); // Bad: two leading tabs.
346346
__( 'string ', 'my-slug' ); // Bad: two trailing tabs.
347+
__( " String with leading vertical tab", 'my-slug' ); // Bad: leading vertical tab.
348+
__( "String with trailing vertical tab ", 'my-slug' ); // Bad: trailing vertical tab.
349+
__( " String with leading and trailing vertical tabs ", 'my-slug' ); // Bad: leading and trailing vertical tabs.
350+
__( " String with 2 leading vertical tabs", 'my-slug' ); // Bad: 2 leading vertical tabs.
351+
__( "String with 2 trailing vertical tabs ", 'my-slug' ); // Bad: 2 trailing vertical tabs.
347352
__( '
348353
string', 'my-slug' ); // Bad: leading new line.
349354
__( 'string
@@ -357,10 +362,5 @@ string', 'my-slug' ); // Bad: two leading new lines.
357362
__( 'string
358363
359364
', 'my-slug' ); // Bad: two trailing new lines.
360-
__( " String with leading vertical tab", 'my-slug' ); // Bad, has leading vertical tab.
361-
__( "String with trailing vertical tab ", 'my-slug' ); // Bad, has trailing vertical tab.
362-
__( " String with leading and trailing vertical tabs ", 'my-slug' ); // Bad, has both leading and trailing vertical tabs.
363-
__( " String with 2 leading vertical tabs", 'my-slug' ); // Bad, has 2 leading vertical tabs.
364-
__( "String with 2 trailing vertical tabs ", 'my-slug' ); // Bad, has 2 trailing vertical tabs.
365365

366366
// phpcs:enable WordPress.WP.I18n.MissingTranslatorsComment

‎WordPress/Tests/WP/I18nUnitTest.1.inc.fixed‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,11 @@ __( 'string ', 'my-slug' ); // Bad: trailing tab.
344344
__( ' string ', 'my-slug' ); // Bad: leading and trailing tabs.
345345
__( ' string', 'my-slug' ); // Bad: two leading tabs.
346346
__( 'string ', 'my-slug' ); // Bad: two trailing tabs.
347+
__( " String with leading vertical tab", 'my-slug' ); // Bad: leading vertical tab.
348+
__( "String with trailing vertical tab ", 'my-slug' ); // Bad: trailing vertical tab.
349+
__( " String with leading and trailing vertical tabs ", 'my-slug' ); // Bad: leading and trailing vertical tabs.
350+
__( " String with 2 leading vertical tabs", 'my-slug' ); // Bad: 2 leading vertical tabs.
351+
__( "String with 2 trailing vertical tabs ", 'my-slug' ); // Bad: 2 trailing vertical tabs.
347352
__( '
348353
string', 'my-slug' ); // Bad: leading new line.
349354
__( 'string
@@ -357,10 +362,5 @@ string', 'my-slug' ); // Bad: two leading new lines.
357362
__( 'string
358363

359364
', 'my-slug' ); // Bad: two trailing new lines.
360-
__( " String with leading vertical tab", 'my-slug' ); // Bad, has leading vertical tab.
361-
__( "String with trailing vertical tab ", 'my-slug' ); // Bad, has trailing vertical tab.
362-
__( " String with leading and trailing vertical tabs ", 'my-slug' ); // Bad, has both leading and trailing vertical tabs.
363-
__( " String with 2 leading vertical tabs", 'my-slug' ); // Bad, has 2 leading vertical tabs.
364-
__( "String with 2 trailing vertical tabs ", 'my-slug' ); // Bad, has 2 trailing vertical tabs.
365365

366366
// phpcs:enable WordPress.WP.I18n.MissingTranslatorsComment

‎WordPress/Tests/WP/I18nUnitTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,15 @@ public function getErrorList( $testFile = '' ) {
176176
345 => 1,
177177
346 => 1,
178178
347 => 1,
179-
349 => 1,
180-
351 => 2,
179+
348 => 1,
180+
349 => 2,
181+
350 => 1,
182+
351 => 1,
183+
352 => 1,
181184
354 => 1,
182-
357 => 1,
183-
360 => 1,
184-
361 => 1,
185-
362 => 2,
186-
363 => 1,
187-
364 => 1,
185+
356 => 2,
186+
359 => 1,
187+
362 => 1,
188188
);
189189

190190
case 'I18nUnitTest.2.inc':

0 commit comments

Comments
 (0)