Changeset 55988 for trunk/src/wp-includes/rewrite.php

Timestamp:

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

trunk/src/wp-includes/rewrite.php

@@ -543 +543 @@
 
     // Add 'www.' if it is absent and should be there.
-    if ( false !== strpos( home_url(), '://www.' ) && false === strpos( $url, '://www.' ) ) {
+    if ( str_contains( home_url(), '://www.' ) && ! str_contains( $url, '://www.' ) ) {
         $url = str_replace( '://', '://www.', $url );
     }
 
     // Strip 'www.' if it is present and shouldn't be.
-    if ( false === strpos( home_url(), '://www.' ) ) {
+    if ( ! str_contains( home_url(), '://www.' ) ) {
         $url = str_replace( '://www.', '://', $url );
     }
@@ -573 +573 @@
     }
 
-    if ( false !== strpos( trailingslashit( $url ), home_url( '/' ) ) ) {
+    if ( str_contains( trailingslashit( $url ), home_url( '/' ) ) ) {
         // Chop off http://domain.com/[path].
         $url = str_replace( home_url(), '', $url );