From 58585f960daf08a6990dc715dd591b7c25ecab25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 12 Dec 2022 08:49:53 +0100 Subject: [PATCH] Fix: Adjust ComposerJsonNormalizer to stop sorting config.preferred-install --- CHANGELOG.md | 1 + src/Vendor/Composer/ComposerJsonNormalizer.php | 1 + .../Config/PreferredInstall/IsObject/normalized.json | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfb72c33..71676edb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ For a full diff see [`3.0.0...main`][3.0.0...main]. - Adjusted `Vendor\Composer\ComposerJsonNormalizer` to stop sorting `scripts.auto-scripts` ([#776]), by [@localheinz] - Adjusted `Vendor\Composer\ComposerJsonNormalizer` to stop sorting `extra.installer-paths` ([#777]), by [@localheinz] - Adjusted `Vendor\Composer\ComposerJsonNormalizer` to stop sorting `config.allow-plugins` ([#778]), by [@localheinz] +- Adjusted `Vendor\Composer\ComposerJsonNormalizer` to stop sorting `config.preferred-install` ([#779]), by [@localheinz] ### Removed diff --git a/src/Vendor/Composer/ComposerJsonNormalizer.php b/src/Vendor/Composer/ComposerJsonNormalizer.php index d3b5e4bb..7767e39d 100644 --- a/src/Vendor/Composer/ComposerJsonNormalizer.php +++ b/src/Vendor/Composer/ComposerJsonNormalizer.php @@ -32,6 +32,7 @@ public function __construct(string $schemaUri) new SchemaValidator\SchemaValidator(), Pointer\Specification::anyOf( Pointer\Specification::equals(Pointer\JsonPointer::fromJsonString('/config/allow-plugins')), + Pointer\Specification::equals(Pointer\JsonPointer::fromJsonString('/config/preferred-install')), Pointer\Specification::equals(Pointer\JsonPointer::fromJsonString('/extra/installer-paths')), Pointer\Specification::equals(Pointer\JsonPointer::fromJsonString('/scripts/auto-scripts')), ), diff --git a/test/Fixture/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizes/Config/PreferredInstall/IsObject/normalized.json b/test/Fixture/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizes/Config/PreferredInstall/IsObject/normalized.json index a7249090..4c39a5b0 100644 --- a/test/Fixture/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizes/Config/PreferredInstall/IsObject/normalized.json +++ b/test/Fixture/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizes/Config/PreferredInstall/IsObject/normalized.json @@ -16,11 +16,11 @@ "homepage": "https://getcomposer.org/doc/06-config.md#preferred-install", "config": { "preferred-install": { - "*": "dist", + "foo/something-longer-but-alphabetically-after-package-*": "source", "foo/*": "dist", "foo/package-*": "source", "foo/package-one": "dist", - "foo/something-longer-but-alphabetically-after-package-*": "source" + "*": "dist" } } }