Skip to content

Remove unneeded compatibility shim #5885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schlessera merged 2 commits into from
Dec 8, 2023
Merged

Remove unneeded compatibility shim #5885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0e50a2
Remove unneeded compatibility shim
schlessera Dec 8, 2023
0558d66
Remove unneeded PHPCS ignore
schlessera Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions php/WP_CLI/Compat/FeedbackMethodTrait.php
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions php/WP_CLI/Compat/Min_PHP_5_4/FeedbackMethodTrait.php
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions php/WP_CLI/Compat/Min_PHP_5_6/FeedbackMethodTrait.php
View file
Open in desktop

This file was deleted.

15 changes: 13 additions & 2 deletions php/WP_CLI/UpgraderSkin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
*/
class UpgraderSkin extends WP_Upgrader_Skin {

use WP_CLI\Compat\FeedbackMethodTrait;

public $api;

public function header() {}
Expand Down Expand Up @@ -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.
*
Expand Down
2 changes: 0 additions & 2 deletions phpcs.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down