From e87df011e78adbbeaa3f96176716febabf5b77b9 Mon Sep 17 00:00:00 2001 From: Alain Schlesser Date: Wed, 30 Aug 2023 15:19:24 +0200 Subject: [PATCH 1/2] Update to wp-cli-tests v4 (which requires WPCS v3) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a990818b..95d357a1 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ }, "require-dev": { "wp-cli/extension-command": "^1.2 || ^2", - "wp-cli/wp-cli-tests": "^3.1" + "wp-cli/wp-cli-tests": "^4" }, "config": { "process-timeout": 7200, From 5869f9f8ae851b4f234682d65e243fc1a100a86b Mon Sep 17 00:00:00 2001 From: Alain Schlesser Date: Wed, 30 Aug 2023 15:24:56 +0200 Subject: [PATCH 2/2] Fix all autofixable CS issues --- checksum-command.php | 3 +-- src/Checksum_Plugin_Command.php | 6 +++--- src/WP_CLI/Fetchers/UnfilteredPlugin.php | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/checksum-command.php b/checksum-command.php index be4607be..128faf07 100644 --- a/checksum-command.php +++ b/checksum-command.php @@ -4,7 +4,7 @@ return; } -$wpcli_checksum_autoloader = dirname( __FILE__ ) . '/vendor/autoload.php'; +$wpcli_checksum_autoloader = __DIR__ . '/vendor/autoload.php'; if ( file_exists( $wpcli_checksum_autoloader ) ) { require_once $wpcli_checksum_autoloader; } @@ -14,4 +14,3 @@ WP_CLI::add_command( 'plugin', 'Plugin_Command_Namespace' ); WP_CLI::add_command( 'plugin verify-checksums', 'Checksum_Plugin_Command' ); - diff --git a/src/Checksum_Plugin_Command.php b/src/Checksum_Plugin_Command.php index c65a80b6..99a8b942 100644 --- a/src/Checksum_Plugin_Command.php +++ b/src/Checksum_Plugin_Command.php @@ -101,13 +101,13 @@ public function __invoke( $args, $assoc_args ) { $version = empty( $version_arg ) ? $this->get_plugin_version( $plugin->file ) : $version_arg; if ( in_array( $plugin->name, $exclude_list, true ) ) { - $skips++; + ++$skips; continue; } if ( false === $version ) { WP_CLI::warning( "Could not retrieve the version for plugin {$plugin->name}, skipping." ); - $skips++; + ++$skips; continue; } @@ -122,7 +122,7 @@ public function __invoke( $args, $assoc_args ) { if ( false === $checksums ) { WP_CLI::warning( "Could not retrieve the checksums for version {$version} of plugin {$plugin->name}, skipping." ); - $skips++; + ++$skips; continue; } diff --git a/src/WP_CLI/Fetchers/UnfilteredPlugin.php b/src/WP_CLI/Fetchers/UnfilteredPlugin.php index 92781db5..794ef3c5 100644 --- a/src/WP_CLI/Fetchers/UnfilteredPlugin.php +++ b/src/WP_CLI/Fetchers/UnfilteredPlugin.php @@ -36,4 +36,3 @@ public function get( $name ) { return false; } } -