Changeset 55703 for trunk/src/wp-includes/blocks.php

Timestamp:

05/02/2023 03:43:03 PM (16 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Replace usage of strpos() with str_starts_with().

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

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

This commit replaces 0 === strpos( ... ) with str_starts_with() in core files, making the code more readable and consistent, as well as improving performance.

While strpos() is slightly faster than the polyfill on PHP < 8.0, str_starts_with() is noticeably faster on PHP 8.0+, as it is optimized to avoid unnecessarily searching along the whole haystack if it does not find the needle.

Follow-up to [52039], [52040], [52326].

Props spacedmonkey, costdev, sabernhardt, mukesh27, desrosj, jorbin, TobiasBg, ayeshrajans, lgadzhev, SergeyBiryukov.
Fixes #58012.

File:

• trunk/src/wp-includes/blocks.php (modified) (7 diffs)

trunk/src/wp-includes/blocks.php

@@ -18 +18 @@
 function remove_block_asset_path_prefix( $asset_handle_or_path ) {
     $path_prefix = 'file:';
-    if ( 0 !== strpos( $asset_handle_or_path, $path_prefix ) ) {
+    if ( ! str_starts_with( $asset_handle_or_path, $path_prefix ) ) {
         return $asset_handle_or_path;
     }
@@ -25 +25 @@
         strlen( $path_prefix )
     );
-    if ( strpos( $path, './' ) === 0 ) {
+    if ( str_starts_with( $path, './' ) ) {
         $path = substr( $path, 2 );
     }
@@ -45 +45 @@
  */
 function generate_block_asset_handle( $block_name, $field_name, $index = 0 ) {
-    if ( 0 === strpos( $block_name, 'core/' ) ) {
+    if ( str_starts_with( $block_name, 'core/' ) ) {
         $asset_handle = str_replace( 'core/', 'wp-block-', $block_name );
-        if ( 0 === strpos( $field_name, 'editor' ) ) {
+        if ( str_starts_with( $field_name, 'editor' ) ) {
             $asset_handle .= '-editor';
         }
-        if ( 0 === strpos( $field_name, 'view' ) ) {
+        if ( str_starts_with( $field_name, 'view' ) ) {
             $asset_handle .= '-view';
         }
@@ -138 +138 @@
     $script_path_norm = wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $script_path ) );
 
-    $is_core_block  = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], $wpinc_path_norm );
-    $is_theme_block = 0 === strpos( $script_path_norm, $theme_path_norm );
+    $is_core_block  = isset( $metadata['file'] ) && str_starts_with( $metadata['file'], $wpinc_path_norm );
+    $is_theme_block = str_starts_with( $script_path_norm, $theme_path_norm );
 
     $script_uri = plugins_url( $script_path, $metadata['file'] );
@@ -192 +192 @@
     }
 
-    $is_core_block = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], $wpinc_path_norm );
+    $is_core_block = isset( $metadata['file'] ) && str_starts_with( $metadata['file'], $wpinc_path_norm );
     // Skip registering individual styles for each core block when a bundled version provided.
     if ( $is_core_block && ! wp_should_load_separate_core_block_assets() ) {
@@ -360 +360 @@
 
     // Add `style` and `editor_style` for core blocks if missing.
-    if ( ! empty( $metadata['name'] ) && 0 === strpos( $metadata['name'], 'core/' ) ) {
+    if ( ! empty( $metadata['name'] ) && str_starts_with( $metadata['name'], 'core/' ) ) {
         $block_name = str_replace( 'core/', '', $metadata['name'] );
 
@@ -699 +699 @@
  */
 function strip_core_block_namespace( $block_name = null ) {
-    if ( is_string( $block_name ) && 0 === strpos( $block_name, 'core/' ) ) {
+    if ( is_string( $block_name ) && str_starts_with( $block_name, 'core/' ) ) {
         return substr( $block_name, 5 );
     }