Changeset 56019

Timestamp:

06/24/2023 04:48:25 PM (16 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Use str_starts_with() and str_ends_with() in a few more places.

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.

Follow-up to [55990], [56014].

See #58220.

Location:

trunk/src/wp-includes

Files:

• class-wp-query.php (modified) (1 diff)
• deprecated.php (modified) (1 diff)
• link-template.php (modified) (1 diff)
• ms-functions.php (modified) (1 diff)
• rest-api/endpoints/class-wp-rest-attachments-controller.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-query.php

@@ -1462 +1462 @@
         foreach ( $q['search_terms'] as $term ) {
             // If there is an $exclusion_prefix, terms prefixed with it should be excluded.
-            $exclude = $exclusion_prefix && ( substr( $term, 0, 1 ) === $exclusion_prefix );
+            $exclude = $exclusion_prefix && str_starts_with( $term, $exclusion_prefix );
             if ( $exclude ) {
                 $like_op  = 'NOT LIKE';

trunk/src/wp-includes/deprecated.php

@@ -948 +948 @@
 
     $order = 'ASC';
-    if ( substr($orderby, 0, 1) === '_' ) {
+    if ( str_starts_with($orderby, '_') ) {
         $order = 'DESC';
         $orderby = substr($orderby, 1);

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

@@ -3892 +3892 @@
 
     $url = trim( $url );
-    if ( substr( $url, 0, 2 ) === '//' ) {
+    if ( str_starts_with( $url, '//' ) ) {
         $url = 'http:' . $url;
     }

trunk/src/wp-includes/ms-functions.php

@@ -402 +402 @@
             }
 
-            if ( $email_domain == $banned_domain ) {
+            if ( $email_domain === $banned_domain ) {
                 $is_email_address_unsafe = true;
                 break;
             }
 
-            $dotted_domain = ".$banned_domain";
-            if ( substr( $normalized_email, -strlen( $dotted_domain ) ) === $dotted_domain ) {
+            if ( str_ends_with( $normalized_email, ".$banned_domain" ) ) {
                 $is_email_address_unsafe = true;
                 break;

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

@@ -1138 +1138 @@
 
             // Unquote quoted filename, but after trimming.
-            if ( substr( $filename, 0, 1 ) === '"' && substr( $filename, -1, 1 ) === '"' ) {
+            if ( str_starts_with( $filename, '"' ) && str_ends_with( $filename, '"' ) ) {
                 $filename = substr( $filename, 1, -1 );
             }