<!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>[56273] trunk/src: Coding Standards: Correct equals sign 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/56273">56273</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/56273","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-07-20 00:04:33 +0000 (Thu, 20 Jul 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'>Coding Standards: Correct equals sign alignment in various files.
This resolves a few WPCS warnings:
{{{
Equals sign not aligned with surrounding statements
}}}
so that the output of `composer format` is clean.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/55971">[55971]</a>, <a href="https://core.trac.wordpress.org/changeset/56033">[56033]</a>, <a href="https://core.trac.wordpress.org/changeset/56056">[56056]</a>, <a href="https://core.trac.wordpress.org/changeset/56143">[56143]</a>, <a href="https://core.trac.wordpress.org/changeset/56214">[56214]</a>.
Props jrf.
See <a href="https://core.trac.wordpress.org/ticket/58831">#58831</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpdebugdataphp">trunk/src/wp-admin/includes/class-wp-debug-data.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpincludesclasswpscriptsphp">trunk/src/wp-includes/class-wp-scripts.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesshortcodesphp">trunk/src/wp-includes/shortcodes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpdebugdataphp"></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/class-wp-debug-data.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-debug-data.php 2023-07-19 22:51:14 UTC (rev 56272)
+++ trunk/src/wp-admin/includes/class-wp-debug-data.php 2023-07-20 00:04:33 UTC (rev 56273)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -846,11 +846,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Server time.
</span><span class="cx" style="display: block; padding: 0 10px"> $date = new DateTime( 'now', new DateTimeZone( 'UTC' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $info['wp-server']['fields']['current'] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $info['wp-server']['fields']['current'] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Current time' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => $date->format( DateTime::ATOM ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $info['wp-server']['fields']['utc-time'] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $info['wp-server']['fields']['utc-time'] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Current UTC time' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => $date->format( DateTime::RFC850 ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></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/class-wp-ms-sites-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2023-07-19 22:51:14 UTC (rev 56272)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2023-07-20 00:04:33 UTC (rev 56273)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,15 +391,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_sortable_columns() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_subdomain_install() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $abbr = __( 'Domain' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blogname_abbr = __( 'Domain' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blogname_orderby_text = __( 'Table ordered by Site Domain Name.' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $abbr = __( 'Path' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blogname_abbr = __( 'Path' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $blogname_orderby_text = __( 'Table ordered by Site Path.' );
</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"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blogname' => array( 'blogname', false, $abbr, $blogname_orderby_text ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogname' => array( 'blogname', false, $blogname_abbr, $blogname_orderby_text ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'lastupdated' => array( 'lastupdated', true, __( 'Last Updated' ), __( 'Table ordered by Last Updated.' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'registered' => array( 'blog_id', true, _x( 'Registered', 'site' ), __( 'Table ordered by Site Registered Date.' ), 'desc' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></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/class-wp-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2023-07-19 22:51:14 UTC (rev 56272)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2023-07-20 00:04:33 UTC (rev 56273)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -764,7 +764,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = $this->screen->post_type;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' === $post_type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title_orderby_text = isset( $_GET['orderby'] ) ? __( 'Table ordered by Title.' ) : __( 'Table ordered by Hierarchical Menu Order and Title.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_GET['orderby'] ) ) {
+ $title_orderby_text = __( 'Table ordered by Title.' );
+ } else {
+ $title_orderby_text = __( 'Table ordered by Hierarchical Menu Order and Title.' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $sortables = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => array( 'title', false, __( 'Title' ), $title_orderby_text, 'asc' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => array( 'parent', false ),
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpscriptsphp"></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-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-scripts.php 2023-07-19 22:51:14 UTC (rev 56272)
+++ trunk/src/wp-includes/class-wp-scripts.php 2023-07-20 00:04:33 UTC (rev 56273)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -964,7 +964,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $eligible;
</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">- $is_alias = (bool) ! $this->registered[ $handle ]->src;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_alias = (bool) ! $this->registered[ $handle ]->src;
</ins><span class="cx" style="display: block; padding: 0 10px"> $intended_strategy = $this->get_data( $handle, 'strategy' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For non-alias handles, an empty intended strategy filters all strategies.
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2023-07-19 22:51:14 UTC (rev 56272)
+++ trunk/src/wp-includes/media.php 2023-07-20 00:04:33 UTC (rev 56273)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5620,6 +5620,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $loading_attributes;
</span><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"> // Closure to increase media count for images with certain minimum threshold, mostly used for header images.
</span><span class="cx" style="display: block; padding: 0 10px"> $maybe_increase_content_media_count = static function() use ( $attr ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span></span></pre></div>
<a id="trunksrcwpincludesshortcodesphp"></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/shortcodes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/shortcodes.php 2023-07-19 22:51:14 UTC (rev 56272)
+++ trunk/src/wp-includes/shortcodes.php 2023-07-20 00:04:33 UTC (rev 56273)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +222,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"> // Ensure this context is only added once if shortcodes are nested.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $has_filter = has_filter( 'wp_get_attachment_image_context', '_filter_do_shortcode_context' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $has_filter = has_filter( 'wp_get_attachment_image_context', '_filter_do_shortcode_context' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $filter_added = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $has_filter ) {
</span></span></pre>
</div>
</div>
</body>
</html>