Changeset 56245 for trunk/src/wp-includes/load.php

Timestamp:

07/17/2023 01:16:14 PM (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], [55990], [56014], [56021], [56031], [56032], [56065], [56241].

See #58206.

File:

• trunk/src/wp-includes/load.php (modified) (5 diffs)

trunk/src/wp-includes/load.php

@@ -76 +76 @@
 
     // Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests.
-    if ( isset( $_SERVER['SCRIPT_FILENAME'] )
-        && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) === strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 )
-    ) {
+    if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && str_ends_with( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) ) {
         $_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
     }
 
     // Fix for Dreamhost and other PHP as CGI hosts.
-    if ( isset( $_SERVER['SCRIPT_NAME'] ) && ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false ) ) {
+    if ( isset( $_SERVER['SCRIPT_NAME'] ) && str_contains( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) ) {
         unset( $_SERVER['PATH_INFO'] );
     }
@@ -938 +936 @@
 
     while ( ( $plugin = readdir( $dh ) ) !== false ) {
-        if ( '.php' === substr( $plugin, -4 ) ) {
+        if ( str_ends_with( $plugin, '.php' ) ) {
             $mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
         }
@@ -982 +980 @@
     foreach ( $active_plugins as $plugin ) {
         if ( ! validate_file( $plugin )                     // $plugin must validate as file.
-            && '.php' === substr( $plugin, -4 )             // $plugin must end with '.php'.
+            && str_ends_with( $plugin, '.php' )             // $plugin must end with '.php'.
             && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist.
             // Not already included as a network plugin.
@@ -1618 +1616 @@
     $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;
     }
@@ -1909 +1907 @@
     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;
             }