Changeset 55703 for trunk/src/wp-includes/functions.php

Timestamp:

05/02/2023 03:43:03 PM (18 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Replace usage of strpos() with str_starts_with().

str_starts_with() was introduced in PHP 8.0 to perform a case-sensitive check indicating if the string to search in (haystack) begins with the given substring (needle).

WordPress core includes a polyfill for str_starts_with() on PHP < 8.0 as of WordPress 5.9.

This commit replaces 0 === strpos( ... ) with str_starts_with() in core files, making the code more readable and consistent, as well as improving performance.

While strpos() is slightly faster than the polyfill on PHP < 8.0, str_starts_with() is noticeably faster on PHP 8.0+, as it is optimized to avoid unnecessarily searching along the whole haystack if it does not find the needle.

Follow-up to [52039], [52040], [52326].

Props spacedmonkey, costdev, sabernhardt, mukesh27, desrosj, jorbin, TobiasBg, ayeshrajans, lgadzhev, SergeyBiryukov.
Fixes #58012.

File:

• trunk/src/wp-includes/functions.php (modified) (9 diffs)

trunk/src/wp-includes/functions.php

@@ -2379 +2379 @@
         } else {
             if ( ! wp_mkdir_p( $path ) ) {
-                if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
+                if ( str_starts_with( $uploads['basedir'], ABSPATH ) ) {
                     $error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
                 } else {
@@ -2414 +2414 @@
     if ( empty( $upload_path ) || 'wp-content/uploads' === $upload_path ) {
         $dir = WP_CONTENT_DIR . '/uploads';
-    } elseif ( 0 !== strpos( $upload_path, ABSPATH ) ) {
+    } elseif ( ! str_starts_with( $upload_path, ABSPATH ) ) {
         // $dir is absolute, $upload_path is (maybe) relative to ABSPATH.
         $dir = path_join( ABSPATH, $upload_path );
@@ -2576 +2576 @@
         $mime_type = $file_type['type'];
 
-        $is_image    = ( ! empty( $mime_type ) && 0 === strpos( $mime_type, 'image/' ) );
+        $is_image    = ( ! empty( $mime_type ) && str_starts_with( $mime_type, 'image/' ) );
         $upload_dir  = wp_get_upload_dir();
         $lc_filename = null;
@@ -2914 +2914 @@
     $new_file = $upload['path'] . "/$filename";
     if ( ! wp_mkdir_p( dirname( $new_file ) ) ) {
-        if ( 0 === strpos( $upload['basedir'], ABSPATH ) ) {
+        if ( str_starts_with( $upload['basedir'], ABSPATH ) ) {
             $error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
         } else {
@@ -3083 +3083 @@
 
     // Validate image types.
-    if ( $type && 0 === strpos( $type, 'image/' ) ) {
+    if ( $type && str_starts_with( $type, 'image/' ) ) {
 
         // Attempt to figure out what type of image it actually is.
@@ -3154 +3154 @@
                 $ext  = false;
             }
-        } elseif ( 0 === strpos( $real_mime, 'video/' ) || 0 === strpos( $real_mime, 'audio/' ) ) {
+        } elseif ( str_starts_with( $real_mime, 'video/' ) || str_starts_with( $real_mime, 'audio/' ) ) {
             /*
              * For these types, only the major type must match the real value.
@@ -3312 +3312 @@
         if (
             // RIFF.
-            ( 0 === strpos( $magic, '52494646' ) ) &&
+            ( str_starts_with( $magic, '52494646' ) ) &&
             // WEBP.
             ( 16 === strpos( $magic, '57454250' ) )
@@ -7184 +7184 @@
     $login_url      = wp_login_url();
     $current_domain = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'];
-    $same_domain    = ( strpos( $login_url, $current_domain ) === 0 );
+    $same_domain    = str_starts_with( $login_url, $current_domain );
 
     /**
@@ -7432 +7432 @@
     }
 
-    if ( false === $real_file || false === $real_directory || strpos( $real_file, trailingslashit( $real_directory ) ) !== 0 ) {
+    if ( false === $real_file || false === $real_directory || ! str_starts_with( $real_file, trailingslashit( $real_directory ) ) ) {
         return false;
     }