Changeset 56031

Timestamp:

06/26/2023 10:15:04 AM (18 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], [56021].

See #58206.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (2 diffs)
• wp-includes/class-wp-editor.php (modified) (1 diff)
• wp-includes/class-wp-rewrite.php (modified) (3 diffs)
• wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (6 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (2 diffs)
• wp-includes/load.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)
• wp-includes/rest-api/class-wp-rest-server.php (modified) (1 diff)
• wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php (modified) (2 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -3320 +3320 @@
 
     $url = empty( $attachment['url'] ) ? '' : $attachment['url'];
-    $rel = ( strpos( $url, 'attachment_id' ) || get_attachment_link( $id ) == $url );
+    $rel = ( str_contains( $url, 'attachment_id' ) || get_attachment_link( $id ) === $url );
 
     remove_filter( 'media_send_to_editor', 'image_media_send_to_editor' );

trunk/src/wp-admin/includes/media.php

@@ -832 +832 @@
             $rel = '';
 
-            if ( strpos( $attachment['url'], 'attachment_id' ) || get_attachment_link( $send_id ) == $attachment['url'] ) {
+            if ( str_contains( $attachment['url'], 'attachment_id' ) || get_attachment_link( $send_id ) === $attachment['url'] ) {
                 $rel = " rel='attachment wp-att-" . esc_attr( $send_id ) . "'";
             }
@@ -1360 +1360 @@
         $size  = ! empty( $attachment['image-size'] ) ? $attachment['image-size'] : 'medium';
         $alt   = ! empty( $attachment['image_alt'] ) ? $attachment['image_alt'] : '';
-        $rel   = ( strpos( $url, 'attachment_id' ) || get_attachment_link( $attachment_id ) === $url );
+        $rel   = ( str_contains( $url, 'attachment_id' ) || get_attachment_link( $attachment_id ) === $url );
 
         return get_image_send_to_editor( $attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt );

trunk/src/wp-includes/class-wp-editor.php

@@ -572 +572 @@
                         // Force urlencoding of commas.
                         foreach ( $editor_styles as $key => $url ) {
-                            if ( strpos( $url, ',' ) !== false ) {
+                            if ( str_contains( $url, ',' ) ) {
                                 $editor_styles[ $key ] = str_replace( ',', '%2C', $url );
                             }

trunk/src/wp-includes/class-wp-rewrite.php

@@ -1061 +1061 @@
                  * minute all present). Set these flags now as we need them for the endpoints.
                  */
-                if ( strpos( $struct, '%postname%' ) !== false
-                        || strpos( $struct, '%post_id%' ) !== false
-                        || strpos( $struct, '%pagename%' ) !== false
-                        || ( strpos( $struct, '%year%' ) !== false && strpos( $struct, '%monthnum%' ) !== false && strpos( $struct, '%day%' ) !== false && strpos( $struct, '%hour%' ) !== false && strpos( $struct, '%minute%' ) !== false && strpos( $struct, '%second%' ) !== false )
-                        ) {
+                if ( str_contains( $struct, '%postname%' )
+                    || str_contains( $struct, '%post_id%' )
+                    || str_contains( $struct, '%pagename%' )
+                    || ( str_contains( $struct, '%year%' )
+                        && str_contains( $struct, '%monthnum%' )
+                        && str_contains( $struct, '%day%' )
+                        && str_contains( $struct, '%hour%' )
+                        && str_contains( $struct, '%minute%' )
+                        && str_contains( $struct, '%second%' ) )
+                ) {
                     $post = true;
-                    if ( strpos( $struct, '%pagename%' ) !== false ) {
+                    if ( str_contains( $struct, '%pagename%' ) ) {
                         $page = true;
                     }
@@ -1075 +1080 @@
                     // For custom post types, we need to add on endpoints as well.
                     foreach ( get_post_types( array( '_builtin' => false ) ) as $ptype ) {
-                        if ( strpos( $struct, "%$ptype%" ) !== false ) {
+                        if ( str_contains( $struct, "%$ptype%" ) ) {
                             $post = true;
 
@@ -1556 +1561 @@
                 $match = str_replace( '.+?', '.+', $match );
 
-                if ( strpos( $query, $this->index ) !== false ) {
+                if ( str_contains( $query, $this->index ) ) {
                     $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
                 } else {

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -6991 +6991 @@
 
         foreach ( $p as $para ) {
-            if ( strpos( $para, $pagelinkedto ) !== false ) { // It exists, but is it a link?
+            if ( str_contains( $para, $pagelinkedto ) ) { // It exists, but is it a link?
                 preg_match( '|<a[^>]+?' . $preg_target . '[^>]*>([^>]+?)</a>|', $para, $context );
 

trunk/src/wp-includes/formatting.php

@@ -1020 +1020 @@
 
     // Don't bother if there are no entities - saves a lot of processing.
-    if ( strpos( $text, '&' ) === false ) {
+    if ( ! str_contains( $text, '&' ) ) {
         return $text;
     }
@@ -2475 +2475 @@
     }
 
-    if ( strpos( $content, '&' ) !== false ) {
+    if ( str_contains( $content, '&' ) ) {
         $content = preg_replace( '/&([^#])(?![a-z1-4]{1,8};)/i', '&$1', $content );
     }
@@ -2526 +2526 @@
     );
 
-    if ( strpos( $content, '&#1' ) !== false ) {
+    if ( str_contains( $content, '&#1' ) ) {
         $content = strtr( $content, $wp_htmltranswinuni );
     }
@@ -5582 +5582 @@
     $filtered = wp_check_invalid_utf8( $str );
 
-    if ( strpos( $filtered, '<' ) !== false ) {
+    if ( str_contains( $filtered, '<' ) ) {
         $filtered = wp_pre_kses_less_than( $filtered );
         // This will strip extra whitespace for us.
@@ -6067 +6067 @@
 
     foreach ( $headers as $header ) {
-        if ( strpos( $header, ':' ) === false ) {
+        if ( ! str_contains( $header, ':' ) ) {
             continue;
         }
@@ -6079 +6079 @@
 
         if ( 'content-type' === strtolower( $name ) ) {
-            if ( strpos( $content, ';' ) !== false ) {
+            if ( str_contains( $content, ';' ) ) {
                 list( $type, $charset ) = explode( ';', $content );
                 $content_type           = trim( $type );

trunk/src/wp-includes/functions.php

@@ -6105 +6105 @@
 
         // The request is for the admin.
-        if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false || str_contains( $_SERVER['REQUEST_URI'], 'wp-login.php' ) ) {
+        if ( str_contains( $_SERVER['REQUEST_URI'], 'wp-admin' ) || str_contains( $_SERVER['REQUEST_URI'], 'wp-login.php' ) ) {
             $path = preg_replace( '#/(wp-admin/?.*|wp-login\.php.*)#i', '', $_SERVER['REQUEST_URI'] );
 

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

@@ -908 +908 @@
 
     $url = true;
-    if ( strpos( $show, 'url' ) === false &&
-        strpos( $show, 'directory' ) === false &&
-        strpos( $show, 'home' ) === false ) {
+
+    if ( ! str_contains( $show, 'url' )
+        && ! str_contains( $show, 'directory' )
+        && ! str_contains( $show, 'home' )
+    ) {
         $url = false;
     }
@@ -3739 +3741 @@
                 $wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && (int) $match[1] >= 534 );
             } elseif ( $is_IE ) {
-                $wp_rich_edit = ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Trident/7.0;' ) !== false );
+                $wp_rich_edit = str_contains( $_SERVER['HTTP_USER_AGENT'], 'Trident/7.0;' );
             } elseif ( $is_gecko || $is_chrome || $is_edge || ( $is_opera && ! wp_is_mobile() ) ) {
                 $wp_rich_edit = true;

trunk/src/wp-includes/load.php

@@ -74 +74 @@
 
     // Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests.
-    if ( isset( $_SERVER['SCRIPT_FILENAME'] )
-        && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) === strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 )
-    ) {
+    if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && str_ends_with( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) ) {
         $_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
     }
 
     // Fix for Dreamhost and other PHP as CGI hosts.
-    if ( isset( $_SERVER['SCRIPT_NAME'] ) && ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false ) ) {
+    if ( isset( $_SERVER['SCRIPT_NAME'] ) && str_contains( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) ) {
         unset( $_SERVER['PATH_INFO'] );
     }

trunk/src/wp-includes/media.php

@@ -4060 +4060 @@
      * See #29602.
      */
-    if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
-        strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
-
+    if ( wp_is_mobile()
+        && str_contains( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' )
+        && str_contains( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' )
+    ) {
         $defaults['multi_selection'] = false;
     }

trunk/src/wp-includes/rest-api/class-wp-rest-server.php

@@ -1539 +1539 @@
 
             // For non-variable routes, generate links.
-            if ( strpos( $route, '{' ) === false ) {
+            if ( ! str_contains( $route, '{' ) ) {
                 $data['_links'] = array(
                     'self' => array(

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

@@ -1112 +1112 @@
             $value = trim( $value );
 
-            if ( strpos( $value, ';' ) === false ) {
+            if ( ! str_contains( $value, ';' ) ) {
                 continue;
             }
@@ -1122 +1122 @@
 
             foreach ( $attr_parts as $part ) {
-                if ( strpos( $part, '=' ) === false ) {
+                if ( ! str_contains( $part, '=' ) ) {
                     continue;
                 }