Changeset 55988 for trunk/src/wp-includes/comment-template.php

Timestamp:

06/22/2023 02:34:56 PM (2 years 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-includes/comment-template.php (modified) (3 diffs)

trunk/src/wp-includes/comment-template.php

@@ -971 +971 @@
 
                 // Replace '% Comments' with a proper plural form.
-                if ( $text && ! preg_match( '/[0-9]+/', $text ) && false !== strpos( $more, '%' ) ) {
+                if ( $text && ! preg_match( '/[0-9]+/', $text ) && str_contains( $more, '%' ) ) {
                     /* translators: %s: Number of comments. */
                     $new_text = _n( '%s Comment', '%s Comments', $comments_number );
@@ -977 +977 @@
 
                     $more = str_replace( $text, $new_text, $more );
-                    if ( false === strpos( $more, '%' ) ) {
+                    if ( ! str_contains( $more, '%' ) ) {
                         $more = '% ' . $more;
                     }
@@ -2652 +2652 @@
 
     // Remove `aria-describedby` from the email field if there's no associated description.
-    if ( isset( $args['fields']['email'] ) && false === strpos( $args['comment_notes_before'], 'id="email-notes"' ) ) {
+    if ( isset( $args['fields']['email'] ) && ! str_contains( $args['comment_notes_before'], 'id="email-notes"' ) ) {
         $args['fields']['email'] = str_replace(
             ' aria-describedby="email-notes"',