Changeset 55988 for trunk/src/wp-includes/general-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/general-template.php (modified) (4 diffs)

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

@@ -4022 +4022 @@
             $type = 'text/x-diff';
         }
-    } elseif ( isset( $args['file'] ) && false !== strpos( basename( $args['file'] ), '.' ) ) {
+    } elseif ( isset( $args['file'] ) && str_contains( basename( $args['file'] ), '.' ) ) {
         $extension = strtolower( pathinfo( $args['file'], PATHINFO_EXTENSION ) );
         foreach ( wp_get_mime_types() as $exts => $mime ) {
@@ -4158 +4158 @@
             )
         );
-    } elseif ( false !== strpos( $type, 'json' ) ) {
+    } elseif ( str_contains( $type, 'json' ) ) {
         $settings['codemirror'] = array_merge(
             $settings['codemirror'],
@@ -4175 +4175 @@
             $settings['codemirror']['mode']['json'] = true;
         }
-    } elseif ( false !== strpos( $type, 'jsx' ) ) {
+    } elseif ( str_contains( $type, 'jsx' ) ) {
         $settings['codemirror'] = array_merge(
             $settings['codemirror'],
@@ -4221 +4221 @@
             )
         );
-    } elseif ( false !== strpos( $type, 'xml' ) ) {
+    } elseif ( str_contains( $type, 'xml' ) ) {
         $settings['codemirror'] = array_merge(
             $settings['codemirror'],