Changeset 55990 for trunk/src/wp-includes/ms-settings.php

Timestamp:

06/22/2023 02:55:47 PM (6 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/ms-settings.php (modified) (1 diff)

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

@@ -56 +56 @@
 
     $domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) );
-    if ( ':80' === substr( $domain, -3 ) ) {
+    if ( str_ends_with( $domain, ':80' ) ) {
         $domain               = substr( $domain, 0, -3 );
         $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 );
-    } elseif ( ':443' === substr( $domain, -4 ) ) {
+    } elseif ( str_ends_with( $domain, ':443' ) ) {
         $domain               = substr( $domain, 0, -4 );
         $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );