Changeset 56021

Timestamp:

06/25/2023 10:48:28 AM (5 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Use str_contains() in a few more places.

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 [55988].

Props spacedmonkey.
See #58220.

Location:

trunk/src/wp-includes

Files:

• blocks.php (modified) (1 diff)
• formatting.php (modified) (1 diff)
• link-template.php (modified) (3 diffs)

trunk/src/wp-includes/blocks.php

@@ -804 +804 @@
     $result = '';
 
-    if ( false !== strpos( $text, '<!--' ) && false !== strpos( $text, '--->' ) ) {
+    if ( str_contains( $text, '<!--' ) && str_contains( $text, '--->' ) ) {
         $text = preg_replace_callback( '%<!--(.*?)--->%', '_filter_block_content_callback', $text );
     }

trunk/src/wp-includes/formatting.php

@@ -4464 +4464 @@
      * starting with /, # or ?, or a PHP file).
      */
-    if ( strpos( $url, ':' ) === false && ! in_array( $url[0], array( '/', '#', '?' ), true ) &&
-        ! preg_match( '/^[a-z0-9-]+?\.php/i', $url ) ) {
+    if ( ! str_contains( $url, ':' ) && ! in_array( $url[0], array( '/', '#', '?' ), true ) &&
+        ! preg_match( '/^[a-z0-9-]+?\.php/i', $url )
+    ) {
         $url = 'http://' . $url;
     }

trunk/src/wp-includes/link-template.php

@@ -223 +223 @@
 
         $category = '';
-        if ( strpos( $permalink, '%category%' ) !== false ) {
+        if ( str_contains( $permalink, '%category%' ) ) {
             $cats = get_the_category( $post->ID );
             if ( $cats ) {
@@ -261 +261 @@
 
         $author = '';
-        if ( strpos( $permalink, '%author%' ) !== false ) {
+        if ( str_contains( $permalink, '%author%' ) ) {
             $authordata = get_userdata( $post->post_author );
             $author     = $authordata->user_nicename;
@@ -503 +503 @@
         }
 
-        if ( strpos( $parentlink, '?' ) === false ) {
+        if ( ! str_contains( $parentlink, '?' ) ) {
             $link = user_trailingslashit( trailingslashit( $parentlink ) . '%postname%' );
         }