<!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>[56793] trunk: Editor: Move `wp_navigation` schema updating to `WP_Navigation_Fallback` class.</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/56793">56793</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/56793","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-10-06 14:04:22 +0000 (Fri, 06 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: Move `wp_navigation` schema updating to `WP_Navigation_Fallback` class.
This aims to better align the navigation fallback implementation with core architecture and best practices.
The function that updates the `wp_navigation` post response schema is now a public method of the `WP_Navigation_Fallback` class, so an extra file previously used for that specific function is no longer necessary.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/56052">[56052]</a>.
Props ramonopoly, scruffian, isabel_brison, mukesh27, swissspidy, rajinsharwar, afercia, audrasjb, mikeschroder, JeffPaul, johnjamesjacoby, TimothyBlynJacobs, oglekler, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/58910">#58910</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpincludesclasswpnavigationfallbackphp">trunk/src/wp-includes/class-wp-navigation-fallback.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestnavigationfallbackcontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-navigation-fallback-controller.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesnavigationfallbackphp">trunk/src/wp-includes/navigation-fallback.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php 2023-10-06 12:45:43 UTC (rev 56792)
+++ trunk/src/wp-admin/includes/update-core.php 2023-10-06 14:04:22 UTC (rev 56793)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -867,6 +867,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/images/wlw',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/wlwmanifest.xml',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/random_compat',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 6.4
+ 'wp-includes/navigation-fallback.php',
</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="trunksrcwpincludesclasswpnavigationfallbackphp"></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-navigation-fallback.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-navigation-fallback.php 2023-10-06 12:45:43 UTC (rev 56792)
+++ trunk/src/wp-includes/class-wp-navigation-fallback.php 2023-10-06 14:04:22 UTC (rev 56793)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,6 +18,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Navigation_Fallback {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Updates the wp_navigation custom post type schema, in order to expose
+ * additional fields in the embeddable links of WP_REST_Navigation_Fallback_Controller.
+ *
+ * The Navigation Fallback endpoint may embed the full Navigation Menu object
+ * into the response as the `self` link. By default, the Posts Controller
+ * will only expose a limited subset of fields but the editor requires
+ * additional fields to be available in order to utilize the menu.
+ *
+ * Used with the `rest_wp_navigation_item_schema` hook.
+ *
+ * @since 6.4.0
+ *
+ * @param array $schema The schema for the `wp_navigation` post.
+ * @return array The modified schema.
+ */
+ public static function update_wp_navigation_post_schema( $schema ) {
+ // Expose top level fields.
+ $schema['properties']['status']['context'] = array_merge( $schema['properties']['status']['context'], array( 'embed' ) );
+ $schema['properties']['content']['context'] = array_merge( $schema['properties']['content']['context'], array( 'embed' ) );
+
+ /*
+ * Exposes sub properties of content field.
+ * These sub properties aren't exposed by the posts controller by default,
+ * for requests where context is `embed`.
+ *
+ * @see WP_REST_Posts_Controller::get_item_schema()
+ */
+ $schema['properties']['content']['properties']['raw']['context'] = array_merge( $schema['properties']['content']['properties']['raw']['context'], array( 'embed' ) );
+ $schema['properties']['content']['properties']['rendered']['context'] = array_merge( $schema['properties']['content']['properties']['rendered']['context'], array( 'embed' ) );
+ $schema['properties']['content']['properties']['block_version']['context'] = array_merge( $schema['properties']['content']['properties']['block_version']['context'], array( 'embed' ) );
+
+ /*
+ * Exposes sub properties of title field.
+ * These sub properties aren't exposed by the posts controller by default,
+ * for requests where context is `embed`.
+ *
+ * @see WP_REST_Posts_Controller::get_item_schema()
+ */
+ $schema['properties']['title']['properties']['raw']['context'] = array_merge( $schema['properties']['title']['properties']['raw']['context'], array( 'embed' ) );
+
+ return $schema;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Gets (and/or creates) an appropriate fallback Navigation Menu.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.3.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +69,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Post|null the fallback Navigation Post or null.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_fallback() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether or not a fallback should be created.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></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/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2023-10-06 12:45:43 UTC (rev 56792)
+++ trunk/src/wp-includes/default-filters.php 2023-10-06 14:04:22 UTC (rev 56793)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -711,6 +711,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'setup_theme', 'wp_enable_block_templates' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_loaded', '_add_template_loader_filters' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// wp_navigation post type.
+add_filter( 'rest_wp_navigation_item_schema', array( 'WP_Navigation_Fallback', 'update_wp_navigation_post_schema' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Fluid typography.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'render_block', 'wp_render_typography_support', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesnavigationfallbackphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/navigation-fallback.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/navigation-fallback.php 2023-10-06 12:45:43 UTC (rev 56792)
+++ trunk/src/wp-includes/navigation-fallback.php 2023-10-06 14:04:22 UTC (rev 56793)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,56 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Navigation Fallback
- *
- * Functions required for managing Navigation fallbacks behavior.
- *
- * @package WordPress
- * @since 6.3.0
- */
-
-/**
- * Expose additional fields in the embeddable links of the
- * Navigation Fallback REST endpoint.
- *
- * The endpoint may embed the full Navigation Menu object into the
- * response as the `self` link. By default, the Posts Controller
- * will only expose a limited subset of fields but the editor requires
- * additional fields to be available in order to utilize the menu.
- *
- * @since 6.3.0
- *
- * @param array $schema the schema for the `wp_navigation` post.
- * @return array the modified schema.
- */
-function wp_add_fields_to_navigation_fallback_embedded_links( $schema ) {
- // Expose top level fields.
- $schema['properties']['status']['context'] = array_merge( $schema['properties']['status']['context'], array( 'embed' ) );
- $schema['properties']['content']['context'] = array_merge( $schema['properties']['content']['context'], array( 'embed' ) );
-
- /*
- * Exposes sub properties of content field.
- * These sub properties aren't exposed by the posts controller by default,
- * for requests where context is `embed`.
- *
- * @see WP_REST_Posts_Controller::get_item_schema()
- */
- $schema['properties']['content']['properties']['raw']['context'] = array_merge( $schema['properties']['content']['properties']['raw']['context'], array( 'embed' ) );
- $schema['properties']['content']['properties']['rendered']['context'] = array_merge( $schema['properties']['content']['properties']['rendered']['context'], array( 'embed' ) );
- $schema['properties']['content']['properties']['block_version']['context'] = array_merge( $schema['properties']['content']['properties']['block_version']['context'], array( 'embed' ) );
-
- /*
- * Exposes sub properties of title field.
- * These sub properties aren't exposed by the posts controller by default,
- * for requests where context is `embed`.
- *
- * @see WP_REST_Posts_Controller::get_item_schema()
- */
- $schema['properties']['title']['properties']['raw']['context'] = array_merge( $schema['properties']['title']['properties']['raw']['context'], array( 'embed' ) );
-
- return $schema;
-}
-
-add_filter(
- 'rest_wp_navigation_item_schema',
- 'wp_add_fields_to_navigation_fallback_embedded_links'
-);
</del></span></pre></div>
<a id="trunksrcwpsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-settings.php 2023-10-06 12:45:43 UTC (rev 56792)
+++ trunk/src/wp-settings.php 2023-10-06 14:04:22 UTC (rev 56793)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,7 +354,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/block-supports/spacing.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/block-supports/typography.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/block-supports/settings.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require ABSPATH . WPINC . '/navigation-fallback.php';
</del><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/style-engine.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/style-engine/class-wp-style-engine.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/style-engine/class-wp-style-engine-css-declarations.php';
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestnavigationfallbackcontrollerphp"></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/rest-api/rest-navigation-fallback-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-navigation-fallback-controller.php 2023-10-06 12:45:43 UTC (rev 56792)
+++ trunk/tests/phpunit/tests/rest-api/rest-navigation-fallback-controller.php 2023-10-06 14:04:22 UTC (rev 56793)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 58557
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @covers ::wp_add_fields_to_navigation_fallback_embedded_links
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers WP_Navigation_Fallback::update_wp_navigation_post_schema
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.3.0 Added Navigation Fallbacks endpoint.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>