Merge pull request #5885 from wp-cli/fix/remove-unneeded-compat

wp-cli · Dec 8, 2023 · 8d05c78 · 8d05c78
2 parents 9c1f144 + 0558d66
commit 8d05c78
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 62 deletions.
diff --git a/php/WP_CLI/Compat/FeedbackMethodTrait.php b/php/WP_CLI/Compat/FeedbackMethodTrait.php
diff --git a/php/WP_CLI/Compat/Min_PHP_5_4/FeedbackMethodTrait.php b/php/WP_CLI/Compat/Min_PHP_5_4/FeedbackMethodTrait.php
diff --git a/php/WP_CLI/Compat/Min_PHP_5_6/FeedbackMethodTrait.php b/php/WP_CLI/Compat/Min_PHP_5_6/FeedbackMethodTrait.php
diff --git a/php/WP_CLI/UpgraderSkin.php b/php/WP_CLI/UpgraderSkin.php
@@ -12,8 +12,6 @@
  */
 class UpgraderSkin extends WP_Upgrader_Skin {
 
-	use WP_CLI\Compat\FeedbackMethodTrait;
-
 	public $api;
 
 	public function header() {}
@@ -41,6 +39,19 @@ public function error( $error ) {
 		WP_CLI::warning( $error );
 	}
 
+	/**
+	 * @param string $string
+	 * @param mixed  ...$args Optional text replacements.
+	 */
+	public function feedback( $string, ...$args ) {
+		$args_array = [];
+		foreach ( $args as $arg ) {
+			$args_array[] = $args;
+		}
+
+		$this->process_feedback( $string, $args );
+	}
+
 	/**
 	 * Process the feedback collected through the compat indirection.
 	 *

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -115,8 +115,6 @@
 	<!-- Exclude existing classes from the protected parameter names rule as it would break BC to change these now. -->
 	<rule ref="Universal.NamingConventions.NoReservedKeywordParameterNames">
 		<exclude-pattern>*/php/WP_CLI/Iterators/Transform\.php</exclude-pattern>
-		<exclude-pattern>*/php/WP_CLI/Compat/Min_PHP_5_4/FeedbackMethodTrait\.php</exclude-pattern>
-		<exclude-pattern>*/php/WP_CLI/Compat/Min_PHP_5_6/FeedbackMethodTrait\.php</exclude-pattern>
 		<exclude-pattern>*/php/WP_CLI/Inflector\.php</exclude-pattern>
 		<exclude-pattern>*/php/WP_CLI/Autoloader\.php</exclude-pattern>
 		<exclude-pattern>*/php/WP_CLI/Dispatcher/CommandFactory\.php</exclude-pattern>