Merge pull request #379 from ergebnis/fix/composer

Fix: Update composer/composer
ergebnis · Mar 13, 2020 · dbcf562 · dbcf562
2 parents 432c3b3 + 373090e
commit dbcf562
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 13 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -9,7 +9,7 @@ on: # yamllint disable-line rule:truthy
       - "master"
 
 env:
-  COMPOSER_VERSION: "1.10.0"
+  COMPOSER_VERSION: "1.10.1"
   REQUIRED_PHP_EXTENSIONS: "mbstring"
 
 jobs:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -8,7 +8,7 @@ on: # yamllint disable-line rule:truthy
       - "**"
 
 env:
-  COMPOSER_VERSION: "1.10.0"
+  COMPOSER_VERSION: "1.10.1"
   REQUIRED_PHP_EXTENSIONS: "mbstring"
 
 jobs:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
-For a full diff see [`2.3.0...master`][2.3.0...master].
+For a full diff see [`2.3.1...master`][2.3.1...master].
+
+## [`2.3.1`][2.3.1]
+
+For a full diff see [`2.3.0...2.3.1`][2.3.0...2.3.1].
+
+### Fixed
+
+* Updated `composer/composer` ([#379]), by [@localheinz]
 
 ## [`2.3.0`][2.3.0]
 
@@ -337,6 +345,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [2.2.3]: https://github.com/ergebnis/composer-normalize/releases/tag/2.2.3
 [2.2.4]: https://github.com/ergebnis/composer-normalize/releases/tag/2.2.4
 [2.3.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.3.0
+[2.3.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.3.1
 
 [81bc3a8...0.1.0]: https://github.com/ergebnis/composer-normalize/compare/81bc3a8...0.1.0
 [0.1.0...0.2.0]: https://github.com/ergebnis/composer-normalize/compare/0.1.0...0.2.0
@@ -368,7 +377,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [2.2.2...2.2.3]: https://github.com/ergebnis/composer-normalize/compare/2.2.2...2.2.3
 [2.2.3...2.2.4]: https://github.com/ergebnis/composer-normalize/compare/2.2.3...2.2.4
 [2.2.4...2.3.0]: https://github.com/ergebnis/composer-normalize/compare/2.2.4...2.3.0
-[2.3.0...master]: https://github.com/ergebnis/composer-normalize/compare/2.3.0...master
+[2.3.0...2.3.1]: https://github.com/ergebnis/composer-normalize/compare/2.3.0...2.3.1
+[2.3.1...master]: https://github.com/ergebnis/composer-normalize/compare/2.3.1...master
 
 [#1]: https://github.com/ergebnis/composer-normalize/pull/1
 [#2]: https://github.com/ergebnis/composer-normalize/pull/2
@@ -414,6 +424,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [#354]: https://github.com/ergebnis/composer-normalize/pull/354
 [#364]: https://github.com/ergebnis/composer-normalize/pull/364
 [#374]: https://github.com/ergebnis/composer-normalize/pull/374
+[#379]: https://github.com/ergebnis/composer-normalize/pull/379
 
 [@ergebnis]: https://github.com/ergebnis
 [@ergebnis-bot]: https://github.com/ergebnis-bot

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-COMPOSER_VERSION:=1.10.0
+COMPOSER_VERSION:=1.10.1
 
 .PHONY: it
 it: coding-standards dependency-analysis static-code-analysis tests ## Runs the coding-standards, dependency-analysis, static-code-analysis, and tests targets

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     "localheinz/diff": "^1.0.1"
   },
   "require-dev": {
-    "composer/composer": "^1.10.0",
+    "composer/composer": "^1.10.1",
     "ergebnis/license": "~0.1.0",
     "ergebnis/php-cs-fixer-config": "^2.1.0",
     "ergebnis/phpstan-rules": "~0.14.3",

diff --git a/composer.lock b/composer.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ on: # yamllint disable-line rule:truthy @@
           - "**"
     env:
-      COMPOSER_VERSION: "1.10.0"
+      COMPOSER_VERSION: "1.10.1"
       REQUIRED_PHP_EXTENSIONS: "mbstring"
     jobs:
@@ Expand Down @@