<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[56771] trunk: Editor: Simplify return shape and logic of `_wp_get_block_patterns()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/56771">56771</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/56771","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>flixos90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-10-03 18:17:03 +0000 (Tue, 03 Oct 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Editor: Simplify return shape and logic of `_wp_get_block_patterns()`.
Follow up to <a href="https://core.trac.wordpress.org/changeset/56765">[56765]</a>.
Props spacedmonkey.
Fixes <a href="https://core.trac.wordpress.org/ticket/59490">#59490</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblockpatternsphp">trunk/src/wp-includes/block-patterns.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunktestsphpunittestsblockswpGetBlockPatternsphp">trunk/tests/phpunit/tests/blocks/wpGetBlockPatterns.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblockpatternsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/block-patterns.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-patterns.php 2023-10-03 18:11:01 UTC (rev 56770)
+++ trunk/src/wp-includes/block-patterns.php 2023-10-03 18:17:03 UTC (rev 56771)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,11 +341,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $registry = WP_Block_Patterns_Registry::get_instance();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $themes as $theme ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pattern_data = _wp_get_block_patterns( $theme );
- $dirpath = $theme->get_stylesheet_directory() . '/patterns/';
- $text_domain = $theme->get( 'TextDomain' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $patterns = _wp_get_block_patterns( $theme );
+ $dirpath = $theme->get_stylesheet_directory() . '/patterns/';
+ $text_domain = $theme->get( 'TextDomain' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $pattern_data['patterns'] as $file => $pattern_data ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $patterns as $file => $pattern_data ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $registry->is_registered( $pattern_data['slug'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,35 +405,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Theme $theme Theme object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Block pattern data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> function _wp_get_block_patterns( WP_Theme $theme ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $theme->exists() ) {
- return array(
- 'version' => false,
- 'patterns' => array(),
- );
- }
-
- $transient_name = 'wp_theme_patterns_' . $theme->get_stylesheet();
- $version = $theme->get( 'Version' );
</del><span class="cx" style="display: block; padding: 0 10px"> $can_use_cached = ! wp_is_development_mode( 'theme' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $can_use_cached ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pattern_data = get_transient( $transient_name );
- if ( is_array( $pattern_data ) && $pattern_data['version'] === $version ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pattern_data = $theme->get_pattern_cache();
+ if ( is_array( $pattern_data ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $pattern_data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pattern_data = array(
- 'version' => $version,
- 'patterns' => array(),
- );
</del><span class="cx" style="display: block; padding: 0 10px"> $dirpath = $theme->get_stylesheet_directory() . '/patterns/';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pattern_data = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! file_exists( $dirpath ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $can_use_cached ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_transient( $transient_name, $pattern_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme->set_pattern_cache( $pattern_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $pattern_data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,7 +427,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $files = glob( $dirpath . '*.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $files ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $can_use_cached ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_transient( $transient_name, $pattern_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme->set_pattern_cache( $pattern_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $pattern_data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,7 +460,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: file name. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: file name. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Could not register file "%s" as a block pattern ("Slug" field missing)' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $file
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -486,7 +473,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %1s: file name; %2s: slug value found. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: file name; 2: slug value found. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Could not register file "%1$s" as a block pattern (invalid slug "%2$s")' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $file,
</span><span class="cx" style="display: block; padding: 0 10px"> $pattern['slug']
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -500,7 +487,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %1s: file name. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: file name. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Could not register file "%s" as a block pattern ("Title" field missing)' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $file
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -540,11 +527,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = str_replace( $dirpath, '', $file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pattern_data['patterns'][ $key ] = $pattern;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pattern_data[ $key ] = $pattern;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $can_use_cached ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_transient( $transient_name, $pattern_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme->set_pattern_cache( $pattern_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $pattern_data;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php 2023-10-03 18:11:01 UTC (rev 56770)
+++ trunk/src/wp-includes/class-wp-theme.php 2023-10-03 18:17:03 UTC (rev 56771)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -825,10 +825,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Clear block pattern cache.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Gets block pattern cache.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @return array|false Returns an array of patterns if cache is found, otherwise false.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_pattern_cache() {
+ if ( ! $this->exists() ) {
+ return false;
+ }
+ $pattern_data = get_transient( 'wp_theme_patterns_' . $this->stylesheet );
+ if ( is_array( $pattern_data ) && $pattern_data['version'] === $this->get( 'Version' ) ) {
+ return $pattern_data['patterns'];
+ }
+ return false;
+ }
+
+ /**
+ * Sets block pattern cache.
+ *
+ * @since 6.4.0
+ *
+ * @param array $patterns Block patterns data to set in cache.
+ */
+ public function set_pattern_cache( array $patterns ) {
+ $pattern_data = array(
+ 'version' => $this->get( 'Version' ),
+ 'patterns' => $patterns,
+ );
+ set_transient( 'wp_theme_patterns_' . $this->stylesheet, $pattern_data );
+ }
+
+ /**
+ * Clears block pattern cache.
+ *
+ * @since 6.4.0
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function delete_pattern_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> delete_transient( 'wp_theme_patterns_' . $this->stylesheet );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsblockswpGetBlockPatternsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/blocks/wpGetBlockPatterns.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/wpGetBlockPatterns.php 2023-10-03 18:11:01 UTC (rev 56770)
+++ trunk/tests/phpunit/tests/blocks/wpGetBlockPatterns.php 2023-10-03 18:17:03 UTC (rev 56771)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,26 +31,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_delete_theme_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = wp_get_theme( 'block-theme-patterns' );
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_get_block_patterns( $theme );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $transient = get_transient( 'wp_theme_patterns_block-theme-patterns' );
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'version' => '1.0.0',
- 'patterns' => array(
- 'cta.php' => array(
- 'title' => 'Centered Call To Action',
- 'slug' => 'block-theme-patterns/cta',
- 'description' => '',
- 'categories' => array( 'call-to-action' ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'cta.php' => array(
+ 'title' => 'Centered Call To Action',
+ 'slug' => 'block-theme-patterns/cta',
+ 'description' => '',
+ 'categories' => array( 'call-to-action' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $transient,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme->get_pattern_cache(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'The transient for block theme patterns should be set'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme->cache_delete();
- $transient = get_transient( 'wp_theme_patterns_block-theme-patterns' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme->delete_pattern_cache();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $transient,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme->get_pattern_cache(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'The transient for block theme patterns should have been cleared'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,33 +55,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_clear_transient_after_switching_theme() {
</span><span class="cx" style="display: block; padding: 0 10px"> switch_theme( 'block-theme' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _wp_get_block_patterns( wp_get_theme() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme1 = wp_get_theme();
+ _wp_get_block_patterns( $theme1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array(
- 'version' => '1.0.0',
- 'patterns' => array(),
- ),
- get_transient( 'wp_theme_patterns_block-theme' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array(),
+ $theme1->get_pattern_cache(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'The transient for block theme should be set'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> switch_theme( 'block-theme-patterns' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( get_transient( 'wp_theme_patterns_block-theme' ), 'Transient should not be set for block theme after switch theme' );
- $this->assertFalse( get_transient( 'wp_theme_patterns_block-theme-patterns' ), 'Transient should not be set for block theme patterns before being requested' );
- _wp_get_block_patterns( wp_get_theme() );
- $transient = get_transient( 'wp_theme_patterns_block-theme-patterns' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( $theme1->get_pattern_cache(), 'Transient should not be set for block theme after switch theme' );
+ $theme2 = wp_get_theme();
+ $this->assertFalse( $theme2->get_pattern_cache(), 'Transient should not be set for block theme patterns before being requested' );
+ _wp_get_block_patterns( $theme2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'version' => '1.0.0',
- 'patterns' => array(
- 'cta.php' => array(
- 'title' => 'Centered Call To Action',
- 'slug' => 'block-theme-patterns/cta',
- 'description' => '',
- 'categories' => array( 'call-to-action' ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'cta.php' => array(
+ 'title' => 'Centered Call To Action',
+ 'slug' => 'block-theme-patterns/cta',
+ 'description' => '',
+ 'categories' => array( 'call-to-action' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $transient,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme2->get_pattern_cache(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'The transient for block theme patterns should be set'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,45 +91,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => 'block-theme',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'patterns' => array(
- 'version' => '1.0.0',
- 'patterns' => array(),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'patterns' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => 'block-theme-child',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'patterns' => array(
- 'version' => '1.0.0',
- 'patterns' => array(),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'patterns' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => 'block-theme-patterns',
</span><span class="cx" style="display: block; padding: 0 10px"> 'patterns' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'version' => '1.0.0',
- 'patterns' => array(
- 'cta.php' => array(
- 'title' => 'Centered Call To Action',
- 'slug' => 'block-theme-patterns/cta',
- 'description' => '',
- 'categories' => array( 'call-to-action' ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'cta.php' => array(
+ 'title' => 'Centered Call To Action',
+ 'slug' => 'block-theme-patterns/cta',
+ 'description' => '',
+ 'categories' => array( 'call-to-action' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => 'broken-theme',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'patterns' => array(
- 'version' => false,
- 'patterns' => array(),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'patterns' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => 'invalid',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'patterns' => array(
- 'version' => false,
- 'patterns' => array(),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'patterns' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>