Changeset 55988 for trunk/src/wp-includes/blocks.php

Timestamp:

06/22/2023 02:34:56 PM (3 years ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/src/wp-includes/blocks.php (modified) (3 diffs)

trunk/src/wp-includes/blocks.php

@@ -584 +584 @@
         }
 
-        return false !== strpos( (string) $post, '<!-- wp:' );
+        return str_contains( (string) $post, '<!-- wp:' );
 }
 
@@ -620 +620 @@
          * 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 ) {
@@ -634 +634 @@
                 $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 . ' ' );
                 }
         }