From 0dada1be9037810e6125496c0e3a9ac44ddb9e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sun, 3 Jul 2022 12:12:35 +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 | 21 +++++++++++++-------- 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 2a342775..90a5150b 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.5" + COMPOSER_VERSION: "2.3.8" steps: - name: "Checkout" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4789e252..1b672554 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.5" + COMPOSER_VERSION: "2.3.8" GPG_KEYS: ".build/phar/keys.asc" GPG_KEYS_ENCRYPTED: "phar/keys.asc.gpg" diff --git a/CHANGELOG.md b/CHANGELOG.md index dc7a377b..57afda47 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.28.1...main`][2.28.1...main]. +For a full diff see [`2.28.2...main`][2.28.2...main]. + +## [`2.28.2`][2.28.2] + +For a full diff see [`2.28.1...2.28.2`][2.28.1...2.28.2]. + +### Fixed + +- Required `composer/composer:2.3.8` for compiling `composer-normalize.phar` ([#941]), by [@localheinz] ## [`2.28.1`][2.28.1] @@ -772,6 +780,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.27.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.27.0 [2.28.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.28.0 [2.28.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.28.1 +[2.28.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.28.2 [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 @@ -847,7 +856,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.26.0...2.27.0]: https://github.com/ergebnis/composer-normalize/compare/2.26.0...2.27.0 [2.27.0...2.28.0]: https://github.com/ergebnis/composer-normalize/compare/2.27.0...2.28.0 [2.28.0...2.28.1]: https://github.com/ergebnis/composer-normalize/compare/2.28.0...2.28.1 -[2.28.1...main]: https://github.com/ergebnis/composer-normalize/compare/2.28.1...main +[2.28.1...2.28.2]: https://github.com/ergebnis/composer-normalize/compare/2.28.1...2.28.2 +[2.28.2...main]: https://github.com/ergebnis/composer-normalize/compare/2.28.2...main [#1]: https://github.com/ergebnis/composer-normalize/pull/1 [#2]: https://github.com/ergebnis/composer-normalize/pull/2 @@ -956,6 +966,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#930]: https://github.com/ergebnis/composer-normalize/pull/930 [#933]: https://github.com/ergebnis/composer-normalize/pull/933 [#938]: https://github.com/ergebnis/composer-normalize/pull/938 +[#941]: https://github.com/ergebnis/composer-normalize/pull/941 [@core23]: https://github.com/core23 [@dependabot]: https://github.com/dependabot diff --git a/Makefile b/Makefile index 169d7a7d..923c73da 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -COMPOSER_VERSION:=2.3.5 +COMPOSER_VERSION:=2.3.8 .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 d5c95e17..2990a591 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "localheinz/diff": "^1.1.1" }, "require-dev": { - "composer/composer": "^2.3.5", + "composer/composer": "^2.3.8", "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 32775f45..0cc35bc6 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": "a6474c1079e62ffb4ba7f4a07c44d99b", + "content-hash": "e5e771f9835723d70aec9f67796d8150", "packages": [ { "name": "ergebnis/json-normalizer", @@ -581,16 +581,16 @@ }, { "name": "composer/composer", - "version": "2.3.5", + "version": "2.3.8", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "50c47b1f907cfcdb8f072b88164d22b527557ae1" + "reference": "f69e63262dadd02b3b6edade339c7badda2939c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/50c47b1f907cfcdb8f072b88164d22b527557ae1", - "reference": "50c47b1f907cfcdb8f072b88164d22b527557ae1", + "url": "https://api.github.com/repos/composer/composer/zipball/f69e63262dadd02b3b6edade339c7badda2939c2", + "reference": "f69e63262dadd02b3b6edade339c7badda2939c2", "shasum": "" }, "require": { @@ -606,7 +606,7 @@ "react/promise": "^2.8", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.2", - "symfony/console": "^5.4.1 || ^6.0", + "symfony/console": "^5.4.7 || ^6.0.7", "symfony/filesystem": "^5.4 || ^6.0", "symfony/finder": "^5.4 || ^6.0", "symfony/polyfill-php73": "^1.24", @@ -633,6 +633,11 @@ "extra": { "branch-alias": { "dev-main": "2.3-dev" + }, + "phpstan": { + "includes": [ + "phpstan/rules.neon" + ] } }, "autoload": { @@ -666,7 +671,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.5" + "source": "https://github.com/composer/composer/tree/2.3.8" }, "funding": [ { @@ -682,7 +687,7 @@ "type": "tidelift" } ], - "time": "2022-04-13T14:43:00+00:00" + "time": "2022-07-01T10:10:47+00:00" }, { "name": "composer/metadata-minifier",