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

trunk/src/wp-includes/canonical.php

@@ -390 +390 @@
                 }
             }
-        } elseif ( is_single() && strpos( $wp_rewrite->permalink_structure, '%category%' ) !== false ) {
+        } elseif ( is_single() && str_contains( $wp_rewrite->permalink_structure, '%category%' ) ) {
             $category_name = get_query_var( 'category_name' );
 
@@ -519 +519 @@
             if ( ! empty( $addl_path )
                 && $wp_rewrite->using_index_permalinks()
-                && strpos( $redirect['path'], '/' . $wp_rewrite->index . '/' ) === false
+                && ! str_contains( $redirect['path'], '/' . $wp_rewrite->index . '/' )
             ) {
                 $redirect['path'] = trailingslashit( $redirect['path'] ) . $wp_rewrite->index . '/';
@@ -738 +738 @@
 
     // Hex-encoded octets are case-insensitive.
-    if ( false !== strpos( $requested_url, '%' ) ) {
+    if ( str_contains( $requested_url, '%' ) ) {
         if ( ! function_exists( 'lowercase_octets' ) ) {
             /**