Changeset 55988 for trunk/src/wp-includes/class-wp-query.php

Timestamp:

06/22/2023 02:34:56 PM (18 months 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/class-wp-query.php (modified) (5 diffs)

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

@@ -1016 +1016 @@
         }
 
-        if ( false !== strpos( $qv['feed'], 'comments-' ) ) {
+        if ( str_contains( $qv['feed'], 'comments-' ) ) {
             $qv['feed']         = str_replace( 'comments-', '', $qv['feed'] );
             $qv['withcomments'] = 1;
@@ -1186 +1186 @@
                 }
 
-                if ( strpos( $term, '+' ) !== false ) {
+                if ( str_contains( $term, '+' ) ) {
                     $terms = preg_split( '/[+]+/', $term );
                     foreach ( $terms as $term ) {
@@ -1299 +1299 @@
 
         if ( '' !== $q['tag'] && ! $this->is_singular && $this->query_vars_changed ) {
-            if ( strpos( $q['tag'], ',' ) !== false ) {
+            if ( str_contains( $q['tag'], ',' ) ) {
                 $tags = preg_split( '/[,\r\n\t ]+/', $q['tag'] );
                 foreach ( (array) $tags as $tag ) {
@@ -2355 +2355 @@
 
         if ( '' !== $q['author_name'] ) {
-            if ( strpos( $q['author_name'], '/' ) !== false ) {
+            if ( str_contains( $q['author_name'], '/' ) ) {
                 $q['author_name'] = explode( '/', $q['author_name'] );
                 if ( $q['author_name'][ count( $q['author_name'] ) - 1 ] ) {
@@ -4755 +4755 @@
 
         $content = $post->post_content;
-        if ( false !== strpos( $content, '<!--nextpage-->' ) ) {
+        if ( str_contains( $content, '<!--nextpage-->' ) ) {
             $content = str_replace( "\n<!--nextpage-->\n", '<!--nextpage-->', $content );
             $content = str_replace( "\n<!--nextpage-->", '<!--nextpage-->', $content );