diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index a6d0fe14..287f8edc 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.13" + COMPOSER_VERSION: "1.10.15" 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 4ccea4da..0b780dab 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.13" + COMPOSER_VERSION: "1.10.15" PHP_EXTENSIONS: "mbstring" PHP_INI_VALUES: "memory_limit=-1, phar.readonly=0" diff --git a/CHANGELOG.md b/CHANGELOG.md index 233d538d..d6a70a77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,10 @@ For a full diff see [`2.8.2...2.9.0`][2.8.2...2.9.0]. * Updated `schema.json` ([#572]), by [@ergebnis-bot] +### Fixed + +* Required at least `composer/composer:^1.10.15` and use `composer/composer:1.10.15` for PHAR ([#582]), by [@localheinz] + ## [`2.8.2`][2.8.2] For a full diff see [`2.8.1...2.8.2`][2.8.1...2.8.2]. @@ -570,6 +574,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#529]: https://github.com/ergebnis/composer-normalize/pull/529 [#554]: https://github.com/ergebnis/composer-normalize/pull/554 [#572]: https://github.com/ergebnis/composer-normalize/pull/572 +[#582]: https://github.com/ergebnis/composer-normalize/pull/582 [@core23]: https://github.com/core23 [@dependabot]: https://github.com/dependabot diff --git a/Makefile b/Makefile index 3dd4d7d6..ab8e560a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -COMPOSER_VERSION:=1.10.13 +COMPOSER_VERSION:=1.10.15 .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 45f90051..0380d337 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "localheinz/diff": "^1.1.1" }, "require-dev": { - "composer/composer": "^1.10.13 || ^2.0.0", + "composer/composer": "^1.10.15 || ^2.0.0", "composer/package-versions-deprecated": "^1.11.99", "ergebnis/license": "^1.1.0", "ergebnis/php-cs-fixer-config": "^2.3.0", diff --git a/composer.lock b/composer.lock index fe4bc490..5ac5be51 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": "f77e87f4ecc63dd736a023237816ac52", + "content-hash": "a74696fb90c670ef7e2e3029caced5de", "packages": [ { "name": "ergebnis/json-normalizer", @@ -480,16 +480,16 @@ }, { "name": "composer/composer", - "version": "1.10.13", + "version": "1.10.15", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "47c841ba3b2d3fc0b4b13282cf029ea18b66d78b" + "reference": "547c9ee73fe26c77af09a0ea16419176b1cdbd12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/47c841ba3b2d3fc0b4b13282cf029ea18b66d78b", - "reference": "47c841ba3b2d3fc0b4b13282cf029ea18b66d78b", + "url": "https://api.github.com/repos/composer/composer/zipball/547c9ee73fe26c77af09a0ea16419176b1cdbd12", + "reference": "547c9ee73fe26c77af09a0ea16419176b1cdbd12", "shasum": "" }, "require": { @@ -570,7 +570,7 @@ "type": "tidelift" } ], - "time": "2020-09-09T09:46:34+00:00" + "time": "2020-10-13T13:59:09+00:00" }, { "name": "composer/package-versions-deprecated",