From a9479f31d18f8340c36c514bf1ee4fd3dcbe4934 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 3 Mar 2020 11:39:08 +0000
Subject: [PATCH] Docs: Correct formatting of some DocBlocks in
 `Plugin_Upgrader` and `Theme_Upgrader` per the documentation standards.

See #49400.
Built from https://develop.svn.wordpress.org/trunk@47414


git-svn-id: http://core.svn.wordpress.org/trunk@47201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-plugin-upgrader.php | 13 +++++++------
 wp-admin/includes/class-theme-upgrader.php  |  6 +++---
 wp-includes/version.php                     |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/wp-admin/includes/class-plugin-upgrader.php b/wp-admin/includes/class-plugin-upgrader.php
index b99547c60b..214f371866 100644
--- a/wp-admin/includes/class-plugin-upgrader.php
+++ b/wp-admin/includes/class-plugin-upgrader.php
@@ -415,8 +415,8 @@ class Plugin_Upgrader extends WP_Upgrader {
 	 * @since 2.8.0
 	 * @since 4.1.0 Added a return value.
 	 *
-	 * @param bool|WP_Error  $return Upgrade offer return.
-	 * @param array          $plugin Plugin package arguments.
+	 * @param bool|WP_Error $return Upgrade offer return.
+	 * @param array         $plugin Plugin package arguments.
 	 * @return bool|WP_Error The passed in $return param or WP_Error.
 	 */
 	public function deactivate_plugin_before_upgrade( $return, $plugin ) {
@@ -466,7 +466,7 @@ class Plugin_Upgrader extends WP_Upgrader {
 
 		$plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : '';
 
-		// Only run if plugin is active
+		// Only run if plugin is active.
 		if ( ! is_plugin_active( $plugin ) ) {
 			return $return;
 		}
@@ -486,8 +486,8 @@ class Plugin_Upgrader extends WP_Upgrader {
 	 *
 	 * @since 5.4.0
 	 *
-	 * @param bool|WP_Error  $return Upgrade offer return.
-	 * @param array          $plugin Plugin package arguments.
+	 * @param bool|WP_Error $return Upgrade offer return.
+	 * @param array         $plugin Plugin package arguments.
 	 * @return bool|WP_Error The passed in $return param or WP_Error.
 	 */
 	public function active_after( $return, $plugin ) {
@@ -525,7 +525,8 @@ class Plugin_Upgrader extends WP_Upgrader {
 	 *
 	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
 	 *
-	 * @param bool|WP_Error $removed            Whether the destination was cleared. true on success, WP_Error on failure.
+	 * @param bool|WP_Error $removed            Whether the destination was cleared.
+	 *                                          True on success, WP_Error on failure.
 	 * @param string        $local_destination  The local package destination.
 	 * @param string        $remote_destination The remote package destination.
 	 * @param array         $plugin             Extra arguments passed to hooked filters.
diff --git a/wp-admin/includes/class-theme-upgrader.php b/wp-admin/includes/class-theme-upgrader.php
index aae2a8a2a1..9d561c0893 100644
--- a/wp-admin/includes/class-theme-upgrader.php
+++ b/wp-admin/includes/class-theme-upgrader.php
@@ -529,7 +529,7 @@ class Theme_Upgrader extends WP_Upgrader {
 	 * @since 2.8.0
 	 *
 	 * @param bool|WP_Error $return Upgrade offer return.
-	 * @param array         $theme Theme arguments.
+	 * @param array         $theme  Theme arguments.
 	 * @return bool|WP_Error The passed in $return param or WP_Error.
 	 */
 	public function current_before( $return, $theme ) {
@@ -561,7 +561,7 @@ class Theme_Upgrader extends WP_Upgrader {
 	 * @since 2.8.0
 	 *
 	 * @param bool|WP_Error $return Upgrade offer return.
-	 * @param array         $theme Theme arguments.
+	 * @param array         $theme  Theme arguments.
 	 * @return bool|WP_Error The passed in $return param or WP_Error.
 	 */
 	public function current_after( $return, $theme ) {
@@ -571,7 +571,7 @@ class Theme_Upgrader extends WP_Upgrader {
 
 		$theme = isset( $theme['theme'] ) ? $theme['theme'] : '';
 
-		// Only run if current theme
+		// Only run if current theme.
 		if ( get_stylesheet() !== $theme ) {
 			return $return;
 		}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6b221a43fe..c03646b7bf 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-beta3-47413';
+$wp_version = '5.4-beta3-47414';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.