From ac90c18b1e285b22b7650b119863b9b214e2492d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 30 Mar 2022 15:50:53 +0200 Subject: [PATCH] Fix: Update composer/composer --- .github/workflows/integrate.yaml | 2 +- .github/workflows/release.yaml | 2 +- CHANGELOG.md | 15 +++++++++++++-- Makefile | 2 +- composer.json | 2 +- composer.lock | 16 ++++++++-------- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 6cede763..0f0d70bc 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -147,7 +147,7 @@ jobs: env: COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar" - COMPOSER_VERSION: "2.3.0" + COMPOSER_VERSION: "2.3.1" steps: - name: "Checkout" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5c86369e..23467bd1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,7 +24,7 @@ jobs: env: COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar" COMPOSER_NORMALIZE_PHAR_SIGNATURE: ".build/phar/composer-normalize.phar.asc" - COMPOSER_VERSION: "2.3.0" + COMPOSER_VERSION: "2.3.1" GPG_KEYS: ".build/phar/keys.asc" GPG_KEYS_ENCRYPTED: "phar/keys.asc.gpg" diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dcd6077..277531b4 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.25.0...main`][2.25.0...main]. +For a full diff see [`2.25.1...main`][2.25.1...main]. + +## [`2.25.1`][2.25.1] + +For a full diff see [`2.25.0...2.25.1`][2.25.0....2.25.1]. + +### Changed + +- Required `composer/composer:2.3.1` for compiling `composer-normalize.phar` ([#915]), by [@localheinz] ## [`2.25.0`][2.25.0] @@ -713,6 +721,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.24.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.24.0 [2.24.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.24.1 [2.25.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.25.0 +[2.25.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.25.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 @@ -781,7 +790,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.23.0...2.23.1]: https://github.com/ergebnis/composer-normalize/compare/2.23.0...2.23.1 [2.23.1...2.24.0]: https://github.com/ergebnis/composer-normalize/compare/2.23.1...2.24.0 [2.24.0...2.24.1]: https://github.com/ergebnis/composer-normalize/compare/2.24.0...2.24.1 -[2.24.1...2.25.0]: https://github.com/ergebnis/composer-normalize/compare/2.24.1...2.25.10 +[2.24.1...2.25.0]: https://github.com/ergebnis/composer-normalize/compare/2.24.1...2.25.0 +[2.25.0...2.25.1]: https://github.com/ergebnis/composer-normalize/compare/2.25.0...2.25.1 [2.25.0...main]: https://github.com/ergebnis/composer-normalize/compare/2.25.0...main [#1]: https://github.com/ergebnis/composer-normalize/pull/1 @@ -882,6 +892,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#905]: https://github.com/ergebnis/composer-normalize/pull/905 [#912]: https://github.com/ergebnis/composer-normalize/pull/912 [#913]: https://github.com/ergebnis/composer-normalize/pull/913 +[#915]: https://github.com/ergebnis/composer-normalize/pull/915 [@core23]: https://github.com/core23 [@dependabot]: https://github.com/dependabot diff --git a/Makefile b/Makefile index 12acac42..17eb281f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -COMPOSER_VERSION:=2.3.0 +COMPOSER_VERSION:=2.3.1 .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 90365f9b..29c23ec6 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "localheinz/diff": "^1.1.1" }, "require-dev": { - "composer/composer": "^2.3.0", + "composer/composer": "^2.3.1", "ergebnis/license": "^1.2.0", "ergebnis/php-cs-fixer-config": "^4.4.0", "fakerphp/faker": "^1.19.0", diff --git a/composer.lock b/composer.lock index 21098c7c..f7bbf03a 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": "c38db0a5ce8fb08c49b705a0176f2e96", + "content-hash": "5d7b9acfe9bc375bf2dd22c144f5b004", "packages": [ { "name": "ergebnis/json-normalizer", @@ -581,16 +581,16 @@ }, { "name": "composer/composer", - "version": "2.3.0", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "934ee6eed3c3ffd0aeccef7c1d255adcf0752b24" + "reference": "d6c572e5f5d6d1a27bb7a1fbd1c74f777a26d436" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/934ee6eed3c3ffd0aeccef7c1d255adcf0752b24", - "reference": "934ee6eed3c3ffd0aeccef7c1d255adcf0752b24", + "url": "https://api.github.com/repos/composer/composer/zipball/d6c572e5f5d6d1a27bb7a1fbd1c74f777a26d436", + "reference": "d6c572e5f5d6d1a27bb7a1fbd1c74f777a26d436", "shasum": "" }, "require": { @@ -666,7 +666,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.3.0" + "source": "https://github.com/composer/composer/tree/2.3.1" }, "funding": [ { @@ -682,7 +682,7 @@ "type": "tidelift" } ], - "time": "2022-03-30T09:15:36+00:00" + "time": "2022-03-30T13:41:28+00:00" }, { "name": "composer/metadata-minifier", @@ -5869,5 +5869,5 @@ "platform-overrides": { "php": "7.4.26" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" }