Merge pull request #416 from ergebnis/feature/composer-normalize

Enhancement: Require `ergebnis/composer-normalize`

.github/workflows/integrate.yaml

@@ -8,6 +8,9 @@ on: # yamllint disable-line rule:truthy
     branches:
       - "main"
 
+env:
+  COMPOSER_ROOT_VERSION: "3.4-dev"
+
 jobs:
   code-coverage:
     name: "Code Coverage"
@@ -128,10 +131,10 @@ jobs:
       - name: "Install dependencies with phive"
         uses: "ergebnis/.github/actions/phive/[email protected]"
         with:
-          trust-gpg-keys: "0xC00543248C87FB13,0x033E5F8D801A2F8D"
+          trust-gpg-keys: "0x033E5F8D801A2F8D"
 
       - name: "Run ergebnis/composer-normalize"
-        run: ".phive/composer-normalize --ansi --dry-run"
+        run: "composer normalize --ansi --dry-run"
 
       - name: "Cache cache directory for friendsofphp/php-cs-fixer"
         uses: "actions/[email protected]"
@@ -196,7 +199,7 @@ jobs:
       - name: "Install dependencies with phive"
         uses: "ergebnis/.github/actions/phive/[email protected]"
         with:
-          trust-gpg-keys: "0xC00543248C87FB13,0x033E5F8D801A2F8D"
+          trust-gpg-keys: "0x033E5F8D801A2F8D"
 
       - name: "Run maglnet/composer-require-checker"
         run: ".phive/composer-require-checker check --ansi --config-file=$(pwd)/composer-require-checker.json --verbose"

.phive/phars.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="composer-normalize" version="^2.42.0" installed="2.42.0" location="./.phive/composer-normalize" copy="false"/>
   <phar name="composer-require-checker" version="^3.8.0" installed="3.8.0" location="./.phive/composer-require-checker" copy="false"/>
 </phive>

Makefile

@@ -8,7 +8,7 @@ code-coverage: vendor ## Collects coverage from running unit tests with phpunit/
 .PHONY: coding-standards
 coding-standards: phive vendor ## Lints YAML files with yamllint, normalizes composer.json with ergebnis/composer-normalize, and fixes code style issues with friendsofphp/php-cs-fixer
 	yamllint -c .yamllint.yaml --strict .
-	.phive/composer-normalize
+	composer normalize
 	vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --show-progress=dots --verbose
 
 .PHONY: dependency-analysis
@@ -25,7 +25,7 @@ mutation-tests: vendor ## Runs mutation tests with infection/infection
 
 .PHONY: phive
 phive: .phive ## Installs dependencies with phive
-	PHIVE_HOME=.build/phive phive install --trust-gpg-keys 0xC00543248C87FB13,0x033E5F8D801A2F8D
+	PHIVE_HOME=.build/phive phive install --trust-gpg-keys 0x033E5F8D801A2F8D
 
 .PHONY: refactoring
 refactoring: vendor ## Runs automated refactoring with rector/rector

composer.json

@@ -25,6 +25,7 @@
     "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
   },
   "require-dev": {
+    "ergebnis/composer-normalize": "^2.43.0",
     "ergebnis/data-provider": "^3.2.0",
     "ergebnis/license": "^2.4.0",
     "ergebnis/php-cs-fixer-config": "^6.32.0",
@@ -49,6 +50,7 @@
   "config": {
     "allow-plugins": {
       "composer/package-versions-deprecated": true,
+      "ergebnis/composer-normalize": true,
       "infection/extension-installer": true
     },
     "audit": {
@@ -61,6 +63,9 @@
     "sort-packages": true
   },
   "extra": {
+    "branch-alias": {
+      "dev-main": "3.4-dev"
+    },
     "composer-normalize": {
       "indent-size": 2,
       "indent-style": "space"