Merge branch 'trunk' of https://github.com/WordPress/wordpress-develop into trac-64076-move-emoji-loader-to-footer

Author: westonruter

src/wp-includes/link-template.php

@@ -4577,7 +4577,7 @@ function get_avatar_data( $id_or_email, $args = null ) {
 		}
 
 		if ( '' !== $name ) {
-			if ( false === strpos( $name, ' ' ) || preg_match( '/\p{Han}|\p{Hiragana}|\p{Katakana}|\p{Hangul}/u', $name ) ) {
+			if ( ! str_contains( $name, ' ' ) || preg_match( '/\p{Han}|\p{Hiragana}|\p{Katakana}|\p{Hangul}/u', $name ) ) {
 				$initials = mb_substr( $name, 0, min( 2, mb_strlen( $name, 'UTF-8' ) ), 'UTF-8' );
 			} else {
 				$first    = mb_substr( $name, 0, 1, 'UTF-8' );

src/wp-includes/shortcodes.php

@@ -182,7 +182,7 @@ function has_shortcode( $content, $tag ) {
  * @return string[] An array of registered shortcode names found in the content.
  */
 function get_shortcode_tags_in_content( $content ) {
-	if ( false === strpos( $content, '[' ) ) {
+	if ( ! str_contains( $content, '[' ) ) {
 		return array();
 	}