diff --git a/CHANGELOG.md b/CHANGELOG.md index bffd8f1a..6a52e040 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.12.1...main`][2.12.1...main]. +For a full diff see [`2.12.2...main`][2.12.2...main]. + +## [`2.12.2`][2.12.2] + +For a full diff see [`2.12.1...2.12.2`][2.12.1...2.12.2]. + +### Fixed + +* Required `ergebnis/json-normalizer:^1.0.1` which ignores the `preferred-install` hash when sorting configuration hashes by key ([#646]), by [@dependabot] ## [`2.12.1`][2.12.1] @@ -519,6 +527,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.11.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.11.0 [2.12.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.12.0 [2.12.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.12.1 +[2.12.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.12.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 @@ -568,7 +577,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.10.0...2.11.0]: https://github.com/ergebnis/composer-normalize/compare/2.10.0...2.11.0 [2.11.0...2.12.0]: https://github.com/ergebnis/composer-normalize/compare/2.11.0...2.12.0 [2.12.0...2.12.1]: https://github.com/ergebnis/composer-normalize/compare/2.12.0...2.12.1 -[2.12.1...main]: https://github.com/ergebnis/composer-normalize/compare/2.12.1...main +[2.12.1...2.12.2]: https://github.com/ergebnis/composer-normalize/compare/2.12.1...2.12.2 +[2.12.2...main]: https://github.com/ergebnis/composer-normalize/compare/2.12.2...main [#1]: https://github.com/ergebnis/composer-normalize/pull/1 [#2]: https://github.com/ergebnis/composer-normalize/pull/2 @@ -642,6 +652,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#640]: https://github.com/ergebnis/composer-normalize/pull/640 [#641]: https://github.com/ergebnis/composer-normalize/pull/641 [#643]: https://github.com/ergebnis/composer-normalize/pull/643 +[#646]: https://github.com/ergebnis/composer-normalize/pull/646 [@core23]: https://github.com/core23 [@dependabot]: https://github.com/dependabot diff --git a/composer.json b/composer.json index 769aa37e..3278feeb 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "require": { "php": "^7.2 || ^8.0", "composer-plugin-api": "^2.0.0", - "ergebnis/json-normalizer": "^1.0.0", + "ergebnis/json-normalizer": "^1.0.1", "ergebnis/json-printer": "^3.1.1", "justinrainbow/json-schema": "^5.2.10", "localheinz/diff": "^1.1.1" diff --git a/composer.lock b/composer.lock index 76e26725..e22334c5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "936cec1276a906a869bfac7ee86ead1d", + "content-hash": "36c09bf747bfac06c436e6a8234ff46f", "packages": [ { "name": "ergebnis/json-normalizer", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/ergebnis/json-normalizer.git", - "reference": "f318c642a59eea14233db5f36749aab20aeed203" + "reference": "f80e5603ab425b49539951b0a684e138be6ee9a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/f318c642a59eea14233db5f36749aab20aeed203", - "reference": "f318c642a59eea14233db5f36749aab20aeed203", + "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/f80e5603ab425b49539951b0a684e138be6ee9a7", + "reference": "f80e5603ab425b49539951b0a684e138be6ee9a7", "shasum": "" }, "require": { @@ -74,7 +74,7 @@ "type": "github" } ], - "time": "2020-12-29T08:08:15+00:00" + "time": "2020-12-30T15:16:58+00:00" }, { "name": "ergebnis/json-printer",