Code Modernization: Replace strpos() with str_contains().

audrasjb · audrasjb · commit 8bed69c4dfdd · 2026-06-04T14:08:26.000Z
This changeset replaces recently introduced `false !== strpos( ... )` and `false === strpos( ... )` with `str_contains()` in core files, making the code more readable and consistent, as well as better aligned with modern development practices. Introduced in [60269] and [60939]. Fixed during WCEU2026 contribution day. Follow-up to [52039], [55988], [56245], [60269] and [60939]. Props Soean, mukesh27. Fixes #65408. git-svn-id: https://develop.svn.wordpress.org/trunk@62461 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/class-wp-block-processor.php b/src/wp-includes/class-wp-block-processor.php
@@ -1799,9 +1799,9 @@ public function get_printable_block_type(): ?string {
 	 * @return string Fully-qualified block type including namespace.
 	 */
 	public static function normalize_block_type( string $block_type ): string {
-		return false === strpos( $block_type, '/' )
-			? "core/{$block_type}"
-			: $block_type;
+		return str_contains( $block_type, '/' )
+			? $block_type
+			: "core/{$block_type}";
 	}
 
 	/**
diff --git a/src/wp-includes/link-template.php b/src/wp-includes/link-template.php
@@ -4579,7 +4579,7 @@ function get_avatar_data( $id_or_email, $args = null ) {
 			}
 		} elseif ( $id_or_email instanceof WP_Comment ) {
 			$name = $id_or_email->comment_author;
-		} elseif ( is_string( $id_or_email ) && false !== strpos( $id_or_email, '@' ) ) {
+		} elseif ( is_string( $id_or_email ) && str_contains( $id_or_email, '@' ) ) {
 			$name = str_replace( array( '.', '_', '-' ), ' ', substr( $id_or_email, 0, strpos( $id_or_email, '@' ) ) );
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -4579,7 +4579,7 @@ function get_avatar_data( $id_or_email, $args = null ) {`
`4579`	`4579`	`}`
`4580`	`4580`	`} elseif ( $id_or_email instanceof WP_Comment ) {`
`4581`	`4581`	`$name = $id_or_email->comment_author;`
`4582`		`- } elseif ( is_string( $id_or_email ) && false !== strpos( $id_or_email, '@' ) ) {`
	`4582`	`+ } elseif ( is_string( $id_or_email ) && str_contains( $id_or_email, '@' ) ) {`
`4583`	`4583`	`$name = str_replace( array( '.', '_', '-' ), ' ', substr( $id_or_email, 0, strpos( $id_or_email, '@' ) ) );`
`4584`	`4584`	`}`
`4585`	`4585`