From a33c60d3cc62447917b3f37085e9080cbd7ac630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Tue, 22 Sep 2020 11:53:46 +0200 Subject: [PATCH] Fix: Require at least composer/composer:^1.10.13 --- .github/workflows/integrate.yaml | 2 +- .github/workflows/release.yaml | 2 +- CHANGELOG.md | 15 +++++++++++++-- Makefile | 2 +- composer.json | 2 +- composer.lock | 12 ++++++------ 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 75a6af76..68fa9572 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -9,7 +9,7 @@ on: # yamllint disable-line rule:truthy - "main" env: - COMPOSER_VERSION: "1.10.8" + COMPOSER_VERSION: "1.10.13" ERGEBNIS_BOT_NAME: "ergebnis-bot" PHP_EXTENSIONS: "mbstring" PHP_INI_VALUES: "memory_limit=-1, phar.readonly=0" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8ef10898..d1dcfc9d 100644 --- 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.8" + COMPOSER_VERSION: "1.10.13" PHP_EXTENSIONS: "mbstring" PHP_INI_VALUES: "memory_limit=-1, phar.readonly=0" diff --git a/CHANGELOG.md b/CHANGELOG.md index 35410fb7..2aa54b5f 100644 --- 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.8.1...main`][2.8.1...main]. +For a full diff see [`2.8.2...main`][2.8.2...main]. + +## [`2.8.2`][2.8.2] + +For a full diff see [`2.8.1...2.8.2`][2.8.1...2.8.2]. + +### Changed + +* Require at least `composer/composer:^1.10.13` ([#554]), by [@localheinz] ## [`2.8.1`][2.8.1] @@ -443,6 +451,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.7.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.7.0 [2.8.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.8.0 [2.8.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.8.1 +[2.8.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.8.2 [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 @@ -485,7 +494,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.6.1...2.7.0]: https://github.com/ergebnis/composer-normalize/compare/2.6.1...2.7.0 [2.7.0...2.8.0]: https://github.com/ergebnis/composer-normalize/compare/2.7.0...2.8.0 [2.8.0...2.8.1]: https://github.com/ergebnis/composer-normalize/compare/2.8.0...2.8.1 -[2.8.1...main]: https://github.com/ergebnis/composer-normalize/compare/2.8.1...main +[2.8.1...2.8.2]: https://github.com/ergebnis/composer-normalize/compare/2.8.1...2.8.2 +[2.8.2...main]: https://github.com/ergebnis/composer-normalize/compare/2.8.2...main [#1]: https://github.com/ergebnis/composer-normalize/pull/1 [#2]: https://github.com/ergebnis/composer-normalize/pull/2 @@ -548,6 +558,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#515]: https://github.com/ergebnis/composer-normalize/pull/515 [#526]: https://github.com/ergebnis/composer-normalize/pull/526 [#529]: https://github.com/ergebnis/composer-normalize/pull/529 +[#554]: https://github.com/ergebnis/composer-normalize/pull/554 [@core23]: https://github.com/core23 [@dependabot]: https://github.com/dependabot diff --git a/Makefile b/Makefile index f303e200..02f48d86 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -COMPOSER_VERSION:=1.10.8 +COMPOSER_VERSION:=1.10.13 .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 index 2225ece2..66b78c1a 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "localheinz/diff": "^1.1.1" }, "require-dev": { - "composer/composer": "^1.10.8 || ^2.0.0", + "composer/composer": "^1.10.13 || ^2.0.0", "composer/package-versions-deprecated": "^1.11.99", "ergebnis/phpstan-rules": "~0.15.2", "ergebnis/test-util": "^1.1.0", diff --git a/composer.lock b/composer.lock index 3a40bbd8..2153c9ae 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "be51db541d81ba28777dcab403ac8719", + "content-hash": "4bd26a9c5f8a53bbb4600e3723a38412", "packages": [ { "name": "ergebnis/json-normalizer", @@ -330,16 +330,16 @@ }, { "name": "composer/composer", - "version": "1.10.8", + "version": "1.10.13", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "56e0e094478f30935e9128552188355fa9712291" + "reference": "47c841ba3b2d3fc0b4b13282cf029ea18b66d78b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/56e0e094478f30935e9128552188355fa9712291", - "reference": "56e0e094478f30935e9128552188355fa9712291", + "url": "https://api.github.com/repos/composer/composer/zipball/47c841ba3b2d3fc0b4b13282cf029ea18b66d78b", + "reference": "47c841ba3b2d3fc0b4b13282cf029ea18b66d78b", "shasum": "" }, "require": { @@ -420,7 +420,7 @@ "type": "tidelift" } ], - "time": "2020-06-24T19:23:30+00:00" + "time": "2020-09-09T09:46:34+00:00" }, { "name": "composer/package-versions-deprecated",