Merge pull request #825 from ergebnis/fix/composer

localheinz · web-flow · commit 0ac8d06d9106 · 2021-12-05T12:34:03.000+01:00
Fix: Update `composer/composer`
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -9,7 +9,7 @@ on: # yamllint disable-line rule:truthy
       - "main"
 
 env:
-  COMPOSER_VERSION: "2.1.12"
+  COMPOSER_VERSION: "2.1.14"
   PHP_EXTENSIONS: "mbstring"
   PHP_INI_VALUES: "memory_limit=-1, phar.readonly=0"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,10 @@ For a full diff see [`2.16.0...2.17.0`][2.16.0...2.17.0].
 
 - Updated `schema.json` ([#816]), by [@ergebnis-bot]
 
+### Fixed
+
+- Required `composer/composer:2.1.14` for compiling `composer-normalize.phar` ([#825]), by [@localheinz]
+
 ## [`2.16.0`][2.16.0]
 
 For a full diff see [`2.15.0...2.16.0`][2.15.0...2.16.0].
@@ -756,6 +760,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [#804]: https://github.com/ergebnis/composer-normalize/pull/804
 [#807]: https://github.com/ergebnis/composer-normalize/pull/807
 [#816]: https://github.com/ergebnis/composer-normalize/pull/816
+[#825]: https://github.com/ergebnis/composer-normalize/pull/825
 
 [@core23]: https://github.com/core23
 [@dependabot]: https://github.com/dependabot
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-COMPOSER_VERSION:=2.1.12
+COMPOSER_VERSION:=2.1.14
 
 .PHONY: it
 it: coding-standards static-code-analysis tests ## Runs the coding-standards, static-code-analysis, and tests targets
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
     "localheinz/diff": "^1.1.1"
   },
   "require-dev": {
-    "composer/composer": "^2.1.12",
+    "composer/composer": "^2.1.14",
     "ergebnis/license": "^1.1.0",
     "ergebnis/php-cs-fixer-config": "^2.14.0",
     "ergebnis/test-util": "^1.5.0",
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-COMPOSER_VERSION:=2.1.12`
	`1`	`+COMPOSER_VERSION:=2.1.14`
`2`	`2`
`3`	`3`	`.PHONY: it`
`4`	`4`	`it: coding-standards static-code-analysis tests ## Runs the coding-standards, static-code-analysis, and tests targets`