Changeset 54309

Timestamp:

09/26/2022 01:05:30 PM (2 years ago)

Author:

SergeyBiryukov

Message:

General: Remove file_exists() checks after calling realpath().

realpath() already checks if the file exists, and returns false on failure. The additional file_exists() check is not necessary and can be removed, improving the performance.

This commit simplifies the checks in two functions:

• register_block_type_from_metadata()
• wp_json_file_decode()

Note: In both of these cases, the values are passed through wp_normalize_path() after realpath(), so if the file does not exist, the false value gets converted to an empty string. The updated checks work both for false and '' values.

Though this is a small tweak, it saves a lot of checks since one of the places we do this is when registering block styles, so it runs quite a few times on each page load.

Reference: ​PHP Manual: realpath().

Follow-up to [51599], [54132], [54290], [54291].

Props aristath.
Fixes #56654.

Location:

trunk/src/wp-includes

Files:

• blocks.php (modified) (1 diff)
• functions.php (modified) (1 diff)

trunk/src/wp-includes/blocks.php

@@ -443 +443 @@
             )
         );
-        if ( file_exists( $template_path ) ) {
+        if ( $template_path ) {
             /**
              * Renders the block on the server.

trunk/src/wp-includes/functions.php

@@ -4529 +4529 @@
     $result   = null;
     $filename = wp_normalize_path( realpath( $filename ) );
-    if ( ! file_exists( $filename ) ) {
+
+    if ( ! $filename ) {
         trigger_error(
             sprintf(