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

Timestamp:

06/22/2023 02:34:56 PM (19 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-http.php (modified) (4 diffs)

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

@@ -722 +722 @@
          */
         for ( $i = count( $headers ) - 1; $i >= 0; $i-- ) {
-            if ( ! empty( $headers[ $i ] ) && false === strpos( $headers[ $i ], ':' ) ) {
+            if ( ! empty( $headers[ $i ] ) && ! str_contains( $headers[ $i ], ':' ) ) {
                 $headers = array_splice( $headers, $i );
                 break;
@@ -735 +735 @@
             }
 
-            if ( false === strpos( $tempheader, ':' ) ) {
+            if ( ! str_contains( $tempheader, ':' ) ) {
                 $stack   = explode( ' ', $tempheader, 3 );
                 $stack[] = '';
@@ -906 +906 @@
             $accessible_hosts = preg_split( '|,\s*|', WP_ACCESSIBLE_HOSTS );
 
-            if ( false !== strpos( WP_ACCESSIBLE_HOSTS, '*' ) ) {
+            if ( str_contains( WP_ACCESSIBLE_HOSTS, '*' ) ) {
                 $wildcard_regex = array();
                 foreach ( $accessible_hosts as $host ) {
@@ -1097 +1097 @@
         }
 
-        if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) ) {
+        if ( str_contains( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) ) {
             return 6;
         }