<!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>[54210] trunk/src/wp-includes: Coding Standards: Various alignment fixes from `composer format`.</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/54210">54210</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/54210","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-19 19:49:47 +0000 (Mon, 19 Sep 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: Various alignment fixes from `composer format`.
Follow up to <a href="https://core.trac.wordpress.org/changeset/53874">[53874]</a>, <a href="https://core.trac.wordpress.org/changeset/54097">[54097]</a>, <a href="https://core.trac.wordpress.org/changeset/54110">[54110]</a>, <a href="https://core.trac.wordpress.org/changeset/54155">[54155]</a>, <a href="https://core.trac.wordpress.org/changeset/54162">[54162]</a>, <a href="https://core.trac.wordpress.org/changeset/54184">[54184]</a>.
See <a href="https://core.trac.wordpress.org/ticket/39210">#39210</a>, <a href="https://core.trac.wordpress.org/ticket/55443">#55443</a>, <a href="https://core.trac.wordpress.org/ticket/56288">#56288</a>, <a href="https://core.trac.wordpress.org/ticket/56092">#56092</a>, <a href="https://core.trac.wordpress.org/ticket/56408">#56408</a>, <a href="https://core.trac.wordpress.org/ticket/56467">#56467</a>, <a href="https://core.trac.wordpress.org/ticket/55881">#55881</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblockeditorphp">trunk/src/wp-includes/block-editor.php</a></li>
<li><a href="#trunksrcwpincludesblocktemplateutilsphp">trunk/src/wp-includes/block-template-utils.php</a></li>
<li><a href="#trunksrcwpincludesclasswpblocktypephp">trunk/src/wp-includes/class-wp-block-type.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorgdphp">trunk/src/wp-includes/class-wp-image-editor-gd.php</a></li>
<li><a href="#trunksrcwpincludescronphp">trunk/src/wp-includes/cron.php</a></li>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestblocktypescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblockeditorphp"></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-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-editor.php 2022-09-19 18:02:11 UTC (rev 54209)
+++ trunk/src/wp-includes/block-editor.php 2022-09-19 19:49:47 UTC (rev 54210)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +428,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_css = wp_get_global_stylesheet( array( $block_classes['css'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $actual_css ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $block_classes['css'] = $actual_css;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $global_styles[] = $block_classes;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $global_styles[] = $block_classes;
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,7 +493,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 ( isset( $editor_settings['__experimentalFeatures']['spacing']['spacingSizes'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $spacing_sizes_by_origin = $editor_settings['__experimentalFeatures']['spacing']['spacingSizes'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $spacing_sizes_by_origin = $editor_settings['__experimentalFeatures']['spacing']['spacingSizes'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_settings['spacingSizes'] = isset( $spacing_sizes_by_origin['custom'] ) ?
</span><span class="cx" style="display: block; padding: 0 10px"> $spacing_sizes_by_origin['custom'] : (
</span><span class="cx" style="display: block; padding: 0 10px"> isset( $spacing_sizes_by_origin['theme'] ) ?
</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-09-19 18:02:11 UTC (rev 54209)
+++ trunk/src/wp-includes/block-template-utils.php 2022-09-19 19:49:47 UTC (rev 54210)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -552,7 +552,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"> $theme = $terms[0]->name;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $template_file = _get_block_template_file( $post->post_type, $post->post_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $template_file = _get_block_template_file( $post->post_type, $post->post_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $has_theme_file = wp_get_theme()->get_stylesheet() === $theme && null !== $template_file;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $origin = get_post_meta( $post->ID, 'origin', true );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpblocktypephp"></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-block-type.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-block-type.php 2022-09-19 18:02:11 UTC (rev 54209)
+++ trunk/src/wp-includes/class-wp-block-type.php 2022-09-19 19:49:47 UTC (rev 54210)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,7 +347,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $new_name = $name . '_handles';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_name = $name . '_handles';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->{$new_name}[0] = $value;
</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="trunksrcwpincludesclasswpimageeditorgdphp"></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-image-editor-gd.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor-gd.php 2022-09-19 18:02:11 UTC (rev 54209)
+++ trunk/src/wp-includes/class-wp-image-editor-gd.php 2022-09-19 19:49:47 UTC (rev 54210)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> imagedestroy( $resized );
</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">- $this->size = $orig_size;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->size = $orig_size;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->size_name = $orig_size_name;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $saved ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludescronphp"></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/cron.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/cron.php 2022-09-19 18:02:11 UTC (rev 54209)
+++ trunk/src/wp-includes/cron.php 2022-09-19 19:49:47 UTC (rev 54210)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1127,9 +1127,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $pre;
</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">- $crons = _get_cron_array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $crons = _get_cron_array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $gmt_time = microtime( true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $results = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $results = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $crons as $timestamp => $cronhooks ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $timestamp > $gmt_time ) {
</span></span></pre></div>
<a id="trunksrcwpincludesl10nphp"></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/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n.php 2022-09-19 18:02:11 UTC (rev 54209)
+++ trunk/src/wp-includes/l10n.php 2022-09-19 19:49:47 UTC (rev 54210)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1270,7 +1270,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"> $locale = determine_locale();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = $wp_textdomain_registry->get( $domain, $locale );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = $wp_textdomain_registry->get( $domain, $locale );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $path ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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-09-19 18:02:11 UTC (rev 54209)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php 2022-09-19 19:49:47 UTC (rev 54210)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data['is_dynamic'] = $block_type->is_dynamic();
</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">- $schema = $this->get_item_schema();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $schema = $this->get_item_schema();
</ins><span class="cx" style="display: block; padding: 0 10px"> // Fields deprecated in WordPress 6.1, but left in the schema for backwards compatibility.
</span><span class="cx" style="display: block; padding: 0 10px"> $deprecated_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'editor_script',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,13 +688,13 @@
</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">- 'keywords' => $keywords_definition,
- 'example' => $example_definition,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'keywords' => $keywords_definition,
+ 'example' => $example_definition,
</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"> // Properties deprecated in WordPress 6.1, but left in the schema for backwards compatibility.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $deprecated_properties = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $deprecated_properties = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'editor_script' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Editor script handle. DEPRECATED: Use `editor_script_handles` instead.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => array( 'string', 'null' ),
</span></span></pre>
</div>
</div>
</body>
</html>