From a95eef5fa354f6a54e74d5a79f55caf67521f4db Mon Sep 17 00:00:00 2001 From: Zach Borboa Date: Mon, 7 Jul 2025 01:49:43 -0400 Subject: [PATCH] Remove PHP CS Fixer workaround (#963) * Remove PHP CS Fixer workaround * Clean up --- tests/run_coding_standards_check.sh | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/tests/run_coding_standards_check.sh b/tests/run_coding_standards_check.sh index ccf99ef..7fdcde9 100755 --- a/tests/run_coding_standards_check.sh +++ b/tests/run_coding_standards_check.sh @@ -118,21 +118,12 @@ if [[ "${?}" -ne 0 ]]; then errors+=("found PHP_CodeSniffer coding standard violation(s)") fi -# TODO: Remove this workaround that only runs php-cs-fixer on PHP < 8.4 when -# php-cs-fixer supports PHP 8.4. -# https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/pull/8300 -if [[ $(echo "${CI_PHP_VERSION} < 8.4" | bc -l) -eq 1 ]]; then - - # Run PHP-CS-Fixer. - vendor/bin/php-cs-fixer --version - vendor/bin/php-cs-fixer fix --ansi --config="tests/.php-cs-fixer.php" --diff --dry-run - if [[ "${?}" -ne 0 ]]; then - echo "❌ Error: found PHP-CS-Fixer coding standard violation(s)" - errors+=("found PHP-CS-Fixer coding standard violation(s)") - fi -else - echo "⚠️ Skipped running PHP-CS-Fixer coding standards check" - warnings+=("Skipped running PHP-CS-Fixer coding standards check") +# Run PHP-CS-Fixer. +vendor/bin/php-cs-fixer --version +vendor/bin/php-cs-fixer fix --ansi --config="tests/.php-cs-fixer.php" --diff --dry-run +if [[ "${?}" -ne 0 ]]; then + echo "❌ Error: found PHP-CS-Fixer coding standard violation(s)" + errors+=("found PHP-CS-Fixer coding standard violation(s)") fi popd