From 28f30044750bb35121ce5ce808bbed0f108488c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Tue, 28 Dec 2021 11:35:05 +0100 Subject: [PATCH] Enhancement: Update composer/composer --- .github/workflows/integrate.yaml | 2 +- .github/workflows/release.yaml | 2 +- CHANGELOG.md | 5 +++++ composer.json | 2 +- composer.lock | 17 +++++++++-------- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 5328e595..f883487a 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.1.14" + COMPOSER_VERSION: "2.2.1" 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 198453ff..d1fa6da8 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.1.12" + COMPOSER_VERSION: "2.2.1" PHP_EXTENSIONS: "mbstring" PHP_INI_VALUES: "memory_limit=-1, phar.readonly=0" diff --git a/CHANGELOG.md b/CHANGELOG.md index f7c1ea5c..56a6c504 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.18.0...main`][2.18.0...main]. +### Changed + +- Required `composer/composer:2.2.1` for compiling `composer-normalize.phar` ([#842]), by [@localheinz] + ## [`2.18.0`][2.18.0] ### Changed @@ -769,6 +773,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#816]: https://github.com/ergebnis/composer-normalize/pull/816 [#825]: https://github.com/ergebnis/composer-normalize/pull/825 [#829]: https://github.com/ergebnis/composer-normalize/pull/829 +[#842]: https://github.com/ergebnis/composer-normalize/pull/842 [@core23]: https://github.com/core23 [@dependabot]: https://github.com/dependabot diff --git a/composer.json b/composer.json index e002865e..5379b886 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "localheinz/diff": "^1.1.1" }, "require-dev": { - "composer/composer": "^2.1.14", + "composer/composer": "^2.2.1", "ergebnis/license": "^1.1.0", "ergebnis/php-cs-fixer-config": "^2.14.0", "fakerphp/faker": "^1.17.0", diff --git a/composer.lock b/composer.lock index bf563688..f014e559 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": "88789c9fd48b6c8cd71e04853f0640a8", + "content-hash": "9097482b5cd566c057c7ec7af478d4c8", "packages": [ { "name": "ergebnis/json-normalizer", @@ -521,21 +521,22 @@ }, { "name": "composer/composer", - "version": "2.1.14", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "cd28fc05b0c9d3beaf58b57018725c4dc15a6446" + "reference": "bbc265e16561ab8e0f5e7cac395ea72640251f0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/cd28fc05b0c9d3beaf58b57018725c4dc15a6446", - "reference": "cd28fc05b0c9d3beaf58b57018725c4dc15a6446", + "url": "https://api.github.com/repos/composer/composer/zipball/bbc265e16561ab8e0f5e7cac395ea72640251f0c", + "reference": "bbc265e16561ab8e0f5e7cac395ea72640251f0c", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", "composer/metadata-minifier": "^1.0", + "composer/pcre": "^1.0", "composer/semver": "^3.0", "composer/spdx-licenses": "^1.2", "composer/xdebug-handler": "^2.0", @@ -565,7 +566,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.1-dev" + "dev-main": "2.2-dev" } }, "autoload": { @@ -599,7 +600,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.1.14" + "source": "https://github.com/composer/composer/tree/2.2.1" }, "funding": [ { @@ -615,7 +616,7 @@ "type": "tidelift" } ], - "time": "2021-11-30T09:51:43+00:00" + "time": "2021-12-22T21:21:31+00:00" }, { "name": "composer/metadata-minifier",