From 522155ec417b0eb3237e67af1781e87fa6cea81b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 6 Mar 2021 13:53:45 +0000 Subject: [PATCH 1/2] composer(deps): bump ergebnis/json-normalizer from 1.0.2 to 1.0.3 Bumps [ergebnis/json-normalizer](https://github.com/ergebnis/json-normalizer) from 1.0.2 to 1.0.3. - [Release notes](https://github.com/ergebnis/json-normalizer/releases) - [Changelog](https://github.com/ergebnis/json-normalizer/blob/main/CHANGELOG.md) - [Commits](https://github.com/ergebnis/json-normalizer/compare/1.0.2...1.0.3) Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 30 +++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 3a1f10c9..3d104799 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "require": { "php": "^7.2 || ^8.0", "composer-plugin-api": "^1.1.0 || ^2.0.0", - "ergebnis/json-normalizer": "^1.0.2", + "ergebnis/json-normalizer": "^1.0.3", "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 ac7b2979..22620c9f 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": "75d76bca0c5240e40afee2271b48d8ef", + "content-hash": "e12cc096e4007ba5c07e339bda2fbefa", "packages": [ { "name": "ergebnis/json-normalizer", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/ergebnis/json-normalizer.git", - "reference": "6da58f6b555959c07724181744664e732555d0be" + "reference": "4a7f064ce34d5a2e382564565cdd433dbc5b9494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/6da58f6b555959c07724181744664e732555d0be", - "reference": "6da58f6b555959c07724181744664e732555d0be", + "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/4a7f064ce34d5a2e382564565cdd433dbc5b9494", + "reference": "4a7f064ce34d5a2e382564565cdd433dbc5b9494", "shasum": "" }, "require": { @@ -34,11 +34,11 @@ "infection/infection": "~0.15.3", "jangregor/phpstan-prophecy": "~0.8.1", "phpstan/extension-installer": "^1.1.0", - "phpstan/phpstan": "~0.12.60", + "phpstan/phpstan": "~0.12.80", "phpstan/phpstan-deprecation-rules": "~0.12.6", "phpstan/phpstan-phpunit": "~0.12.17", - "phpstan/phpstan-strict-rules": "~0.12.7", - "phpunit/phpunit": "^8.5.13", + "phpstan/phpstan-strict-rules": "~0.12.9", + "phpunit/phpunit": "^8.5.14", "psalm/plugin-phpunit": "~0.12.2", "vimeo/psalm": "^3.18" }, @@ -64,13 +64,17 @@ "json", "normalizer" ], + "support": { + "issues": "https://github.com/ergebnis/json-normalizer/issues", + "source": "https://github.com/ergebnis/json-normalizer" + }, "funding": [ { "url": "https://github.com/localheinz", "type": "github" } ], - "time": "2020-12-31T09:27:51+00:00" + "time": "2021-03-06T13:33:57+00:00" }, { "name": "ergebnis/json-printer", @@ -129,6 +133,10 @@ "json", "printer" ], + "support": { + "issues": "https://github.com/ergebnis/json-printer/issues", + "source": "https://github.com/ergebnis/json-printer" + }, "funding": [ { "url": "https://github.com/localheinz", @@ -201,6 +209,10 @@ "json", "schema" ], + "support": { + "issues": "https://github.com/justinrainbow/json-schema/issues", + "source": "https://github.com/justinrainbow/json-schema/tree/5.2.10" + }, "time": "2020-05-27T16:41:55+00:00" }, { From d8c1d834ab7d9789444bdde45a6b439e83d143c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 6 Mar 2021 14:56:44 +0100 Subject: [PATCH 2/2] Fix: Update CHANGELOG.md --- CHANGELOG.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62e7026e..3eda5b3b 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.13.2...main`][2.13.2...main]. +For a full diff see [`2.13.3...main`][2.13.3...main]. + +## [`2.13.3`][2.13.3] + +For a full diff see [`2.13.2...2.13.3`][2.13.2...2.13.3]. + +### Fixed + +* Required `ergebnis/json-normalizer:^1.0.3` which correctly sorts `composer-plugin-api` ([#707]), by [@dependabot] ## [`2.13.2`][2.13.2] @@ -553,6 +561,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.13.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.13.0 [2.13.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.13.1 [2.13.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.13.2 +[2.13.3]: https://github.com/ergebnis/composer-normalize/releases/tag/2.13.3 [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 @@ -606,7 +615,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.12.2...2.13.0]: https://github.com/ergebnis/composer-normalize/compare/2.12.2...2.13.0 [2.13.0...2.13.1]: https://github.com/ergebnis/composer-normalize/compare/2.13.0...2.13.1 [2.13.1...2.13.2]: https://github.com/ergebnis/composer-normalize/compare/2.13.1...2.13.2 -[2.13.2...main]: https://github.com/ergebnis/composer-normalize/compare/2.13.2...main +[2.13.2...2.13.3]: https://github.com/ergebnis/composer-normalize/compare/2.13.2...2.13.3 +[2.13.3...main]: https://github.com/ergebnis/composer-normalize/compare/2.13.3...main [#1]: https://github.com/ergebnis/composer-normalize/pull/1 [#2]: https://github.com/ergebnis/composer-normalize/pull/2 @@ -683,6 +693,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#644]: https://github.com/ergebnis/composer-normalize/pull/644 [#646]: https://github.com/ergebnis/composer-normalize/pull/646 [#647]: https://github.com/ergebnis/composer-normalize/pull/647 +[#707]: https://github.com/ergebnis/composer-normalize/pull/707 [@core23]: https://github.com/core23 [@dependabot]: https://github.com/dependabot