<!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>[56093] trunk/src/wp-includes/rest-api/endpoints: REST API: Cache schema in block pattern and menu item endpoints.</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/56093">56093</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/56093","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>kadamwhite</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-06-28 15:51:23 +0000 (Wed, 28 Jun 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'>REST API: Cache schema in block pattern and menu item endpoints.

Performance improvement to add schema caching to pattern and menu item REST endpoints, so identical schema object are not needlessly regenerated.

Props spacedmonkey.
Fixes <a href="https://core.trac.wordpress.org/ticket/58657">#58657</a>. See <a href="https://core.trac.wordpress.org/changeset/45811">[45811]</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestblockpatterncategoriescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestblockpatternscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestblockscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestmenuitemscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestmenuscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menus-controller.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesrestapiendpointsclasswprestblockpatterncategoriescontrollerphp"></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/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php    2023-06-28 14:14:58 UTC (rev 56092)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php      2023-06-28 15:51:23 UTC (rev 56093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,6 +125,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @return array Item schema data.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function get_item_schema() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                if ( $this->schema ) {
+                       return $this->add_additional_fields_schema( $this->schema );
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $schema = array(
</span><span class="cx" style="display: block; padding: 0 10px">                        '$schema'    => 'http://json-schema.org/draft-04/schema#',
</span><span class="cx" style="display: block; padding: 0 10px">                        'title'      => 'block-pattern-category',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,6 +155,8 @@
</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">-                return $this->add_additional_fields_schema( $schema );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->schema = $schema;
+
+               return $this->add_additional_fields_schema( $this->schema );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestblockpatternscontrollerphp"></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/rest-api/endpoints/class-wp-rest-block-patterns-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php      2023-06-28 14:14:58 UTC (rev 56092)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php        2023-06-28 15:51:23 UTC (rev 56093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,6 +199,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @return array Item schema data.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function get_item_schema() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                if ( $this->schema ) {
+                       return $this->add_additional_fields_schema( $this->schema );
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $schema = array(
</span><span class="cx" style="display: block; padding: 0 10px">                        '$schema'    => 'http://json-schema.org/draft-04/schema#',
</span><span class="cx" style="display: block; padding: 0 10px">                        'title'      => 'block-pattern',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,6 +291,8 @@
</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">-                return $this->add_additional_fields_schema( $schema );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->schema = $schema;
+
+               return $this->add_additional_fields_schema( $this->schema );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestblockscontrollerphp"></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/rest-api/endpoints/class-wp-rest-blocks-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php      2023-06-28 14:14:58 UTC (rev 56092)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php        2023-06-28 15:51:23 UTC (rev 56093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,6 +67,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @return array Item schema data.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function get_item_schema() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                if ( $this->schema ) {
+                       return $this->add_additional_fields_schema( $this->schema );
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 // Do not cache this schema because all properties are derived from parent controller.
</span><span class="cx" style="display: block; padding: 0 10px">                $schema = parent::get_item_schema();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +90,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                unset( $schema['properties']['title']['properties']['rendered'] );
</span><span class="cx" style="display: block; padding: 0 10px">                unset( $schema['properties']['content']['properties']['rendered'] );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $schema;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->schema = $schema;
+
+               return $this->add_additional_fields_schema( $this->schema );
</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>
<a id="trunksrcwpincludesrestapiendpointsclasswprestmenuitemscontrollerphp"></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/rest-api/endpoints/class-wp-rest-menu-items-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php  2023-06-28 14:14:58 UTC (rev 56092)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php    2023-06-28 15:51:23 UTC (rev 56093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -710,6 +710,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @return array Item schema data.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function get_item_schema() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                if ( $this->schema ) {
+                       return $this->add_additional_fields_schema( $this->schema );
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $schema = array(
</span><span class="cx" style="display: block; padding: 0 10px">                        '$schema' => 'http://json-schema.org/draft-04/schema#',
</span><span class="cx" style="display: block; padding: 0 10px">                        'title'   => $this->post_type,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -914,7 +918,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $schema['links'] = $schema_links;
</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">-                return $this->add_additional_fields_schema( $schema );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->schema = $schema;
+
+               return $this->add_additional_fields_schema( $this->schema );
</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>
<a id="trunksrcwpincludesrestapiendpointsclasswprestmenuscontrollerphp"></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/rest-api/endpoints/class-wp-rest-menus-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menus-controller.php       2023-06-28 14:14:58 UTC (rev 56092)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menus-controller.php 2023-06-28 15:51:23 UTC (rev 56093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,6 +523,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @return array Item schema data.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function get_item_schema() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                if ( $this->schema ) {
+                       return $this->add_additional_fields_schema( $this->schema );
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $schema = parent::get_item_schema();
</span><span class="cx" style="display: block; padding: 0 10px">                unset( $schema['properties']['count'], $schema['properties']['link'], $schema['properties']['taxonomy'] );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -566,6 +570,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        'type'        => 'boolean',
</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">-                return $schema;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->schema = $schema;
+
+               return $this->add_additional_fields_schema( $this->schema );
</ins><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>