From b18c47bc3bbf033061c7cddb877d8b6bf5c49e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Fri, 21 Jan 2022 19:43:24 +0100 Subject: [PATCH] Fix: Update composer/composer --- .github/workflows/integrate.yaml | 2 +- .github/workflows/release.yaml | 2 +- CHANGELOG.md | 5 +++++ Makefile | 2 +- composer.json | 2 +- composer.lock | 16 ++++++++-------- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index d4ede269..25b0e5f1 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: "2.2.3" + COMPOSER_VERSION: "2.2.5" 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 9e8b3956..6d4f6bc5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,7 +8,7 @@ on: # yamllint disable-line rule:truthy - "**" env: - COMPOSER_VERSION: "2.2.3" + COMPOSER_VERSION: "2.2.5" PHP_EXTENSIONS: "mbstring" PHP_INI_VALUES: "memory_limit=-1, phar.readonly=0" diff --git a/CHANGELOG.md b/CHANGELOG.md index bf775211..9054d0fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), For a full diff see [`2.23.0...main`][2.23.0...main]. +### Fixed + +- Required `composer/composer:2.2.5` for compiling `composer-normalize.phar` ([#871]), by [@localheinz] + ## [`2.23.0`][2.23.0] For a full diff see [`2.22.0...2.23.0`][2.22.0...2.23.0]. @@ -832,6 +836,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#858]: https://github.com/ergebnis/composer-normalize/pull/858 [#863]: https://github.com/ergebnis/composer-normalize/pull/863 [#864]: https://github.com/ergebnis/composer-normalize/pull/864 +[#871]: https://github.com/ergebnis/composer-normalize/pull/871 [@core23]: https://github.com/core23 [@dependabot]: https://github.com/dependabot diff --git a/Makefile b/Makefile index c23b3959..e32d2eaa 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -COMPOSER_VERSION:=2.2.3 +COMPOSER_VERSION:=2.2.5 .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 59727574..554ae113 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "localheinz/diff": "^1.1.1" }, "require-dev": { - "composer/composer": "^2.2.3", + "composer/composer": "^2.2.5", "ergebnis/license": "^1.2.0", "ergebnis/php-cs-fixer-config": "^3.4.0", "fakerphp/faker": "^1.17.0", diff --git a/composer.lock b/composer.lock index 08a608e9..bec6f55c 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": "275be17a6c28a320759b6b7244ab3896", + "content-hash": "a26612ebb7671755b69e88316a049b73", "packages": [ { "name": "ergebnis/json-normalizer", @@ -581,16 +581,16 @@ }, { "name": "composer/composer", - "version": "2.2.3", + "version": "2.2.5", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a" + "reference": "22c41ef275c7bb64fa28fb2c0871a39666832cb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a", - "reference": "3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a", + "url": "https://api.github.com/repos/composer/composer/zipball/22c41ef275c7bb64fa28fb2c0871a39666832cb9", + "reference": "22c41ef275c7bb64fa28fb2c0871a39666832cb9", "shasum": "" }, "require": { @@ -660,7 +660,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.2.3" + "source": "https://github.com/composer/composer/tree/2.2.5" }, "funding": [ { @@ -676,7 +676,7 @@ "type": "tidelift" } ], - "time": "2021-12-31T11:18:53+00:00" + "time": "2022-01-21T16:25:52+00:00" }, { "name": "composer/metadata-minifier", @@ -5837,5 +5837,5 @@ "platform-overrides": { "php": "7.4.26" }, - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" }