phpcbf and phpcs will now check against WP and WC standards

Automattic · Jun 17, 2024 · 531ef92 · 531ef92
1 parent 9e93c9f
commit 531ef92
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 20 deletions.
diff --git a/bin/wc-phpcbf b/bin/wc-phpcbf
diff --git a/bin/wc-phpcbf.sh b/bin/wc-phpcbf.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# phpcbf returns exit-code as 1 even if all errors were fixed.
+# https://github.com/squizlabs/PHP_CodeSniffer/issues/3057#issuecomment-919794895
+
+composer run phpcbf $@
+
+status=$?
+
+[ $status -eq 1 ] && exit 0 || exit $status
diff --git a/composer.json b/composer.json
@@ -24,10 +24,10 @@
         "phpunit"
       ],
       "phpcs": [
-        "phpcs -s -p"
+        "./vendor/bin/phpcs -s -p --ignore=vendor,.git,assets,node_modules,dist,docker,release,bin --standard=WooCommerce-Core,WordPress-Core,WordPress-Extra"
       ],
       "phpcbf": [
-        "phpcbf -p"
+        "./vendor/bin/phpcbf -p --ignore=vendor,.git,assets,node_modules,dist,docker,release,bin --standard=WooCommerce-Core,WordPress-Core,WordPress-Extra "
       ],
       "check-security": [
         "./vendor/bin/phpcs . --ignore=vendor,.git,assets,node_modules,dist,docker,release,bin --standard=./.phpcs.security.xml  --report-full --report-summary"

diff --git a/lint-staged.config.js b/lint-staged.config.js
@@ -3,6 +3,6 @@ module.exports = {
 		'npm run eslint:fix',
 	],
 	'*.php': [
-		'bin/wc-phpcbf',
+		'sh bin/wc-phpcbf.sh',
 	],
 };