Changeset 56032

Timestamp:

06/26/2023 10:42:54 AM (15 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Use str_contains() in a few more places.

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 [55988], [56021], [56031].

See #58206.

Location:

trunk/src/wp-includes

Files:

• default-constants.php (modified) (1 diff)
• load.php (modified) (2 diffs)

trunk/src/wp-includes/default-constants.php

@@ -106 +106 @@
     if ( ! defined( 'SCRIPT_DEBUG' ) ) {
         if ( ! empty( $wp_version ) ) {
-            $develop_src = false !== strpos( $wp_version, '-src' );
+            $develop_src = str_contains( $wp_version, '-src' );
         } else {
             $develop_src = false;

trunk/src/wp-includes/load.php

@@ -1506 +1506 @@
     $bytes = (int) $value;
 
-    if ( false !== strpos( $value, 'g' ) ) {
+    if ( str_contains( $value, 'g' ) ) {
         $bytes *= GB_IN_BYTES;
-    } elseif ( false !== strpos( $value, 'm' ) ) {
+    } elseif ( str_contains( $value, 'm' ) ) {
         $bytes *= MB_IN_BYTES;
-    } elseif ( false !== strpos( $value, 'k' ) ) {
+    } elseif ( str_contains( $value, 'k' ) ) {
         $bytes *= KB_IN_BYTES;
     }
@@ -1789 +1789 @@
     if ( isset( $_SERVER['HTTP_ACCEPT'] ) ) {
         foreach ( $accepted as $type ) {
-            if ( false !== strpos( $_SERVER['HTTP_ACCEPT'], $type ) ) {
+            if ( str_contains( $_SERVER['HTTP_ACCEPT'], $type ) ) {
                 return true;
             }