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

trunk/src/wp-includes/pluggable.php

@@ -280 +280 @@
                 // Iterate through the raw headers.
                 foreach ( (array) $tempheaders as $header ) {
-                    if ( strpos( $header, ':' ) === false ) {
+                    if ( ! str_contains( $header, ':' ) ) {
                         if ( false !== stripos( $header, 'boundary=' ) ) {
                             $parts    = preg_split( '/boundary=/i', trim( $header ) );
@@ -316 +316 @@
                             break;
                         case 'content-type':
-                            if ( strpos( $content, ';' ) !== false ) {
+                            if ( str_contains( $content, ';' ) ) {
                                 list( $type, $charset_content ) = explode( ';', $content );
                                 $content_type                   = trim( $type );
@@ -1187 +1187 @@
 
         // If https is required and request is http, redirect.
-        if ( $secure && ! is_ssl() && false !== strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
+        if ( $secure && ! is_ssl() && str_contains( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
             if ( str_starts_with( $_SERVER['REQUEST_URI'], 'http' ) ) {
                 wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
@@ -1218 +1218 @@
 
             // If the user wants ssl but the session is not ssl, redirect.
-            if ( ! $secure && get_user_option( 'use_ssl', $user_id ) && false !== strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
+            if ( ! $secure && get_user_option( 'use_ssl', $user_id ) && str_contains( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
                 if ( str_starts_with( $_SERVER['REQUEST_URI'], 'http' ) ) {
                     wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );