From e43e4b2e1bec684cf2bc90324f2fa06af7c240db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Fri, 15 Sep 2023 11:21:58 +0200 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 9963bd38..a55e91e1 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -165,7 +165,7 @@ jobs: env: COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar" - COMPOSER_VERSION: "2.6.2" + COMPOSER_VERSION: "2.6.3" steps: - name: "Checkout" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index be965957..f41bcddf 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -26,7 +26,7 @@ jobs: env: COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar" COMPOSER_NORMALIZE_PHAR_SIGNATURE: ".build/phar/composer-normalize.phar.asc" - COMPOSER_VERSION: "2.6.2" + COMPOSER_VERSION: "2.6.3" GPG_KEYS: ".build/phar/keys.asc" GPG_KEYS_ENCRYPTED: "phar/keys.asc.gpg" diff --git a/CHANGELOG.md b/CHANGELOG.md index f683879d..f3a2da01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ For a full diff see [`2.36.0...main`][2.36.0...main]. - Updated `schema.json` ([#1170]), by [@ergebnis-bot] +### Fixed + +- Updated `composer/composer` ([#1171]), by [@localheinz] + ## [`2.36.0`][2.36.0] For a full diff see [`2.35.0...2.36.0`][2.35.0...2.36.0]. @@ -1117,6 +1121,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#1155]: https://github.com/ergebnis/composer-normalize/pull/1155 [#1158]: https://github.com/ergebnis/composer-normalize/pull/1158 [#1170]: https://github.com/ergebnis/composer-normalize/pull/1170 +[#1171]: https://github.com/ergebnis/composer-normalize/pull/1171 [@core23]: https://github.com/core23 [@dependabot]: https://github.com/dependabot diff --git a/Makefile b/Makefile index 3d02cde9..552e9a79 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -COMPOSER_VERSION:=2.6.2 +COMPOSER_VERSION:=2.6.3 .PHONY: it it: refactoring coding-standards security-analysis static-code-analysis tests ## Runs the refactoring, coding-standards, security-analysis, static-code-analysis, and tests targets diff --git a/composer.json b/composer.json index 450f89ad..ac0b1208 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "localheinz/diff": "^1.1.1" }, "require-dev": { - "composer/composer": "^2.6.2", + "composer/composer": "^2.6.3", "ergebnis/license": "^2.2.0", "ergebnis/php-cs-fixer-config": "^5.15.1", "ergebnis/phpunit-slow-test-detector": "^2.3.0", diff --git a/composer.lock b/composer.lock index 90b6380e..5333b430 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": "29c1956bad1799a5eb68d24f2c1bfda3", + "content-hash": "8920d6ef98cce80df8fea7d6c8d3d0db", "packages": [ { "name": "ergebnis/json", @@ -864,16 +864,16 @@ }, { "name": "composer/composer", - "version": "2.6.2", + "version": "2.6.3", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "623e5e1de055e65bc6c3c61b8348dc4662d75e2b" + "reference": "ff477832e6d838a736556d4a39a3b80f4412abfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/623e5e1de055e65bc6c3c61b8348dc4662d75e2b", - "reference": "623e5e1de055e65bc6c3c61b8348dc4662d75e2b", + "url": "https://api.github.com/repos/composer/composer/zipball/ff477832e6d838a736556d4a39a3b80f4412abfd", + "reference": "ff477832e6d838a736556d4a39a3b80f4412abfd", "shasum": "" }, "require": { @@ -958,7 +958,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.6.2" + "source": "https://github.com/composer/composer/tree/2.6.3" }, "funding": [ { @@ -974,7 +974,7 @@ "type": "tidelift" } ], - "time": "2023-09-03T12:09:15+00:00" + "time": "2023-09-15T07:38:22+00:00" }, { "name": "composer/metadata-minifier", @@ -6735,5 +6735,5 @@ "platform-overrides": { "php": "8.1.20" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" }