<!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>[53952] trunk/src/wp-admin/includes: Code Modernization: Explicitly declare all properties in `WP_Ajax_Upgrader_Skin`.</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/53952">53952</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/53952","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-08-29 12:44:30 +0000 (Mon, 29 Aug 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'>Code Modernization: Explicitly declare all properties in `WP_Ajax_Upgrader_Skin`.
Dynamic (non-explicitly declared) properties are deprecated as of PHP 8.2 and are expected to become a fatal error in PHP 9.0.
In this case, the `$plugin_info` and `$theme_info` properties are set in `Plugin_Upgrader::bulk_upgrade()` and `Theme_Upgrader::bulk_upgrade()` specifically.
The `Bulk_Plugin_Upgrader_Skin` class and the `Bulk_Theme_Upgrader_Skin` class both already allow for this, but the `wp_ajax_update_plugin()` and `wp_ajax_update_theme()` functions also call the `*_Upgrader::bulk_upgrade()` methods, so the `WP_Ajax_Upgrader_Skin` class also needs to have these properties explicitly declared.
Includes adding proper DocBlocks for the pre-existing properties in the `Bulk_Plugin_Upgrader_Skin` and the `Bulk_Theme_Upgrader_Skin` classes.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/13686">[13686]</a>, <a href="https://core.trac.wordpress.org/changeset/37714">[37714]</a>, <a href="https://core.trac.wordpress.org/changeset/38199">[38199]</a>, <a href="https://core.trac.wordpress.org/changeset/42677">[42677]</a>, <a href="https://core.trac.wordpress.org/changeset/42873">[42873]</a>, <a href="https://core.trac.wordpress.org/changeset/53557">[53557]</a>, <a href="https://core.trac.wordpress.org/changeset/53558">[53558]</a>, <a href="https://core.trac.wordpress.org/changeset/53850">[53850]</a>, <a href="https://core.trac.wordpress.org/changeset/53851">[53851]</a>, <a href="https://core.trac.wordpress.org/changeset/53852">[53852]</a>, <a href="https://core.trac.wordpress.org/changeset/53853">[53853]</a>, <a href="https://core.trac.wordpress.org/changeset/53854">[53854]</a>, <a href="https://core.trac.wordpress.org/changeset/53856">[53856]</a>, <a href="https://core.trac.wordpress.org/changeset/53916">[539
16]</a>, <a href="https://core.trac.wordpress.org/changeset/53935">[53935]</a>, <a href="https://core.trac.wordpress.org/changeset/53936">[53936]</a>, <a href="https://core.trac.wordpress.org/changeset/53937">[53937]</a>, <a href="https://core.trac.wordpress.org/changeset/53938">[53938]</a>, <a href="https://core.trac.wordpress.org/changeset/53942">[53942]</a>, <a href="https://core.trac.wordpress.org/changeset/53945">[53945]</a>, <a href="https://core.trac.wordpress.org/changeset/53948">[53948]</a>, <a href="https://core.trac.wordpress.org/changeset/53949">[53949]</a>.
Props jrf, costdev.
See <a href="https://core.trac.wordpress.org/ticket/56033">#56033</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclassbulkpluginupgraderskinphp">trunk/src/wp-admin/includes/class-bulk-plugin-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassbulkthemeupgraderskinphp">trunk/src/wp-admin/includes/class-bulk-theme-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpajaxupgraderskinphp">trunk/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclassbulkpluginupgraderskinphp"></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-bulk-plugin-upgrader-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-bulk-plugin-upgrader-skin.php 2022-08-28 19:49:40 UTC (rev 53951)
+++ trunk/src/wp-admin/includes/class-bulk-plugin-upgrader-skin.php 2022-08-29 12:44:30 UTC (rev 53952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,8 +16,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Bulk_Upgrader_Skin
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $plugin_info = array(); // Plugin_Upgrader::bulk_upgrade() will fill this in.
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Plugin info.
+ *
+ * The Plugin_Upgrader::bulk_upgrade() method will fill this in
+ * with info retrieved from the get_plugin_data() function.
+ *
+ * @var array Plugin data. Values will be empty if not supplied by the plugin.
+ */
+ public $plugin_info = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function add_strings() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::add_strings();
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Plugin name, 2: Number of the plugin, 3: Total number of plugins being updated. */
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassbulkthemeupgraderskinphp"></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-bulk-theme-upgrader-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-bulk-theme-upgrader-skin.php 2022-08-28 19:49:40 UTC (rev 53951)
+++ trunk/src/wp-admin/includes/class-bulk-theme-upgrader-skin.php 2022-08-29 12:44:30 UTC (rev 53952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,8 +16,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Bulk_Upgrader_Skin
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $theme_info = array(); // Theme_Upgrader::bulk_upgrade() will fill this in.
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Theme info.
+ *
+ * The Theme_Upgrader::bulk_upgrade() method will fill this in
+ * with info retrieved from the Theme_Upgrader::theme_info() method,
+ * which in turn calls the wp_get_theme() function.
+ *
+ * @var WP_Theme|false The theme's info object, or false.
+ */
+ public $theme_info = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function add_strings() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::add_strings();
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Theme name, 2: Number of the theme, 3: Total number of themes being updated. */
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpajaxupgraderskinphp"></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-ajax-upgrader-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php 2022-08-28 19:49:40 UTC (rev 53951)
+++ trunk/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php 2022-08-29 12:44:30 UTC (rev 53952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,6 +19,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Ajax_Upgrader_Skin extends Automatic_Upgrader_Skin {
</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">+ * Plugin info.
+ *
+ * The Plugin_Upgrader::bulk_upgrade() method will fill this in
+ * with info retrieved from the get_plugin_data() function.
+ *
+ * @var array Plugin data. Values will be empty if not supplied by the plugin.
+ */
+ public $plugin_info = array();
+
+ /**
+ * Theme info.
+ *
+ * The Theme_Upgrader::bulk_upgrade() method will fill this in
+ * with info retrieved from the Theme_Upgrader::theme_info() method,
+ * which in turn calls the wp_get_theme() function.
+ *
+ * @var WP_Theme|false The theme's info object, or false.
+ */
+ public $theme_info = false;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Holds the WP_Error object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span></span></pre>
</div>
</div>
</body>
</html>