Changeset 56031 for trunk/src/wp-includes/formatting.php

Timestamp:

06/26/2023 10:15:04 AM (22 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Use str_contains() in a few more places.

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 [55988], [56021].

See #58206.

File:

• trunk/src/wp-includes/formatting.php (modified) (6 diffs)

trunk/src/wp-includes/formatting.php

@@ -1020 +1020 @@
 
     // Don't bother if there are no entities - saves a lot of processing.
-    if ( strpos( $text, '&' ) === false ) {
+    if ( ! str_contains( $text, '&' ) ) {
         return $text;
     }
@@ -2475 +2475 @@
     }
 
-    if ( strpos( $content, '&' ) !== false ) {
+    if ( str_contains( $content, '&' ) ) {
         $content = preg_replace( '/&([^#])(?![a-z1-4]{1,8};)/i', '&$1', $content );
     }
@@ -2526 +2526 @@
     );
 
-    if ( strpos( $content, '&#1' ) !== false ) {
+    if ( str_contains( $content, '&#1' ) ) {
         $content = strtr( $content, $wp_htmltranswinuni );
     }
@@ -5582 +5582 @@
     $filtered = wp_check_invalid_utf8( $str );
 
-    if ( strpos( $filtered, '<' ) !== false ) {
+    if ( str_contains( $filtered, '<' ) ) {
         $filtered = wp_pre_kses_less_than( $filtered );
         // This will strip extra whitespace for us.
@@ -6067 +6067 @@
 
     foreach ( $headers as $header ) {
-        if ( strpos( $header, ':' ) === false ) {
+        if ( ! str_contains( $header, ':' ) ) {
             continue;
         }
@@ -6079 +6079 @@
 
         if ( 'content-type' === strtolower( $name ) ) {
-            if ( strpos( $content, ';' ) !== false ) {
+            if ( str_contains( $content, ';' ) ) {
                 list( $type, $charset ) = explode( ';', $content );
                 $content_type           = trim( $type );