From 67a38ab429cbb39ac6bb9bb9f4498aa077aa050b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 22 Dec 2023 15:33:34 +0100
Subject: [PATCH] Revert "GH Action/cs: use the threshold/branch report"

No need to check via thresholds anymore as the CS issues have been brought down to 0 again.
---
 .github/workflows/cs.yml | 30 ++++--------------------------
 composer.json            |  2 +-
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/cs.yml b/.github/workflows/cs.yml
index 554bc00..e5db90f 100644
--- a/.github/workflows/cs.yml
+++ b/.github/workflows/cs.yml
@@ -40,22 +40,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Determine the base branch for the file diff
-        id: base_branch
-        env:
-          BASE_REF: ${{ github.base_ref }}
-        run: |
-          if [ "${{ github.event_name }}" == "pull_request" ]; then
-            echo "NAME=$BASE_REF" >> $GITHUB_OUTPUT
-            echo "REF=origin/$BASE_REF" >> $GITHUB_OUTPUT
-          else
-            echo 'NAME=main' >> $GITHUB_OUTPUT
-            echo "REF=origin/main" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Fetch base branch
-        run: git fetch --no-tags --depth=1 origin ${{ steps.base_branch.outputs.NAME }}
-
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -76,18 +60,12 @@ jobs:
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
 
-      # Check the codestyle of the files against a threshold of expected errors and warnings.
-      - name: Check PHP code style against the thresholds
-        run: composer check-cs-thresholds
-
-      # Check the codestyle only of the files which were changed in the current branch.
-      # This step will only be executed if the threshold check exited with a failure status.
-      # The results of this CS check will be shown inline in the PR via the CS2PR tool.
+      # Check the codestyle of the files.
+      # The results of the CS check will be shown inline in the PR via the CS2PR tool.
       # @link https://github.com/staabm/annotate-pull-request-from-checkstyle/
-      - name: Check PHP code style for the changes made in the branch only
-        if: ${{ failure() }}
+      - name: Check PHP code style
         id: phpcs
-        run: composer check-branch-cs -- ${{ steps.base_branch.outputs.REF }}
+        run: composer check-cs-warnings -- --no-cache --report-full --report-checkstyle=./phpcs-report.xml
 
       - name: Show PHPCS results in PR
         if: ${{ always() && steps.phpcs.outcome == 'failure' }}
diff --git a/composer.json b/composer.json
index 61f5d74..f5ca1fe 100644
--- a/composer.json
+++ b/composer.json
@@ -56,7 +56,7 @@
 			"Yoast\\WHIP\\Config\\Composer\\Actions::check_coding_standards"
 		],
 		"check-cs-thresholds": [
-			"@putenv YOASTCS_THRESHOLD_ERRORS=2",
+			"@putenv YOASTCS_THRESHOLD_ERRORS=0",
 			"@putenv YOASTCS_THRESHOLD_WARNINGS=0",
 			"Yoast\\WHIP\\Config\\Composer\\Actions::check_cs_thresholds"
 		],