Changeset 56245

Timestamp:

07/17/2023 01:16:14 PM (3 years 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], [55990], [56014], [56021], [56031], [56032], [56065], [56241].

See #58206.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/theme.php (modified) (1 diff)
• wp-includes/canonical.php (modified) (1 diff)
• wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)
• wp-includes/load.php (modified) (5 diffs)
• wp-includes/media.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)

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

@@ -3854 +3854 @@
         );
 
-        if ( strpos( $parsed, 'class="wp-embedded-content' ) ) {
+        if ( str_contains( $parsed, 'class="wp-embedded-content' ) ) {
                 if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
                         $script_src = includes_url( 'js/wp-embed.js' );

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

@@ -1168 +1168 @@
         if ( ! empty( $redirect ) ) {
                 $functions_path = '';
-                if ( strpos( STYLESHEETPATH, $extension ) ) {
+                if ( str_contains( STYLESHEETPATH, $extension ) ) {
                         $functions_path = STYLESHEETPATH . '/functions.php';
-                } elseif ( strpos( TEMPLATEPATH, $extension ) ) {
+                } elseif ( str_contains( TEMPLATEPATH, $extension ) ) {
                         $functions_path = TEMPLATEPATH . '/functions.php';
                 }

trunk/src/wp-includes/canonical.php

@@ -680 +680 @@
 
         // Strip multiple slashes out of the URL.
-        if ( strpos( $redirect['path'], '//' ) > -1 ) {
+        if ( str_contains( $redirect['path'], '//' ) ) {
                 $redirect['path'] = preg_replace( '|/+|', '/', $redirect['path'] );
         }

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

@@ -4887 +4887 @@
                 } else {
                         foreach ( (array) $blogs as $blog ) {
-                                if ( strpos( $blog['url'], $_SERVER['HTTP_HOST'] ) ) {
+                                if ( str_contains( $blog['url'], $_SERVER['HTTP_HOST'] ) ) {
                                         return array( $blog );
                                 }

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

@@ -4439 +4439 @@
                 $user = get_user_by( 'id', absint( $id_or_email ) );
         } elseif ( is_string( $id_or_email ) ) {
-                if ( strpos( $id_or_email, '@md5.gravatar.com' ) ) {
+                if ( str_contains( $id_or_email, '@md5.gravatar.com' ) ) {
                         // MD5 hash.
                         list( $email_hash ) = explode( '@', $id_or_email );

trunk/src/wp-includes/load.php

@@ -76 +76 @@
 
         // 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'] );
         }
@@ -938 +936 @@
 
         while ( ( $plugin = readdir( $dh ) ) !== false ) {
-                if ( '.php' === substr( $plugin, -4 ) ) {
+                if ( str_ends_with( $plugin, '.php' ) ) {
                         $mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
                 }
@@ -982 +980 @@
         foreach ( $active_plugins as $plugin ) {
                 if ( ! validate_file( $plugin )                     // $plugin must validate as file.
-                        && '.php' === substr( $plugin, -4 )             // $plugin must end with '.php'.
+                        && str_ends_with( $plugin, '.php' )             // $plugin must end with '.php'.
                         && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist.
                         // Not already included as a network plugin.
@@ -1618 +1616 @@
         $bytes = (int) $value;
 
-        if ( false !== strpos( $value, 'g' ) ) {
+        if ( str_contains( $value, 'g' ) ) {
                 $bytes *= GB_IN_BYTES;
-        } elseif ( false !== strpos( $value, 'm' ) ) {
+        } elseif ( str_contains( $value, 'm' ) ) {
                 $bytes *= MB_IN_BYTES;
-        } elseif ( false !== strpos( $value, 'k' ) ) {
+        } elseif ( str_contains( $value, 'k' ) ) {
                 $bytes *= KB_IN_BYTES;
         }
@@ -1909 +1907 @@
         if ( isset( $_SERVER['HTTP_ACCEPT'] ) ) {
                 foreach ( $accepted as $type ) {
-                        if ( false !== strpos( $_SERVER['HTTP_ACCEPT'], $type ) ) {
+                        if ( str_contains( $_SERVER['HTTP_ACCEPT'], $type ) ) {
                                 return true;
                         }

trunk/src/wp-includes/media.php

@@ -1324 +1324 @@
                         'file'   => $image_basename,
                 );
-        } elseif ( strpos( $image_src, $image_meta['file'] ) ) {
+        } elseif ( str_contains( $image_src, $image_meta['file'] ) ) {
                 return false;
         }

trunk/src/wp-includes/pluggable.php

@@ -1238 +1238 @@
                 nocache_headers();
 
-                $redirect = ( strpos( $_SERVER['REQUEST_URI'], '/options.php' ) && wp_get_referer() ) ? wp_get_referer() : set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+                if ( str_contains( $_SERVER['REQUEST_URI'], '/options.php' ) && wp_get_referer() ) {
+                        $redirect = wp_get_referer();
+                } else {
+                        $redirect = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+                }
 
                 $login_url = wp_login_url( $redirect, true );

trunk/src/wp-login.php

@@ -1363 +1363 @@
                         } elseif ( isset( $_GET['registration'] ) && 'disabled' === $_GET['registration'] ) {
                                 $errors->add( 'registerdisabled', __( '<strong>Error:</strong> User registration is currently not allowed.' ) );
-                        } elseif ( strpos( $redirect_to, 'about.php?updated' ) ) {
+                        } elseif ( str_contains( $redirect_to, 'about.php?updated' ) ) {
                                 $errors->add( 'updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
                         } elseif ( WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED === $action ) {