Skip to content

Commit 4cb3e15

Browse files
SergeyBiryukovSergeyBiryukov
committed
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. git-svn-id: https://develop.svn.wordpress.org/trunk@55703 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 73dbbe5 commit 4cb3e15

54 files changed

Lines changed: 105 additions & 105 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/wp-admin/includes/ajax-actions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3749,7 +3749,7 @@ function wp_ajax_parse_embed() {
37493749
$wp_embed->usecache = false;
37503750
}
37513751

3752-
if ( is_ssl() && 0 === strpos( $url, 'http://' ) ) {
3752+
if ( is_ssl() && str_starts_with( $url, 'http://' ) ) {
37533753
// Admin is ssl and the user pasted non-ssl URL.
37543754
// Check if the provider supports ssl embeds and use that for the preview.
37553755
$ssl_shortcode = preg_replace( '%^(\\[embed[^\\]]*\\])http://%i', '$1https://', $shortcode );

‎src/wp-admin/includes/class-file-upload-upgrader.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function __construct( $form, $urlholder ) {
108108
$this->filename = sanitize_file_name( $_GET[ $urlholder ] );
109109
$this->package = $uploads['basedir'] . '/' . $this->filename;
110110

111-
if ( 0 !== strpos( realpath( $this->package ), realpath( $uploads['basedir'] ) ) ) {
111+
if ( ! str_starts_with( realpath( $this->package ), realpath( $uploads['basedir'] ) ) ) {
112112
wp_die( __( 'Please select a file' ) );
113113
}
114114
}

‎src/wp-admin/includes/class-wp-media-list-table.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ protected function get_views() {
140140
}
141141

142142
$selected = selected(
143-
$filter && 0 === strpos( $filter, 'post_mime_type:' ) &&
143+
$filter && str_starts_with( $filter, 'post_mime_type:' ) &&
144144
wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $filter ) ),
145145
true,
146146
false
@@ -652,7 +652,7 @@ public function column_default( $item, $column_name ) {
652652
$taxonomy = 'category';
653653
} elseif ( 'tags' === $column_name ) {
654654
$taxonomy = 'post_tag';
655-
} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
655+
} elseif ( str_starts_with( $column_name, 'taxonomy-' ) ) {
656656
$taxonomy = substr( $column_name, 9 );
657657
} else {
658658
$taxonomy = false;

‎src/wp-admin/includes/class-wp-posts-list-table.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,7 @@ public function column_default( $item, $column_name ) {
12711271
$taxonomy = 'category';
12721272
} elseif ( 'tags' === $column_name ) {
12731273
$taxonomy = 'post_tag';
1274-
} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
1274+
} elseif ( str_starts_with( $column_name, 'taxonomy-' ) ) {
12751275
$taxonomy = substr( $column_name, 9 );
12761276
} else {
12771277
$taxonomy = false;

‎src/wp-admin/includes/class-wp-privacy-policy-content.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -656,11 +656,11 @@ public static function get_default_content( $description = false, $blocks = true
656656

657657
if ( $blocks ) {
658658
foreach ( $strings as $key => $string ) {
659-
if ( 0 === strpos( $string, '<p>' ) ) {
659+
if ( str_starts_with( $string, '<p>' ) ) {
660660
$strings[ $key ] = '<!-- wp:paragraph -->' . $string . '<!-- /wp:paragraph -->';
661661
}
662662

663-
if ( 0 === strpos( $string, '<h2>' ) ) {
663+
if ( str_starts_with( $string, '<h2>' ) ) {
664664
$strings[ $key ] = '<!-- wp:heading -->' . $string . '<!-- /wp:heading -->';
665665
}
666666
}

‎src/wp-admin/includes/class-wp-site-health.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1508,7 +1508,7 @@ public function get_test_is_in_debug_mode() {
15081508
if ( defined( 'WP_DEBUG_LOG' ) && WP_DEBUG_LOG ) {
15091509
$result['label'] = __( 'Your site is set to log errors to a potentially public file' );
15101510

1511-
$result['status'] = ( 0 === strpos( ini_get( 'error_log' ), ABSPATH ) ) ? 'critical' : 'recommended';
1511+
$result['status'] = str_starts_with( ini_get( 'error_log' ), ABSPATH ) ? 'critical' : 'recommended';
15121512

15131513
$result['description'] .= sprintf(
15141514
'<p>%s</p>',

‎src/wp-admin/includes/credits.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function wp_credits( $version = '', $locale = '' ) {
3333

3434
if ( ! is_array( $results )
3535
|| false !== strpos( $version, '-' )
36-
|| ( isset( $results['data']['version'] ) && strpos( $version, $results['data']['version'] ) !== 0 )
36+
|| ( isset( $results['data']['version'] ) && ! str_starts_with( $version, $results['data']['version'] ) )
3737
) {
3838
$url = "http://api.wordpress.org/core/credits/1.1/?version={$version}&locale={$locale}";
3939
$options = array( 'user-agent' => 'WordPress/' . $version . '; ' . home_url( '/' ) );

‎src/wp-admin/includes/file.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ function wp_handle_upload_error( &$file, $message ) {
997997
}
998998

999999
if ( false === $move_new_file ) {
1000-
if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
1000+
if ( str_starts_with( $uploads['basedir'], ABSPATH ) ) {
10011001
$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
10021002
} else {
10031003
$error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
@@ -1196,7 +1196,7 @@ function download_url( $url, $timeout = 300, $signature_verification = false ) {
11961196
if ( $content_disposition ) {
11971197
$content_disposition = strtolower( $content_disposition );
11981198

1199-
if ( 0 === strpos( $content_disposition, 'attachment; filename=' ) ) {
1199+
if ( str_starts_with( $content_disposition, 'attachment; filename=' ) ) {
12001200
$tmpfname_disposition = sanitize_file_name( substr( $content_disposition, 21 ) );
12011201
} else {
12021202
$tmpfname_disposition = '';
@@ -1937,7 +1937,7 @@ function copy_dir( $from, $to, $skip_list = array() ) {
19371937
$sub_skip_list = array();
19381938

19391939
foreach ( $skip_list as $skip_item ) {
1940-
if ( 0 === strpos( $skip_item, $filename . '/' ) ) {
1940+
if ( str_starts_with( $skip_item, $filename . '/' ) ) {
19411941
$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
19421942
}
19431943
}

‎src/wp-admin/includes/media.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrid
385385
}
386386

387387
// Use image exif/iptc data for title and caption defaults if possible.
388-
} elseif ( 0 === strpos( $type, 'image/' ) ) {
388+
} elseif ( str_starts_with( $type, 'image/' ) ) {
389389
$image_meta = wp_read_image_metadata( $file );
390390

391391
if ( $image_meta ) {
@@ -534,8 +534,8 @@ function wp_iframe( $content_func, ...$args ) {
534534
wp_enqueue_style( 'colors' );
535535
// Check callback name for 'media'.
536536
if (
537-
( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) ) ||
538-
( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) )
537+
( is_array( $content_func ) && ! empty( $content_func[1] ) && str_starts_with( (string) $content_func[1], 'media' ) ) ||
538+
( ! is_array( $content_func ) && str_starts_with( $content_func, 'media' ) )
539539
) {
540540
wp_enqueue_style( 'deprecated-media' );
541541
}
@@ -3507,7 +3507,7 @@ function wp_add_id3_tag_data( &$metadata, $data ) {
35073507
if ( 'length' !== $key && ! empty( $list ) ) {
35083508
$metadata[ $key ] = wp_kses_post( reset( $list ) );
35093509
// Fix bug in byte stream analysis.
3510-
if ( 'terms_of_use' === $key && 0 === strpos( $metadata[ $key ], 'yright notice.' ) ) {
3510+
if ( 'terms_of_use' === $key && str_starts_with( $metadata[ $key ], 'yright notice.' ) ) {
35113511
$metadata[ $key ] = 'Cop' . $metadata[ $key ];
35123512
}
35133513
}

‎src/wp-admin/includes/menu.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ function add_menu_classes( $menu ) {
228228
continue;
229229
}
230230

231-
if ( 0 === strpos( $top[2], 'separator' ) && false !== $last_order ) { // If separator.
231+
if ( str_starts_with( $top[2], 'separator' ) && false !== $last_order ) { // If separator.
232232
$first_item = true;
233233
$classes = $menu[ $last_order ][4];
234234
$menu[ $last_order ][4] = add_cssclass( 'menu-top-last', $classes );

0 commit comments

Comments
 (0)