Changeset 55988 for trunk/src/wp-includes/class-wp.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/class-wp.php (modified) (3 diffs)

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

@@ -275 +275 @@
 
             // If req_uri is empty or if it is a request for ourself, unset error.
-            if ( empty( $requested_path ) || $requested_file == $self || strpos( $_SERVER['PHP_SELF'], 'wp-admin/' ) !== false ) {
+            if ( empty( $requested_path ) || $requested_file == $self || str_contains( $_SERVER['PHP_SELF'], 'wp-admin/' ) ) {
                 unset( $error, $_GET['error'] );
 
-                if ( isset( $perma_query_vars ) && strpos( $_SERVER['PHP_SELF'], 'wp-admin/' ) !== false ) {
+                if ( isset( $perma_query_vars ) && str_contains( $_SERVER['PHP_SELF'], 'wp-admin/' ) ) {
                     unset( $perma_query_vars );
                 }
@@ -456 +456 @@
             // We're showing a feed, so WP is indeed the only thing that last changed.
             if ( ! empty( $this->query_vars['withcomments'] )
-                || false !== strpos( $this->query_vars['feed'], 'comments-' )
+                || str_contains( $this->query_vars['feed'], 'comments-' )
                 || ( empty( $this->query_vars['withoutcomments'] )
                     && ( ! empty( $this->query_vars['p'] )
@@ -721 +721 @@
                 if ( $post && ! empty( $this->query_vars['page'] ) ) {
                     // Check if content is actually intended to be paged.
-                    if ( false !== strpos( $post->post_content, $next ) ) {
+                    if ( str_contains( $post->post_content, $next ) ) {
                         $page          = trim( $this->query_vars['page'], '/' );
                         $content_found = (int) $page <= ( substr_count( $post->post_content, $next ) + 1 );