Merge pull request #1883 from WordPress/feature/fix-up-i18n-sniff

Clean up the I18n sniff
WordPress · Apr 11, 2020 · 3ee6c4f · 3ee6c4f
2 parents 02af9f6 + 04fc205
commit 3ee6c4f
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/WordPress/Sniffs/WP/I18nSniff.php b/WordPress/Sniffs/WP/I18nSniff.php
@@ -630,8 +630,8 @@ protected function check_text( $context ) {
 		 *
 		 * Strip placeholders and surrounding quotes.
 		 */
-		$content_without_surrounding_quotes = trim( $this->strip_quotes( $content ) );
-		$non_placeholder_content = preg_replace( self::SPRINTF_PLACEHOLDER_REGEX, '', $content_without_surrounding_quotes );
+		$content_without_quotes  = trim( $this->strip_quotes( $content ) );
+		$non_placeholder_content = preg_replace( self::SPRINTF_PLACEHOLDER_REGEX, '', $content_without_quotes );
 
 		if ( '' === $non_placeholder_content ) {
 			$this->phpcsFile->addError( 'Strings should have translatable content', $stack_ptr, 'NoEmptyStrings' );
@@ -644,7 +644,7 @@ protected function check_text( $context ) {
 		 * Strip surrounding quotes.
 		 */
 		$reader = new \XMLReader();
-		$reader->XML( $content_without_surrounding_quotes, 'UTF-8', LIBXML_NOERROR | LIBXML_ERR_NONE | LIBXML_NOWARNING );
+		$reader->XML( $content_without_quotes, 'UTF-8', LIBXML_NOERROR | LIBXML_ERR_NONE | LIBXML_NOWARNING );
 
 		// Is the first node an HTML element?
 		if ( ! $reader->read() || \XMLReader::ELEMENT !== $reader->nodeType ) {
@@ -653,10 +653,13 @@ protected function check_text( $context ) {
 
 		// If the opening HTML element includes placeholders in its attributes, we don't warn.
 		// E.g. '<option id="%1$s" value="%2$s">Translatable option name</option>'.
-		for ( $i = 0; $attr = $reader->getAttributeNo( $i ); $i++ ) {
-			if ( preg_match( self::SPRINTF_PLACEHOLDER_REGEX, $attr ) ) {
+		$i = 0;
+		while ( $attr = $reader->getAttributeNo( $i ) ) {
+			if ( preg_match( self::SPRINTF_PLACEHOLDER_REGEX, $attr ) === 1 ) {
 				return;
 			}
+
+			++$i;
 		}
 
 		// We don't flag strings wrapped in `<a href="...">...</a>`, as the link target might actually need localization.
@@ -665,7 +668,7 @@ protected function check_text( $context ) {
 		}
 
 		// Does the entire string only consist of this HTML node?
-		if ( $reader->readOuterXml() === $content_without_surrounding_quotes ) {
+		if ( $reader->readOuterXml() === $content_without_quotes ) {
 			$this->phpcsFile->addWarning( 'Strings should not be wrapped in HTML', $stack_ptr, 'NoHtmlWrappedStrings' );
 		}
 	}