Merge pull request #2233 from WordPress/feature/wp-i18n-adjust-sprint…

…f-regexes-for-new-php-80-modifiers
WordPress · Apr 24, 2023 · 119cc0c · 119cc0c
2 parents d09d549 + 00dcc63
commit 119cc0c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
@@ -63,7 +63,7 @@ final class I18nSniff extends AbstractFunctionParameterSniff {
 				[0-9]+                     # Width specifier.
 				(?:\.(?:[ 0]|\'.)?[0-9]+)? # Optional precision specifier with optional padding character.
 			)
-			[bcdeEfFgGosuxX]           # Type specifier.
+			[bcdeEfFgGhHosuxX]           # Type specifier.
 		)
 	)/x';
 
@@ -85,7 +85,7 @@ final class I18nSniff extends AbstractFunctionParameterSniff {
 			[0-9]+                     # Width specifier.
 			(?:\.(?:[ 0]|\'.)?[0-9]+)? # Optional precision specifier with optional padding character.
 		)
-		[bcdeEfFgGosuxX]           # Type specifier.
+		[bcdeEfFgGhHosuxX]           # Type specifier.
 	)/x';
 
 	/**

diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc b/WordPress/Tests/WP/I18nUnitTest.1.inc
@@ -314,4 +314,7 @@ esc_html_e( 'foo', '' ); // Bad: text domain mismatch.
 // phpcs:set WordPress.WP.I18n text_domain[]
 esc_html_e( 'foo', '' ); // Bad: text-domain can not be empty.
 
+// PHP 8.0+: safeguard handling of newly introduced placeholders.
+__( 'There are %1$h monkeys in the %H', 'my-slug' ); // Bad: multiple arguments should be numbered.
+
 // phpcs:enable WordPress.WP.I18n.MissingTranslatorsComment
diff --git a/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed b/WordPress/Tests/WP/I18nUnitTest.1.inc.fixed
@@ -314,4 +314,7 @@ esc_html_e( 'foo', '' ); // Bad: text domain mismatch.
 // phpcs:set WordPress.WP.I18n text_domain[]
 esc_html_e( 'foo', '' ); // Bad: text-domain can not be empty.
 
+// PHP 8.0+: safeguard handling of newly introduced placeholders.
+__( 'There are %1$h monkeys in the %H', 'my-slug' ); // Bad: multiple arguments should be numbered.
+
 // phpcs:enable WordPress.WP.I18n.MissingTranslatorsComment
diff --git a/WordPress/Tests/WP/I18nUnitTest.php b/WordPress/Tests/WP/I18nUnitTest.php
@@ -148,6 +148,7 @@ public function getErrorList( $testFile = '' ) {
 					306 => 1,
 					311 => 1,
 					315 => 1,
+					318 => 1,
 				);
 
 			case 'I18nUnitTest.2.inc':