Changeset 55988 for trunk/src/wp-admin/includes/misc.php

Timestamp:

06/22/2023 02:34:56 PM (15 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:

• trunk/src/wp-admin/includes/misc.php (modified) (3 diffs)

trunk/src/wp-admin/includes/misc.php

@@ -77 +77 @@
 
     foreach ( $markerdata as $markerline ) {
-        if ( false !== strpos( $markerline, '# END ' . $marker ) ) {
+        if ( str_contains( $markerline, '# END ' . $marker ) ) {
             $state = false;
         }
@@ -89 +89 @@
         }
 
-        if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
+        if ( str_contains( $markerline, '# BEGIN ' . $marker ) ) {
             $state = true;
         }
@@ -195 +195 @@
 
     foreach ( $lines as $line ) {
-        if ( ! $found_marker && false !== strpos( $line, $start_marker ) ) {
+        if ( ! $found_marker && str_contains( $line, $start_marker ) ) {
             $found_marker = true;
             continue;
-        } elseif ( ! $found_end_marker && false !== strpos( $line, $end_marker ) ) {
+        } elseif ( ! $found_end_marker && str_contains( $line, $end_marker ) ) {
             $found_end_marker = true;
             continue;