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

Timestamp:

06/22/2023 02:55:47 PM (16 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Replace usage of substr() with str_starts_with() and str_ends_with().

str_starts_with() and str_ends_with() were introduced in PHP 8.0 to perform a case-sensitive check indicating if the string to search in (haystack) begins or ends with the given substring (needle).

WordPress core includes a polyfill for these functions on PHP < 8.0 as of WordPress 5.9.

This commit uses str_starts_with() and str_ends_with() in core files where appropriate:

• $needle === substr( $string, 0, $length ), where $length is the length of $needle, is replaced with str_starts_with( $haystack, $needle ).
• $needle === substr( $string, $offset ), where $offset is negative and the absolute value of $offset is the length of $needle, is replaced with str_ends_with( $haystack, $needle ).

This aims to make the code more readable and consistent, as well as better aligned with modern development practices.

Follow-up to [52039], [52040], [52326], [55703], [55710], [55987], [55988].

Props Soean, spacedmonkey, Clorith, ocean90, azaozz, sabernhardt, SergeyBiryukov.
Fixes #58220.

File:

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

trunk/src/wp-includes/formatting.php

@@ -243 +243 @@
         $first = $curl[0];
         if ( '<' === $first ) {
-            if ( '<!--' === substr( $curl, 0, 4 ) ) {
+            if ( str_starts_with( $curl, '<!--' ) ) {
                 // This is an HTML comment delimiter.
                 continue;
@@ -261 +261 @@
             // This is a shortcode delimiter.
 
-            if ( '[[' !== substr( $curl, 0, 2 ) && ']]' !== substr( $curl, -2 ) ) {
+            if ( ! str_starts_with( $curl, '[[' ) && ! str_ends_with( $curl, ']]' ) ) {
                 // Looks like a normal shortcode.
                 _wptexturize_pushpop_element( $curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes );
@@ -2628 +2628 @@
         $pre_attribute_ws  = isset( $regex[4] ) ? $regex[4] : '';
         $attributes        = trim( isset( $regex[5] ) ? $regex[5] : $regex[3] );
-        $has_self_closer   = '/' === substr( $attributes, -1 );
+        $has_self_closer   = str_ends_with( $attributes, '/' );
 
         $newtext .= $tagqueue;
@@ -3694 +3694 @@
         $offset = 0;
     } else {
-        $sign    = ( '+' === substr( $timezone, 0, 1 ) ) ? 1 : -1;
+        $sign    = ( str_starts_with( $timezone, '+' ) ) ? 1 : -1;
         $hours   = (int) substr( $timezone, 1, 2 );
         $minutes = (int) substr( $timezone, 3, 4 ) / 60;
@@ -5267 +5267 @@
 function wp_sprintf_l( $pattern, $args ) {
     // Not a match.
-    if ( '%l' !== substr( $pattern, 0, 2 ) ) {
+    if ( ! str_starts_with( $pattern, '%l' ) ) {
         return $pattern;
     }