Rename and add test cases

Author: dmsnell

src/wp-includes/formatting.php

@@ -3804,13 +3804,13 @@ function is_email( $email, $deprecated = false ) {
  * Converts to ASCII from email subjects.
  *
  * @since 1.2.0
- * @deprecated {WP_VERSION} Use {@see rfc2047_decode()}.
- *
  * @param string $subject Subject line.
  * @return string Converted string to ASCII.
+ *@deprecated {WP_VERSION} Use {@see wp_decode_rfc2047()}.
+ *
  */
 function wp_iso_descrambler( $subject ) {
-	return rfc2047_decode( $subject );
+	return wp_decode_rfc2047( $subject );
 }
 
 /**

src/wp-includes/rfc2047-mime.php

@@ -21,28 +21,28 @@
  * Example:
  *
  *     // Quoted forms have non-printable ASCII encoded as octets.
- *     'this is some text' === rfc2047_decode( '=?iso-8859-1?q?this=20is_some=20text?=' );
- *     '👌' === rfc2047_decode( '=?utf-8?q?=F0=9F=91=8C?=' );
+ *     'this is some text' === wp_decode_rfc2047( '=?iso-8859-1?q?this=20is_some=20text?=' );
+ *     '👌' === wp_decode_rfc2047( '=?utf-8?q?=F0=9F=91=8C?=' );
  *
  *     // Binary forms are base64-encoded.
- *     '👌' === rfc2047_decode( '=?utf-8?B??=8J+RjA==?=' );
- *     'םולש ןב ילטפנ' === rfc2047_decode( '=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=' );
+ *     '👌' === wp_decode_rfc2047( '=?utf-8?B??=8J+RjA==?=' );
+ *     'םולש ןב ילטפנ' === wp_decode_rfc2047( '=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=' );
  *
  *     // Character sets are re-encoded into UTF-8
- *     '100¥' === rfc2047_decode( '=?iso-8859-1?Q?500=A5?=' );
- *     '🏴󠁧󠁢󠁥󠁮󠁧󠁿' === rfc2047_decode( '=?GB-18030?Q?=949=C82=D36=A01=D36=9F6=D36=9F9=D36=A08=D36=A01=D36=A25?=' );
+ *     '100¥' === wp_decode_rfc2047( '=?iso-8859-1?Q?500=A5?=' );
+ *     '🏴󠁧󠁢󠁥󠁮󠁧󠁿' === wp_decode_rfc2047( '=?GB-18030?Q?=949=C82=D36=A01=D36=9F6=D36=9F9=D36=A08=D36=A01=D36=A25?=' );
  *
  *     // Linear white-space is collapsed.
- *     'ab c d e' === rfc2047_decode( '=?ASCII?Q?a?= =?ASCII?Q?b?= c d=?ASCII?Q?=20?==?ASCII?Q?e?=' )
+ *     'ab c d e' === wp_decode_rfc2047( '=?ASCII?Q?a?= =?ASCII?Q?b?= c d=?ASCII?Q?=20?==?ASCII?Q?e?=' )
  *
  *     // Error-handling is up to the call site.
- *     '=?UTF-8?Q?=6f?=' === rfc2047_decode( '=?UTF-8?Q?=6f?=' );
- *     '=?UTF-8?Q?=6f?=' === rfc2047_decode( '=?UTF-8?Q?=6f?=', 'preserve-errors' );
- *     '�' === rfc2047_decode( '=?UTF-8?Q?=6f?=', 'replace-errors' );
- *     null === rfc2047_decode( '=?UTF-8?Q?=6f?=', 'bail-on-error' );
+ *     '=?UTF-8?Q?=6f?=' === wp_decode_rfc2047( '=?UTF-8?Q?=6f?=' );
+ *     '=?UTF-8?Q?=6f?=' === wp_decode_rfc2047( '=?UTF-8?Q?=6f?=', 'preserve-errors' );
+ *     '�' === wp_decode_rfc2047( '=?UTF-8?Q?=6f?=', 'replace-errors' );
+ *     null === wp_decode_rfc2047( '=?UTF-8?Q?=6f?=', 'bail-on-error' );
  *
  *     // Invalid character encodings are errors.
- *     null === rfc2047_decode( '=?UTF-8?Q?=C0?=', 'bail-on-error' );
+ *     null === wp_decode_rfc2047( '=?UTF-8?Q?=C0?=', 'bail-on-error' );
  *
  * @see https://www.rfc-editor.org/rfc/rfc2047
  *
@@ -53,10 +53,10 @@
  *                                                                       Default is to preserve invalid encoded words as plaintext.
  * @return string Decoded string in UTF-8, if supported, else `null`.
  */
-function rfc2047_decode( $encoded, $errors = 'preserve-errors' ) {
+function wp_decode_rfc2047( $encoded, $errors = 'preserve-errors' ) {
 	/**
 	 * {@see iconv_mime_decode()} which does not give control over error-handling
-	 * at the granularity necessary for this decoder..
+	 * at the granularity necessary for this decoder.
 	 */
 
 	$decoded               = '';
@@ -237,7 +237,7 @@ function ( $matches ) use ( &$failed_decode ) {
 		}
 
 		// Verify the encoding.
-		if ( false === $decoded_chunk || ! seems_utf8( $decoded_chunk ) ) {
+		if ( false === $decoded_chunk || ! wp_is_valid_utf8( $decoded_chunk ) ) {
 			goto handle_invalid;
 		}
 

src/wp-mail.php

@@ -124,7 +124,7 @@
 				$subject = trim( $line );
 				$subject = substr( $subject, 9, strlen( $subject ) - 9 );
 				// Captures any text in the subject before $phone_delim as the subject.
-				$subject = rfc2047_decode( $subject );
+				$subject = wp_decode_rfc2047( $subject );
 				$subject = explode( $phone_delim, $subject );
 				$subject = $subject[0];
 			}