Make WordPress Core


Ignore:
Timestamp:
06/22/2023 02:34:56 PM (12 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/misc.php

    r55276 r55988  
    7777
    7878    foreach ( $markerdata as $markerline ) {
    79         if ( false !== strpos( $markerline, '# END ' . $marker ) ) {
     79        if ( str_contains( $markerline, '# END ' . $marker ) ) {
    8080            $state = false;
    8181        }
     
    8989        }
    9090
    91         if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
     91        if ( str_contains( $markerline, '# BEGIN ' . $marker ) ) {
    9292            $state = true;
    9393        }
     
    195195
    196196    foreach ( $lines as $line ) {
    197         if ( ! $found_marker && false !== strpos( $line, $start_marker ) ) {
     197        if ( ! $found_marker && str_contains( $line, $start_marker ) ) {
    198198            $found_marker = true;
    199199            continue;
    200         } elseif ( ! $found_end_marker && false !== strpos( $line, $end_marker ) ) {
     200        } elseif ( ! $found_end_marker && str_contains( $line, $end_marker ) ) {
    201201            $found_end_marker = true;
    202202            continue;
Note: See TracChangeset for help on using the changeset viewer.