mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-06-28 22:30:04 +00:00
Code Modernization: Replace usage of strpos() with str_contains().
`str_contains()` was introduced in PHP 8.0 to perform a case-sensitive check indicating if the string to search in (haystack) contains the given substring (needle). WordPress core includes a polyfill for `str_contains()` on PHP < 8.0 as of WordPress 5.9. This commit replaces `false !== strpos( ... )` with `str_contains()` in core files, making the code more readable and consistent, as well as better aligned with modern development practices. Follow-up to [52039], [52040], [52326], [55703], [55710], [55987]. Props Soean, spacedmonkey, costdev, dingo_d, azaozz, mikeschroder, flixos90, peterwilsoncc, SergeyBiryukov. Fixes #58206. git-svn-id: https://develop.svn.wordpress.org/trunk@55988 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
@@ -583,7 +583,7 @@ function has_blocks( $post = null ) {
|
||||
$post = $wp_post->post_content;
|
||||
}
|
||||
|
||||
return false !== strpos( (string) $post, '<!-- wp:' );
|
||||
return str_contains( (string) $post, '<!-- wp:' );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -619,12 +619,12 @@ function has_block( $block_name, $post = null ) {
|
||||
* This matches behavior for WordPress 5.0.0 - 5.3.0 in matching blocks by
|
||||
* their serialized names.
|
||||
*/
|
||||
if ( false === strpos( $block_name, '/' ) ) {
|
||||
if ( ! str_contains( $block_name, '/' ) ) {
|
||||
$block_name = 'core/' . $block_name;
|
||||
}
|
||||
|
||||
// Test for existence of block by its fully qualified name.
|
||||
$has_block = false !== strpos( $post, '<!-- wp:' . $block_name . ' ' );
|
||||
$has_block = str_contains( $post, '<!-- wp:' . $block_name . ' ' );
|
||||
|
||||
if ( ! $has_block ) {
|
||||
/*
|
||||
@@ -633,7 +633,7 @@ function has_block( $block_name, $post = null ) {
|
||||
*/
|
||||
$serialized_block_name = strip_core_block_namespace( $block_name );
|
||||
if ( $serialized_block_name !== $block_name ) {
|
||||
$has_block = false !== strpos( $post, '<!-- wp:' . $serialized_block_name . ' ' );
|
||||
$has_block = str_contains( $post, '<!-- wp:' . $serialized_block_name . ' ' );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user