Changeset 55988 for trunk/src/wp-content/themes

Timestamp:

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

Location:

trunk/src/wp-content/themes

Files:

• twentyseventeen/inc/icon-functions.php (modified) (1 diff)
• twentyseventeen/template-parts/post/content-audio.php (modified) (1 diff)
• twentyseventeen/template-parts/post/content-video.php (modified) (1 diff)
• twentytwenty/comments.php (modified) (1 diff)
• twentytwenty/functions.php (modified) (1 diff)
• twentytwenty/template-parts/pagination.php (modified) (1 diff)
• twentytwentyone/inc/template-functions.php (modified) (1 diff)

trunk/src/wp-content/themes/twentyseventeen/inc/icon-functions.php

@@ -131 +131 @@
     if ( 'social' === $args->theme_location ) {
         foreach ( $social_icons as $attr => $value ) {
-            if ( false !== strpos( $item_output, $attr ) ) {
+            if ( str_contains( $item_output, $attr ) ) {
                 $item_output = str_replace( $args->link_after, '</span>' . twentyseventeen_get_svg( array( 'icon' => esc_attr( $value ) ) ), $item_output );
             }

trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php

@@ -47 +47 @@
 
         // Only get audio from the content if a playlist isn't present.
-    if ( false === strpos( $content, 'wp-playlist-script' ) ) {
+    if ( ! str_contains( $content, 'wp-playlist-script' ) ) {
         $audio = get_media_embedded_in_content( $content, array( 'audio' ) );
     }

trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php

@@ -47 +47 @@
 
         // Only get video from the content if a playlist isn't present.
-    if ( false === strpos( $content, 'wp-playlist-script' ) ) {
+    if ( ! str_contains( $content, 'wp-playlist-script' ) ) {
         $video = get_media_embedded_in_content( $content, array( 'video', 'object', 'embed', 'iframe' ) );
     }

trunk/src/wp-content/themes/twentytwenty/comments.php

@@ -81 +81 @@
 
                 // If we're only showing the "Next" link, add a class indicating so.
-                if ( false === strpos( $comment_pagination, 'prev page-numbers' ) ) {
+                if ( ! str_contains( $comment_pagination, 'prev page-numbers' ) ) {
                     $pagination_classes = ' only-next';
                 }

trunk/src/wp-content/themes/twentytwenty/functions.php

@@ -317 +317 @@
 
             // Add a style attribute with the height, or append the height to the style attribute if the style attribute already exists.
-            if ( strpos( $html, ' style=' ) === false ) {
+            if ( ! str_contains( $html, ' style=' ) ) {
                 $search[]  = '/(src=)/';
                 $replace[] = "style=\"height: {$logo_height}px;\" src=";

trunk/src/wp-content/themes/twentytwenty/template-parts/pagination.php

@@ -38 +38 @@
 
 // If we're not outputting the previous page link, prepend a placeholder with `visibility: hidden` to take its place.
-if ( strpos( $posts_pagination, 'prev page-numbers' ) === false ) {
+if ( ! str_contains( $posts_pagination, 'prev page-numbers' ) ) {
     $posts_pagination = str_replace( '<div class="nav-links">', '<div class="nav-links"><span class="prev page-numbers placeholder" aria-hidden="true">' . $prev_text . '</span>', $posts_pagination );
 }
 
 // If we're not outputting the next page link, append a placeholder with `visibility: hidden` to take its place.
-if ( strpos( $posts_pagination, 'next page-numbers' ) === false ) {
+if ( ! str_contains( $posts_pagination, 'next page-numbers' ) ) {
     $posts_pagination = str_replace( '</div>', '<span class="next page-numbers placeholder" aria-hidden="true">' . $next_text . '</span></div>', $posts_pagination );
 }

trunk/src/wp-content/themes/twentytwentyone/inc/template-functions.php

@@ -446 +446 @@
     }
 
-    if ( isset( $attr['class'] ) && false !== strpos( $attr['class'], 'custom-logo' ) ) {
+    if ( isset( $attr['class'] ) && str_contains( $attr['class'], 'custom-logo' ) ) {
         return $attr;
     }