From 123b0e467837bb51091e1e2f6821165b6c252ae5 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 13:58:25 +0000
Subject: [PATCH] Code Modernization: Fix parameter name mismatches for
 parent/child classes in `WP_Upgrader_Skin::error()`.

In each child class: renames the parameter to match the parent's method signature.

Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Changes for readability:

- `@since` clearly specifies the original parameter name and its new name as well as why the change happened.

Follow-up to [11005], [25806], [32655], [38199].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51782 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-bulk-upgrader-skin.php      | 18 ++++++++++--------
 .../class-language-pack-upgrader-skin.php      |  8 +++++---
 .../includes/class-wp-upgrader-skin.php        |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/wp-admin/includes/class-bulk-upgrader-skin.php b/src/wp-admin/includes/class-bulk-upgrader-skin.php
index d09b0e9fcc..89367c4cf8 100644
--- a/src/wp-admin/includes/class-bulk-upgrader-skin.php
+++ b/src/wp-admin/includes/class-bulk-upgrader-skin.php
@@ -89,18 +89,20 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
 	}
 
 	/**
-	 * @param string|WP_Error $error
+	 * @since 5.9.0 Renamed `$error` to `$errors` for PHP 8 named parameter support.
+	 *
+	 * @param string|WP_Error $errors Errors.
 	 */
-	public function error( $error ) {
-		if ( is_string( $error ) && isset( $this->upgrader->strings[ $error ] ) ) {
-			$this->error = $this->upgrader->strings[ $error ];
+	public function error( $errors ) {
+		if ( is_string( $errors ) && isset( $this->upgrader->strings[ $errors ] ) ) {
+			$this->error = $this->upgrader->strings[ $errors ];
 		}
 
-		if ( is_wp_error( $error ) ) {
+		if ( is_wp_error( $errors ) ) {
 			$messages = array();
-			foreach ( $error->get_error_messages() as $emessage ) {
-				if ( $error->get_error_data() && is_string( $error->get_error_data() ) ) {
-					$messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) );
+			foreach ( $errors->get_error_messages() as $emessage ) {
+				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) ) {
+					$messages[] = $emessage . ' ' . esc_html( strip_tags( $errors->get_error_data() ) );
 				} else {
 					$messages[] = $emessage;
 				}
diff --git a/src/wp-admin/includes/class-language-pack-upgrader-skin.php b/src/wp-admin/includes/class-language-pack-upgrader-skin.php
index 05676269f0..57b0a1c376 100644
--- a/src/wp-admin/includes/class-language-pack-upgrader-skin.php
+++ b/src/wp-admin/includes/class-language-pack-upgrader-skin.php
@@ -52,11 +52,13 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
 	}
 
 	/**
-	 * @param string|WP_Error $error
+	 * @since 5.9.0 Renamed `$error` to `$errors` for PHP 8 named parameter support.
+	 *
+	 * @param string|WP_Error $errors Errors.
 	 */
-	public function error( $error ) {
+	public function error( $errors ) {
 		echo '<div class="lp-error">';
-		parent::error( $error );
+		parent::error( $errors );
 		echo '</div>';
 	}
 
diff --git a/src/wp-admin/includes/class-wp-upgrader-skin.php b/src/wp-admin/includes/class-wp-upgrader-skin.php
index 40053df1bc..bb7e7bbf3b 100644
--- a/src/wp-admin/includes/class-wp-upgrader-skin.php
+++ b/src/wp-admin/includes/class-wp-upgrader-skin.php
@@ -165,7 +165,7 @@ class WP_Upgrader_Skin {
 	/**
 	 * @since 2.8.0
 	 *
-	 * @param string|WP_Error $errors
+	 * @param string|WP_Error $errors Errors.
 	 */
 	public function error( $errors ) {
 		if ( ! $this->done_header ) {