Make WordPress Core


Ignore:
Timestamp:
06/22/2023 02:34:56 PM (9 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/class-core-upgrader.php

    r55911 r55988  
    182182                 * do_rollback allows for update_core() to trigger a rollback if needed.
    183183                 */
    184                 if ( false !== strpos( $error_code, 'do_rollback' ) ) {
     184                if ( str_contains( $error_code, 'do_rollback' ) ) {
    185185                    $try_rollback = true;
    186                 } elseif ( false !== strpos( $error_code, '__copy_dir' ) ) {
     186                } elseif ( str_contains( $error_code, '__copy_dir' ) ) {
    187187                    $try_rollback = true;
    188188                } elseif ( 'disk_full' === $error_code ) {
     
    324324
    325325            // Don't claim we can update on update-core.php if we have a non-critical failure logged.
    326             if ( $wp_version === $failure_data['current'] && false !== strpos( $offered_ver, '.1.next.minor' ) ) {
     326            if ( $wp_version === $failure_data['current'] && str_contains( $offered_ver, '.1.next.minor' ) ) {
    327327                return false;
    328328            }
Note: See TracChangeset for help on using the changeset viewer.