Improve organization of linting commands

Author: westonruter

.github/workflows/ci.yaml

@@ -50,6 +50,3 @@ jobs:
 
       - name: Lint
         run: npm run lint
-
-      - name: PHPStan
-        run: composer analyze

.lintstagedrc.js

@@ -1,5 +1,5 @@
 module.exports = {
-	"composer.*": () => "vendor/bin/composer-normalize",
+	"composer.*": () => "npm run lint:composer",
 	"package.json": [
 		"npm run lint:pkg-json"
 	],
@@ -9,5 +9,5 @@ module.exports = {
 	"**/*.php": [
 		"npm run lint:php",
 	],
-	'*.php': () => 'composer analyze'
+	'*.php': () => 'npm run lint:phpstan'
 };

bin/phpcbf.sh

@@ -2,9 +2,7 @@
 # Wrap phpcbf to turn 1 success exit code into 0 code.
 # See https://github.com/squizlabs/PHP_CodeSniffer/issues/1818#issuecomment-354420927
 
-root=$( dirname "$0" )/..
-
-"$root/vendor/bin/phpcbf" $@
+composer exec phpcbf $@
 exit=$?
 
 # Exit code 1 is used to indicate that all fixable errors were fixed correctly.

composer.json

@@ -39,7 +39,9 @@
   },
   "scripts": {
     "analyze": "if [ -z $TEST_SKIP_PHPSTAN ]; then phpstan --version; phpstan analyze --ansi; fi",
+    "normalize": "composer-normalize",
     "phpcs": "phpcs",
+    "phpcbf": "bin/phpcbf.sh",
     "zip": "git archive --format=zip HEAD > syntax-highlighting-code-block.zip && unzip -l syntax-highlighting-code-block.zip"
   }
 }

package.json

@@ -53,13 +53,16 @@
     "check-licenses": "wp-scripts check-licenses",
 
     "lint": "npm-run-all --parallel lint:*",
+    "lint:composer": "composer normalize --dry-run",
+    "lint:composer:fix": "composer normalize",
     "lint:css": "wp-scripts lint-style",
     "lint:css:fix": "npm run lint:css -- --fix",
     "lint:js": "wp-scripts lint-js",
     "lint:js:fix": "wp-scripts lint-js --fix",
     "lint:js:report": "npm run lint:js -- --output-file lint-js-report.json --format json .",
-    "lint:php": "vendor/bin/phpcs",
-    "lint:php:fix": "./bin/phpcbf.sh",
+    "lint:php": "composer phpcs",
+    "lint:php:fix": "composer phpcbf",
+    "lint:phpstan": "composer analyze",
     "lint:pkg-json": "wp-scripts lint-pkg-json . --ignorePath .gitignore",
     "start": "wp-scripts start src/index.js src/customize-controls.js --output-path=build",
     "update-wordpress-packages": "npm install --save-dev --save-exact $(npm outdated --parseable | cut -d':' -f 4 | grep @wordpress)",