[FEATURE] Add composer-normalize to our development toolchain

MyIntervals · Nov 7, 2024 · 9cba418 · 9cba418
1 parent 23f4061
commit 9cba418
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -103,6 +103,7 @@ jobs:
             fail-fast: false
             matrix:
                 command:
+                    - composer:normalize
                     - php:fixer
                     - php:stan
                     - php:rector
@@ -139,7 +140,7 @@ jobs:
 
             - name: Install development tools
               run: |
-                  phive --no-progress install --trust-gpg-keys BBAB5DF0A0D6672989CF1869E82B2FB314E9906E
+                  phive --no-progress install --trust-gpg-keys 0FDE18AE1D09E19F60F6B1CBC00543248C87FB13,BBAB5DF0A0D6672989CF1869E82B2FB314E9906E
 
             - name: Run Command
               run: composer ci:${{ matrix.command }}
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
+  <phar name="composer-normalize" version="^2.44.0" installed="2.44.0" location="./.phive/composer-normalize" copy="false"/>
   <phar name="php-cs-fixer" version="^3.59.3" installed="3.64.0" location="./.phive/php-cs-fixer" copy="false"/>
 </phive>
diff --git a/composer.json b/composer.json
@@ -66,6 +66,7 @@
             "@ci:static",
             "@ci:dynamic"
         ],
+        "ci:composer:normalize": "\"./.phive/composer-normalize\" --dry-run",
         "ci:dynamic": [
             "@ci:tests"
         ],
@@ -74,6 +75,7 @@
         "ci:php:rector": "rector --no-progress-bar --dry-run --config=config/rector.php",
         "ci:php:stan": "phpstan --no-progress --configuration=config/phpstan.neon",
         "ci:static": [
+            "@ci:composer:normalize",
             "@ci:php:fixer",
             "@ci:php:lint",
             "@ci:php:rector",
@@ -88,7 +90,9 @@
         "fix": [
             "@fix:php"
         ],
+        "fix:composer:normalize": "\"./.phive/composer-normalize\" --no-check-lock",
         "fix:php": [
+            "@fix:composer:normalize",
             "@fix:php:rector",
             "@fix:php:fixer"
         ],
@@ -98,6 +102,7 @@
     },
     "scripts-descriptions": {
         "ci": "Runs all dynamic and static code checks.",
+        "ci:composer:normalize": "Checks the formatting and structure of the composer.json.",
         "ci:dynamic": "Runs all dynamic code checks (i.e., currently, the unit tests).",
         "ci:php:fixer": "Checks the code style with PHP CS Fixer.",
         "ci:php:lint": "Checks the syntax of the PHP code.",
@@ -109,6 +114,7 @@
         "ci:tests:sof": "Runs the unit tests and stops at the first failure.",
         "ci:tests:unit": "Runs all unit tests.",
         "fix": "Runs all fixers",
+        "fix:composer:normalize": "Reformats and sorts the composer.json file.",
         "fix:php": "Autofixes all autofixable issues in the PHP code.",
         "fix:php:fixer": "Fixes autofixable issues found by PHP CS Fixer.",
         "fix:php:rector": "Fixes autofixable issues found by Rector.",