From 7ab2e0e009583ae1f4f73a31b7c825d972e80c3f Mon Sep 17 00:00:00 2001 From: Felipe Elia Date: Tue, 1 Nov 2022 10:39:50 -0300 Subject: [PATCH 1/3] GH Action - PHPCS: Migrate to use cs2pr --- .github/workflows/lint.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 412bfed19b..0b120d7163 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -74,13 +74,11 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '8.0' + tools: cs2pr coverage: none - name: composer install run: composer install - name: PHPCS check - uses: chekalsky/phpcs-action@v1 - with: - enable_warnings: true - phpcs_bin_path: './vendor/bin/phpcs elasticpress.php includes --runtime-set testVersion 7.0-' + run: './vendor/bin/phpcs elasticpress.php includes -q --report=checkstyle --runtime-set testVersion 7.0- | cs2pr' From 29f61496a4eb6f599d895359f435e51fb018c67b Mon Sep 17 00:00:00 2001 From: Felipe Elia Date: Tue, 1 Nov 2022 10:50:31 -0300 Subject: [PATCH 2/3] Check error output --- includes/classes/Command.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/classes/Command.php b/includes/classes/Command.php index ff097e25ee..13e660252f 100644 --- a/includes/classes/Command.php +++ b/includes/classes/Command.php @@ -584,7 +584,7 @@ public function recreate_network_alias( $args, $assoc_args ) { $indexable->delete_network_alias(); - $create_result = $this->create_network_alias_helper( $indexable ); + $create_result = $this->create_network_alias_helper($indexable); if ( $create_result ) { WP_CLI::success( esc_html__( 'Done.', 'elasticpress' ) ); From 69b2866931d9f40e4f0bb98d54987f213382c34c Mon Sep 17 00:00:00 2001 From: Felipe Elia Date: Tue, 1 Nov 2022 10:52:06 -0300 Subject: [PATCH 3/3] Revert "Check error output" This reverts commit 29f61496a4eb6f599d895359f435e51fb018c67b. --- includes/classes/Command.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/classes/Command.php b/includes/classes/Command.php index 13e660252f..ff097e25ee 100644 --- a/includes/classes/Command.php +++ b/includes/classes/Command.php @@ -584,7 +584,7 @@ public function recreate_network_alias( $args, $assoc_args ) { $indexable->delete_network_alias(); - $create_result = $this->create_network_alias_helper($indexable); + $create_result = $this->create_network_alias_helper( $indexable ); if ( $create_result ) { WP_CLI::success( esc_html__( 'Done.', 'elasticpress' ) );