diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 2e86769b..41d7c5cc 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -9,7 +9,7 @@ on: # yamllint disable-line rule:truthy - "master" env: - COMPOSER_VERSION: "1.10.0" + COMPOSER_VERSION: "1.10.1" REQUIRED_PHP_EXTENSIONS: "mbstring" jobs: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 78772539..d44ccd3f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,7 +8,7 @@ on: # yamllint disable-line rule:truthy - "**" env: - COMPOSER_VERSION: "1.10.0" + COMPOSER_VERSION: "1.10.1" REQUIRED_PHP_EXTENSIONS: "mbstring" jobs: diff --git a/CHANGELOG.md b/CHANGELOG.md index d82eee00..bfe38c70 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.3.0...master`][2.3.0...master]. +For a full diff see [`2.3.1...master`][2.3.1...master]. + +## [`2.3.1`][2.3.1] + +For a full diff see [`2.3.0...2.3.1`][2.3.0...2.3.1]. + +### Fixed + +* Updated `composer/composer` ([#379]), by [@localheinz] ## [`2.3.0`][2.3.0] @@ -337,6 +345,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.2.3]: https://github.com/ergebnis/composer-normalize/releases/tag/2.2.3 [2.2.4]: https://github.com/ergebnis/composer-normalize/releases/tag/2.2.4 [2.3.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.3.0 +[2.3.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.3.1 [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 @@ -368,7 +377,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.2.2...2.2.3]: https://github.com/ergebnis/composer-normalize/compare/2.2.2...2.2.3 [2.2.3...2.2.4]: https://github.com/ergebnis/composer-normalize/compare/2.2.3...2.2.4 [2.2.4...2.3.0]: https://github.com/ergebnis/composer-normalize/compare/2.2.4...2.3.0 -[2.3.0...master]: https://github.com/ergebnis/composer-normalize/compare/2.3.0...master +[2.3.0...2.3.1]: https://github.com/ergebnis/composer-normalize/compare/2.3.0...2.3.1 +[2.3.1...master]: https://github.com/ergebnis/composer-normalize/compare/2.3.1...master [#1]: https://github.com/ergebnis/composer-normalize/pull/1 [#2]: https://github.com/ergebnis/composer-normalize/pull/2 @@ -414,6 +424,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#354]: https://github.com/ergebnis/composer-normalize/pull/354 [#364]: https://github.com/ergebnis/composer-normalize/pull/364 [#374]: https://github.com/ergebnis/composer-normalize/pull/374 +[#379]: https://github.com/ergebnis/composer-normalize/pull/379 [@ergebnis]: https://github.com/ergebnis [@ergebnis-bot]: https://github.com/ergebnis-bot diff --git a/Makefile b/Makefile index 942911b9..97e6ad80 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -COMPOSER_VERSION:=1.10.0 +COMPOSER_VERSION:=1.10.1 .PHONY: it it: coding-standards dependency-analysis static-code-analysis tests ## Runs the coding-standards, dependency-analysis, static-code-analysis, and tests targets diff --git a/composer.json b/composer.json index 6b5ca9d2..648a5be5 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "localheinz/diff": "^1.0.1" }, "require-dev": { - "composer/composer": "^1.10.0", + "composer/composer": "^1.10.1", "ergebnis/license": "~0.1.0", "ergebnis/php-cs-fixer-config": "^2.1.0", "ergebnis/phpstan-rules": "~0.14.3", diff --git a/composer.lock b/composer.lock index 06cfbbe3..af229069 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": "aef1d309ae82cdb095255afce00d2fd3", + "content-hash": "7d2dad117e17f642bc212a0318e32207", "packages": [ { "name": "ergebnis/json-normalizer", @@ -435,16 +435,16 @@ }, { "name": "composer/composer", - "version": "1.10.0", + "version": "1.10.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "472c917b2a083ec7d2fa25c55fd099d1300e2515" + "reference": "b912a45da3e2b22f5cb5a23e441b697a295ba011" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/472c917b2a083ec7d2fa25c55fd099d1300e2515", - "reference": "472c917b2a083ec7d2fa25c55fd099d1300e2515", + "url": "https://api.github.com/repos/composer/composer/zipball/b912a45da3e2b22f5cb5a23e441b697a295ba011", + "reference": "b912a45da3e2b22f5cb5a23e441b697a295ba011", "shasum": "" }, "require": { @@ -511,7 +511,17 @@ "dependency", "package" ], - "time": "2020-03-10T13:08:05+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2020-03-13T19:34:27+00:00" }, { "name": "composer/semver", @@ -1156,6 +1166,20 @@ "phpunit", "test" ], + "funding": [ + { + "url": "http://paypal.me/localheinz", + "type": "custom" + }, + { + "url": "https://www.buymeacoffee.com/localheinz", + "type": "custom" + }, + { + "url": "https://github.com/localheinz", + "type": "github" + } + ], "time": "2020-03-11T11:08:49+00:00" }, { @@ -4584,5 +4608,6 @@ "platform-dev": [], "platform-overrides": { "php": "7.1.33" - } + }, + "plugin-api-version": "1.1.0" }