Changeset 55988 for trunk/src/wp-includes/https-detection.php

Timestamp:

06/22/2023 02:34:56 PM (15 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/https-detection.php (modified) (2 diffs)

trunk/src/wp-includes/https-detection.php

@@ -206 +206 @@
     if ( has_action( 'wp_head', 'rsd_link' ) ) {
         $pattern = preg_replace( '#^https?:(?=//)#', '', esc_url( site_url( 'xmlrpc.php?rsd', 'rpc' ) ) ); // See rsd_link().
-        return false !== strpos( $html, $pattern );
+        return str_contains( $html, $pattern );
     }
 
@@ -213 +213 @@
         // Try both HTTPS and HTTP since the URL depends on context.
         $pattern = preg_replace( '#^https?:(?=//)#', '', esc_url( get_rest_url() ) ); // See rest_output_link_wp_head().
-        return false !== strpos( $html, $pattern );
+        return str_contains( $html, $pattern );
     }