<!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>[53197] trunk/src: Coding Standards: Correct alignment in various files.</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/53197">53197</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/53197","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>2022-04-17 15:05:10 +0000 (Sun, 17 Apr 2022)</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'>Coding Standards: Correct alignment in various files.
This fixes an `Array double arrow not aligned correctly` WPCS warning.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/53075">[53075]</a>, <a href="https://core.trac.wordpress.org/changeset/53084">[53084]</a>, <a href="https://core.trac.wordpress.org/changeset/53091">[53091]</a>, <a href="https://core.trac.wordpress.org/changeset/53094">[53094]</a>, <a href="https://core.trac.wordpress.org/changeset/53155">[53155]</a>, <a href="https://core.trac.wordpress.org/changeset/53129">[53129]</a>.
See <a href="https://core.trac.wordpress.org/ticket/54728">#54728</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditformblocksphp">trunk/src/wp-admin/edit-form-blocks.php</a></li>
<li><a href="#trunksrcwpadminsiteeditorphp">trunk/src/wp-admin/site-editor.php</a></li>
<li><a href="#trunksrcwpincludesblocktemplateutilsphp">trunk/src/wp-includes/block-template-utils.php</a></li>
<li><a href="#trunksrcwpincludesblocksphp">trunk/src/wp-includes/blocks.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestblocktypescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestglobalstylescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditformblocksphp"></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/edit-form-blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-blocks.php 2022-04-17 14:42:35 UTC (rev 53196)
+++ trunk/src/wp-admin/edit-form-blocks.php 2022-04-17 15:05:10 UTC (rev 53197)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '/wp/v2/taxonomies?context=view',
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</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">- 'context' => 'edit',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'context' => 'edit',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => -1,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> rest_get_route_for_post_type_items( 'wp_block' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,25 +188,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $body_placeholder = apply_filters( 'write_your_story', __( 'Type / to choose a block' ), $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_settings = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'availableTemplates' => $available_templates,
- 'disablePostFormats' => ! current_theme_supports( 'post-formats' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'availableTemplates' => $available_templates,
+ 'disablePostFormats' => ! current_theme_supports( 'post-formats' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/edit-form-advanced.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'titlePlaceholder' => apply_filters( 'enter_title_here', __( 'Add title' ), $post ),
- 'bodyPlaceholder' => $body_placeholder,
- 'autosaveInterval' => AUTOSAVE_INTERVAL,
- 'richEditingEnabled' => user_can_richedit(),
- 'postLock' => $lock_details,
- 'postLockUtils' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'titlePlaceholder' => apply_filters( 'enter_title_here', __( 'Add title' ), $post ),
+ 'bodyPlaceholder' => $body_placeholder,
+ 'autosaveInterval' => AUTOSAVE_INTERVAL,
+ 'richEditingEnabled' => user_can_richedit(),
+ 'postLock' => $lock_details,
+ 'postLockUtils' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'nonce' => wp_create_nonce( 'lock-post_' . $post->ID ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'unlockNonce' => wp_create_nonce( 'update-post_' . $post->ID ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'ajaxUrl' => admin_url( 'admin-ajax.php' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'supportsLayout' => WP_Theme_JSON_Resolver::theme_has_support(),
- 'supportsTemplateMode' => current_theme_supports( 'block-templates' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'supportsLayout' => WP_Theme_JSON_Resolver::theme_has_support(),
+ 'supportsTemplateMode' => current_theme_supports( 'block-templates' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Whether or not to load the 'postcustom' meta box is stored as a user meta
</span><span class="cx" style="display: block; padding: 0 10px"> // field so that we're not always loading its assets.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'enableCustomFields' => (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'enableCustomFields' => (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true ),
</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"> $autosave = wp_get_post_autosave( $post->ID );
</span></span></pre></div>
<a id="trunksrcwpadminsiteeditorphp"></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/site-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/site-editor.php 2022-04-17 14:42:35 UTC (rev 53196)
+++ trunk/src/wp-admin/site-editor.php 2022-04-17 15:05:10 UTC (rev 53197)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,12 +61,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $block_editor_context = new WP_Block_Editor_Context( array( 'name' => 'core/edit-site' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_settings = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'siteUrl' => site_url(),
- 'postsPerPage' => get_option( 'posts_per_page' ),
- 'styles' => get_block_editor_theme_styles(),
- 'defaultTemplateTypes' => $indexed_template_types,
- 'defaultTemplatePartAreas' => get_allowed_block_template_part_areas(),
- '__unstableHomeTemplate' => $home_template,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'siteUrl' => site_url(),
+ 'postsPerPage' => get_option( 'posts_per_page' ),
+ 'styles' => get_block_editor_theme_styles(),
+ 'defaultTemplateTypes' => $indexed_template_types,
+ 'defaultTemplatePartAreas' => get_allowed_block_template_part_areas(),
+ '__unstableHomeTemplate' => $home_template,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_settings = get_block_editor_settings( $custom_settings, $block_editor_context );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesblocktemplateutilsphp"></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-template-utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-template-utils.php 2022-04-17 14:42:35 UTC (rev 53196)
+++ trunk/src/wp-includes/block-template-utils.php 2022-04-17 15:05:10 UTC (rev 53197)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1001,8 +1001,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $theme_json_raw['version'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_version;
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_json_version = 'wp/' . substr( $wp_version, 0, 3 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $schema = array( '$schema' => 'https://schemas.wp.org/' . $theme_json_version . '/theme.json' );
- $theme_json_raw = array_merge( $schema, $theme_json_raw );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $schema = array( '$schema' => 'https://schemas.wp.org/' . $theme_json_version . '/theme.json' );
+ $theme_json_raw = array_merge( $schema, $theme_json_raw );
</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"> // Convert to a string.
</span></span></pre></div>
<a id="trunksrcwpincludesblocksphp"></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/blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks.php 2022-04-17 14:42:35 UTC (rev 53196)
+++ trunk/src/wp-includes/blocks.php 2022-04-17 15:05:10 UTC (rev 53197)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1362,7 +1362,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $style_uri = get_theme_file_uri( str_replace( $theme_path_norm, '', $style_path_norm ) );
</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">- $args = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'handle' => sanitize_key( "{$metadata['name']}-{$style_path}" ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'src' => $style_uri,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestblocktypescontrollerphp"></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-types-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-types-controller.php 2022-04-17 14:42:35 UTC (rev 53196)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php 2022-04-17 15:05:10 UTC (rev 53197)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -646,7 +646,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'context' => array( 'embed', 'view', 'edit' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'readonly' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ancestor' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ancestor' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Ancestor blocks.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => array( 'array', 'null' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'items' => array(
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestglobalstylescontrollerphp"></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-global-styles-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-global-styles-controller.php 2022-04-17 14:42:35 UTC (rev 53196)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php 2022-04-17 15:05:10 UTC (rev 53197)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,7 +581,7 @@
</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"> if ( rest_is_field_included( 'styles', $fields ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $raw_data = $theme->get_raw_data();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $raw_data = $theme->get_raw_data();
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['styles'] = isset( $raw_data['styles'] ) ? $raw_data['styles'] : array();
</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>