Changeset 55988 for trunk/src/wp-includes/shortcodes.php

Timestamp:

06/22/2023 02:34:56 PM (3 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/shortcodes.php (modified) (5 diffs)

trunk/src/wp-includes/shortcodes.php

@@ -148 +148 @@
  */
 function has_shortcode( $content, $tag ) {
-    if ( false === strpos( $content, '[' ) ) {
+    if ( ! str_contains( $content, '[' ) ) {
         return false;
     }
@@ -206 +206 @@
     global $shortcode_tags;
 
-    if ( false === strpos( $content, '[' ) ) {
+    if ( ! str_contains( $content, '[' ) ) {
         return $content;
     }
@@ -413 +413 @@
         }
 
-        $noopen  = false === strpos( $element, '[' );
-        $noclose = false === strpos( $element, ']' );
+        $noopen  = ! str_contains( $element, '[' );
+        $noclose = ! str_contains( $element, ']' );
         if ( $noopen || $noclose ) {
             // This element does not contain shortcodes.
@@ -560 +560 @@
         // Reject any unclosed HTML elements.
         foreach ( $atts as &$value ) {
-            if ( false !== strpos( $value, '<' ) ) {
+            if ( str_contains( $value, '<' ) ) {
                 if ( 1 !== preg_match( '/^[^<]*+(?:<[^>]*+>[^<]*+)*+$/', $value ) ) {
                     $value = '';
@@ -635 +635 @@
     global $shortcode_tags;
 
-    if ( false === strpos( $content, '[' ) ) {
+    if ( ! str_contains( $content, '[' ) ) {
         return $content;
     }