Changeset 55236

Timestamp:

02/06/2023 07:57:41 PM (18 months ago)

Author:

flixos90

Message:

Themes: Add caching to WP_Theme::is_block_theme().

This changeset adds a block_theme entry in the theme cache data, similar to the existing entries headers, errors, stylesheet, and template.

Props spacedmonkey, costdev, joemcgill, flixos90, mukesh27, adamsilverstein.
Fixes #57114.

Location:

trunk

Files:

• src/wp-includes/class-wp-theme.php (modified) (13 diffs)
• tests/phpunit/tests/theme/wpTheme.php (modified) (1 diff)

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

@@ -115 +115 @@
 
     /**
+
+
+
+
+
+
+
+
      * Header name from the theme's style.css after being translated.
      *
@@ -251 +259 @@
 
         if ( is_array( $cache ) ) {
-            foreach ( array( 'errors', 'headers', 'template' ) as $key ) {
+            foreach ( array( 'errors', 'headers', 'template' ) as $key ) {
                 if ( isset( $cache[ $key ] ) ) {
                     $this->$key = $cache[ $key ];
@@ -276 +284 @@
                 $this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
             }
-            $this->template = $this->stylesheet;
+            $this->template    = $this->stylesheet;
+            $this->block_theme = false;
             $this->cache_add(
                 'theme',
                 array(
-                    'headers'    => $this->headers,
-                    'errors'     => $this->errors,
-                    'stylesheet' => $this->stylesheet,
-                    'template'   => $this->template,
+                    'block_theme' => $this->block_theme,
+                    'headers'     => $this->headers,
+                    'errors'      => $this->errors,
+                    'stylesheet'  => $this->stylesheet,
+                    'template'    => $this->template,
                 )
             );
@@ -294 +304 @@
             $this->errors          = new WP_Error( 'theme_stylesheet_not_readable', __( 'Stylesheet is not readable.' ) );
             $this->template        = $this->stylesheet;
+
             $this->cache_add(
                 'theme',
                 array(
-                    'headers'    => $this->headers,
-                    'errors'     => $this->errors,
-                    'stylesheet' => $this->stylesheet,
-                    'template'   => $this->template,
+                    'block_theme' => $this->block_theme,
+                    'headers'     => $this->headers,
+                    'errors'      => $this->errors,
+                    'stylesheet'  => $this->stylesheet,
+                    'template'    => $this->template,
                 )
             );
@@ -328 +340 @@
                 'theme',
                 array(
-                    'headers'    => $this->headers,
-                    'errors'     => $this->errors,
-                    'stylesheet' => $this->stylesheet,
+                    'block_theme' => $this->is_block_theme(),
+                    'headers'     => $this->headers,
+                    'errors'      => $this->errors,
+                    'stylesheet'  => $this->stylesheet,
                 )
             );
@@ -364 +377 @@
                     'theme',
                     array(
-                        'headers'    => $this->headers,
-                        'errors'     => $this->errors,
-                        'stylesheet' => $this->stylesheet,
-                        'template'   => $this->template,
+                        'block_theme' => $this->is_block_theme(),
+                        'headers'     => $this->headers,
+                        'errors'      => $this->errors,
+                        'stylesheet'  => $this->stylesheet,
+                        'template'    => $this->template,
                     )
                 );
@@ -400 +414 @@
                     'theme',
                     array(
-                        'headers'    => $this->headers,
-                        'errors'     => $this->errors,
-                        'stylesheet' => $this->stylesheet,
-                        'template'   => $this->template,
+                        'block_theme' => $this->is_block_theme(),
+                        'headers'     => $this->headers,
+                        'errors'      => $this->errors,
+                        'stylesheet'  => $this->stylesheet,
+                        'template'    => $this->template,
                     )
                 );
@@ -427 +442 @@
                     'theme',
                     array(
-                        'headers'    => $_child->headers,
-                        'errors'     => $_child->errors,
-                        'stylesheet' => $_child->stylesheet,
-                        'template'   => $_child->template,
+                        'block_theme' => $_child->is_block_theme(),
+                        'headers'     => $_child->headers,
+                        'errors'      => $_child->errors,
+                        'stylesheet'  => $_child->stylesheet,
+                        'template'    => $_child->template,
                     )
                 );
@@ -446 +462 @@
                         'theme',
                         array(
-                            'headers'    => $this->headers,
-                            'errors'     => $this->errors,
-                            'stylesheet' => $this->stylesheet,
-                            'template'   => $this->template,
+                            'block_theme' => $this->is_block_theme(),
+                            'headers'     => $this->headers,
+                            'errors'      => $this->errors,
+                            'stylesheet'  => $this->stylesheet,
+                            'template'    => $this->template,
                         )
                     );
@@ -466 +483 @@
         if ( ! is_array( $cache ) ) {
             $cache = array(
-                'headers'    => $this->headers,
-                'errors'     => $this->errors,
-                'stylesheet' => $this->stylesheet,
-                'template'   => $this->template,
+                'block_theme' => $this->is_block_theme(),
+                'headers'     => $this->headers,
+                'errors'      => $this->errors,
+                'stylesheet'  => $this->stylesheet,
+                'template'    => $this->template,
             );
             // If the parent theme is in another root, we'll want to cache this. Avoids an entire branch of filesystem calls above.
@@ -763 +781 @@
         $this->headers_sanitized = null;
         $this->name_translated   = null;
+
         $this->headers           = array();
         $this->__construct( $this->stylesheet, $this->theme_root );
@@ -1492 +1511 @@
      */
     public function is_block_theme() {
+
+
+
+
         $paths_to_index_block_template = array(
             $this->get_file_path( '/block-templates/index.html' ),
@@ -1497 +1520 @@
         );
 
+
+
         foreach ( $paths_to_index_block_template as $path_to_index_block_template ) {
             if ( is_file( $path_to_index_block_template ) && is_readable( $path_to_index_block_template ) ) {
-                return true;
-            }
-        }
-
-        return false;
+                $this->block_theme = true;
+                break;
+            }
+        }
+
+        return $this->block_theme;
     }
 

trunk/tests/phpunit/tests/theme/wpTheme.php

@@ -277 +277 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Test get_files for an existing theme.
      *