Changeset 56014

Timestamp:

06/24/2023 09:50:34 AM (15 months ago)

Author:

SergeyBiryukov

Message:

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

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

WordPress core includes a polyfill for str_ends_with() on PHP < 8.0 as of WordPress 5.9.

Follow-up to [55990].

See #58220.

Location:

trunk/src

Files:

• wp-admin/plugin-editor.php (modified) (1 diff)
• wp-admin/theme-editor.php (modified) (1 diff)
• wp-includes/class-wp-rewrite.php (modified) (1 diff)
• wp-includes/load.php (modified) (1 diff)
• wp-includes/rest-api.php (modified) (1 diff)

trunk/src/wp-admin/plugin-editor.php

@@ -163 +163 @@
 }
 
-if ( '.php' === substr( $real_file, strrpos( $real_file, '.' ) ) ) {
+if ( str_ends_with( $real_file, '.php' ) ) {
     $functions = wp_doc_link_parse( $content );
 

trunk/src/wp-admin/theme-editor.php

@@ -162 +162 @@
     $content = fread( $f, filesize( $file ) );
 
-    if ( '.php' === substr( $file, strrpos( $file, '.' ) ) ) {
+    if ( str_ends_with( $file, '.php' ) ) {
         $functions = wp_doc_link_parse( $content );
 

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

@@ -1908 +1908 @@
         unset( $this->comment_feed_structure );
 
-        $this->use_trailing_slashes = ( '/' === substr( $this->permalink_structure, -1, 1 ) );
+        $this->use_trailing_slashes = str_ends_with( $this->permalink_structure, '/' );
 
         // Enable generic rules for pages if permalink structure doesn't begin with a wildcard.

trunk/src/wp-includes/load.php

@@ -878 +878 @@
     foreach ( $active_plugins as $plugin ) {
         if ( ! validate_file( $plugin )                     // $plugin must validate as file.
-            && '.php' === substr( $plugin, -4 )             // $plugin must end with '.php'.
+            && str_ends_with( $plugin, '.php' )             // $plugin must end with '.php'.
             && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist.
             // Not already included as a network plugin.

trunk/src/wp-includes/rest-api.php

@@ -468 +468 @@
         // nginx only allows HTTP/1.0 methods when redirecting from / to /index.php.
         // To work around this, we manually add index.php to the URL, avoiding the redirect.
-        if ( 'index.php' !== substr( $url, 9 ) ) {
+        if ( ! str_ends_with( $url, 'index.php' ) ) {
             $url .= 'index.php';
         }