From a128acaa8469a2818374374970ab346f6be3a3df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 19 Mar 2022 12:24:05 +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 065d925a..19b31a85 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.2.5" + COMPOSER_VERSION: "2.2.9" steps: - name: "Checkout" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2b369133..65733887 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.2.5" + COMPOSER_VERSION: "2.2.9" GPG_KEYS: ".build/phar/keys.asc" GPG_KEYS_ENCRYPTED: "phar/keys.asc.gpg" diff --git a/CHANGELOG.md b/CHANGELOG.md index 9907930b..eb81622a 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.24.0...main`][2.24.0...main]. +### Fixed + +- Required `composer/composer:2.2.9` for compiling `composer-normalize.phar` ([#904]), by [@localheinz] + ## [`2.24.0`][2.24.0] For a full diff see [`2.23.1...2.24.0`][2.23.1...2.24.0]. @@ -854,6 +858,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#871]: https://github.com/ergebnis/composer-normalize/pull/871 [#875]: https://github.com/ergebnis/composer-normalize/pull/875 [#899]: https://github.com/ergebnis/composer-normalize/pull/899 +[#904]: https://github.com/ergebnis/composer-normalize/pull/904 [@core23]: https://github.com/core23 [@dependabot]: https://github.com/dependabot diff --git a/Makefile b/Makefile index e32d2eaa..b4fe3ef6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -COMPOSER_VERSION:=2.2.5 +COMPOSER_VERSION:=2.2.9 .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 c2c9b46c..75e2ee38 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "localheinz/diff": "^1.1.1" }, "require-dev": { - "composer/composer": "^2.2.5", + "composer/composer": "^2.2.9", "ergebnis/license": "^1.2.0", "ergebnis/php-cs-fixer-config": "^3.4.0", "fakerphp/faker": "^1.19.0", diff --git a/composer.lock b/composer.lock index 1e852051..4cf4e6e2 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": "39cdeaa596a28d6bd23f57fd74d7aa7e", + "content-hash": "b2de750cc3931919834208b3b1523243", "packages": [ { "name": "ergebnis/json-normalizer", @@ -581,16 +581,16 @@ }, { "name": "composer/composer", - "version": "2.2.5", + "version": "2.2.9", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "22c41ef275c7bb64fa28fb2c0871a39666832cb9" + "reference": "07eccf080ad63d55d95a7c9133506db7d9029264" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/22c41ef275c7bb64fa28fb2c0871a39666832cb9", - "reference": "22c41ef275c7bb64fa28fb2c0871a39666832cb9", + "url": "https://api.github.com/repos/composer/composer/zipball/07eccf080ad63d55d95a7c9133506db7d9029264", + "reference": "07eccf080ad63d55d95a7c9133506db7d9029264", "shasum": "" }, "require": { @@ -599,7 +599,7 @@ "composer/pcre": "^1.0", "composer/semver": "^3.0", "composer/spdx-licenses": "^1.2", - "composer/xdebug-handler": "^2.0", + "composer/xdebug-handler": "^2.0 || ^3.0", "justinrainbow/json-schema": "^5.2.11", "php": "^5.3.2 || ^7.0 || ^8.0", "psr/log": "^1.0 || ^2.0", @@ -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.5" + "source": "https://github.com/composer/composer/tree/2.2.9" }, "funding": [ { @@ -676,7 +676,7 @@ "type": "tidelift" } ], - "time": "2022-01-21T16:25:52+00:00" + "time": "2022-03-15T21:13:37+00:00" }, { "name": "composer/metadata-minifier",