From 581f13d9170d12fd71459a7a4958c932382f0685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 22 Jan 2022 13:23:16 +0100 Subject: [PATCH 1/3] Fix: Assert that config.allow-plugins is not sorted --- .../Extra/NotValid/AdditionalKeys/fixture/composer.json | 3 ++- .../Extra/NotValid/IndentSize/Missing/fixture/composer.json | 3 ++- .../IndentSize/NotGreaterThanZero/fixture/composer.json | 3 ++- .../Extra/NotValid/IndentSize/NotInteger/fixture/composer.json | 3 ++- .../Extra/NotValid/IndentStyle/Missing/fixture/composer.json | 3 ++- .../NotValid/IndentStyle/NotSpaceOrTab/fixture/composer.json | 3 ++- .../Extra/NotValid/IndentStyle/NotString/fixture/composer.json | 3 ++- .../Extra/Valid/WithOptions/fixture/composer.json | 3 ++- .../Extra/Valid/WithoutOptions/fixture/composer.json | 3 ++- .../NotPresent/Json/AlreadyNormalized/fixture/composer.json | 3 ++- .../NotPresent/Json/NotYetNormalized/fixture/composer.json | 3 ++- .../FreshBefore/Json/AlreadyNormalized/fixture/composer.json | 3 ++- .../NotYetNormalized/Lock/FreshAfter/fixture/composer.json | 3 ++- .../NotYetNormalized/Lock/NotFreshAfter/fixture/composer.json | 3 ++- .../Json/AlreadyNormalized/fixture/composer.json | 3 ++- .../Json/NotYetNormalized/fixture/composer.json | 3 ++- .../NotFreshBefore/WithoutNoCheckLock/fixture/composer.json | 3 ++- .../NormalizeCommand/Normalizer/Throws/fixture/composer.json | 3 ++- .../NormalizeCommand/Options/NotValid/fixture/composer.json | 3 ++- 19 files changed, 38 insertions(+), 19 deletions(-) diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/fixture/composer.json index 929d21a3..3fd23e9b 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/fixture/composer.json @@ -20,7 +20,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/fixture/composer.json index 8161ea80..cc43f0b6 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/fixture/composer.json @@ -17,7 +17,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/fixture/composer.json index 428e471a..a382292a 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/fixture/composer.json @@ -18,7 +18,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/fixture/composer.json index 05ccc289..5282e61e 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/fixture/composer.json @@ -20,7 +20,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/fixture/composer.json index 5530aea4..df8400a5 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/fixture/composer.json @@ -17,7 +17,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/fixture/composer.json index 5649eb45..1eec632b 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/fixture/composer.json @@ -18,7 +18,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/fixture/composer.json index 9642229a..437fe743 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/fixture/composer.json @@ -20,7 +20,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/fixture/composer.json index 8e42d3ec..80bf7491 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/fixture/composer.json @@ -18,7 +18,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/fixture/composer.json index 8e42d3ec..80bf7491 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/fixture/composer.json @@ -18,7 +18,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/fixture/composer.json index 281b4172..b12c50ca 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/fixture/composer.json @@ -18,7 +18,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/fixture/composer.json index d36143cc..3836cd9c 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/fixture/composer.json @@ -12,7 +12,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/fixture/composer.json index b5e04f68..1b6399d7 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/fixture/composer.json @@ -18,7 +18,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/fixture/composer.json index 5d42b22e..0d0c0439 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/fixture/composer.json @@ -13,7 +13,8 @@ "_comment": "This composer.json is valid according to a lax validation, a composer.lock is present and fresh before invoking the command, composer.json is not yet normalized, and composer.lock is still fresh after invoking the command.", "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/fixture/composer.json index dbc04f07..a641f847 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/fixture/composer.json @@ -16,7 +16,8 @@ "_comment": "This composer.json is valid according to a lax validation, a composer.lock is present and fresh before invoking the command, composer.json is not yet normalized, and composer.lock is not fresh after invoking the command.", "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/fixture/composer.json index 8895c9e6..cbed49b9 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/fixture/composer.json @@ -18,7 +18,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/fixture/composer.json index b15f964c..93323d8d 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/fixture/composer.json @@ -18,7 +18,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/fixture/composer.json index 612ebf3b..d2823074 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/fixture/composer.json @@ -18,7 +18,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Normalizer/Throws/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Normalizer/Throws/fixture/composer.json index d36143cc..3836cd9c 100644 --- a/test/Integration/Command/NormalizeCommand/Normalizer/Throws/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Normalizer/Throws/fixture/composer.json @@ -12,7 +12,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } diff --git a/test/Integration/Command/NormalizeCommand/Options/NotValid/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Options/NotValid/fixture/composer.json index d36143cc..3836cd9c 100644 --- a/test/Integration/Command/NormalizeCommand/Options/NotValid/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Options/NotValid/fixture/composer.json @@ -12,7 +12,8 @@ }, "config": { "allow-plugins": { - "ergebnis/composer-normalize": true + "ergebnis/composer-normalize": true, + "ergebnis/*": false } } } From 945b0f1e1384b646cbdc935c4bbaafe6a5ea36c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 31 Jan 2022 07:40:44 +0100 Subject: [PATCH 2/3] Fix: Assert that scripts.auto-scripts is not sorted --- .../Extra/NotValid/AdditionalKeys/fixture/composer.json | 8 ++++++++ .../NotValid/IndentSize/Missing/fixture/composer.json | 8 ++++++++ .../IndentSize/NotGreaterThanZero/fixture/composer.json | 8 ++++++++ .../NotValid/IndentSize/NotInteger/fixture/composer.json | 8 ++++++++ .../NotValid/IndentStyle/Missing/fixture/composer.json | 8 ++++++++ .../IndentStyle/NotSpaceOrTab/fixture/composer.json | 8 ++++++++ .../NotValid/IndentStyle/NotString/fixture/composer.json | 8 ++++++++ .../Extra/Valid/WithOptions/fixture/composer.json | 8 ++++++++ .../Extra/Valid/WithoutOptions/fixture/composer.json | 8 ++++++++ .../Json/AlreadyNormalized/fixture/composer.json | 8 ++++++++ .../Json/NotYetNormalized/fixture/composer.json | 8 ++++++++ .../Json/AlreadyNormalized/fixture/composer.json | 8 ++++++++ .../Lock/FreshAfter/fixture/composer.json | 8 ++++++++ .../Lock/NotFreshAfter/fixture/composer.json | 7 ++++++- .../Json/AlreadyNormalized/fixture/composer.json | 8 ++++++++ .../Json/NotYetNormalized/fixture/composer.json | 8 ++++++++ .../WithoutNoCheckLock/fixture/composer.json | 8 ++++++++ .../Normalizer/Throws/fixture/composer.json | 8 ++++++++ .../Options/NotValid/fixture/composer.json | 8 ++++++++ 19 files changed, 150 insertions(+), 1 deletion(-) diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/fixture/composer.json index 3fd23e9b..2ab7d6dd 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/fixture/composer.json @@ -23,5 +23,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/fixture/composer.json index cc43f0b6..f6ecba43 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/fixture/composer.json @@ -20,5 +20,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/fixture/composer.json index a382292a..b26017cf 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/fixture/composer.json @@ -21,5 +21,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/fixture/composer.json index 5282e61e..1b3ffcfd 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/fixture/composer.json @@ -23,5 +23,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/fixture/composer.json index df8400a5..43e3ba82 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/fixture/composer.json @@ -20,5 +20,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/fixture/composer.json index 1eec632b..5cc66b2a 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/fixture/composer.json @@ -21,5 +21,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/fixture/composer.json index 437fe743..6cf74d3f 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/fixture/composer.json @@ -23,5 +23,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/fixture/composer.json index 80bf7491..e9ebe025 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/fixture/composer.json @@ -21,5 +21,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/fixture/composer.json index 80bf7491..e9ebe025 100644 --- a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/fixture/composer.json @@ -21,5 +21,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/fixture/composer.json index b12c50ca..9b13ceed 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/fixture/composer.json @@ -21,5 +21,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/fixture/composer.json index 3836cd9c..6af419b9 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/fixture/composer.json @@ -15,5 +15,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/fixture/composer.json index 1b6399d7..226e38aa 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/fixture/composer.json @@ -21,5 +21,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/fixture/composer.json index 0d0c0439..7fe07b6e 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/fixture/composer.json @@ -16,5 +16,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/fixture/composer.json index a641f847..b78abad1 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/fixture/composer.json @@ -11,7 +11,12 @@ "php": "^5.6" }, "scripts": { - "hello": "echo 'Hello!'" + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } }, "_comment": "This composer.json is valid according to a lax validation, a composer.lock is present and fresh before invoking the command, composer.json is not yet normalized, and composer.lock is not fresh after invoking the command.", "config": { diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/fixture/composer.json index cbed49b9..35de9af9 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/fixture/composer.json @@ -21,5 +21,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/fixture/composer.json index 93323d8d..8e722e90 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/fixture/composer.json @@ -21,5 +21,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/fixture/composer.json index d2823074..8eafbebe 100644 --- a/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/fixture/composer.json @@ -21,5 +21,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Normalizer/Throws/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Normalizer/Throws/fixture/composer.json index 3836cd9c..6af419b9 100644 --- a/test/Integration/Command/NormalizeCommand/Normalizer/Throws/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Normalizer/Throws/fixture/composer.json @@ -15,5 +15,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } diff --git a/test/Integration/Command/NormalizeCommand/Options/NotValid/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Options/NotValid/fixture/composer.json index 3836cd9c..6af419b9 100644 --- a/test/Integration/Command/NormalizeCommand/Options/NotValid/fixture/composer.json +++ b/test/Integration/Command/NormalizeCommand/Options/NotValid/fixture/composer.json @@ -15,5 +15,13 @@ "ergebnis/composer-normalize": true, "ergebnis/*": false } + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "doctrine:migrations:migrate -v": "symfony-cmd", + "bazinga:js-translation:dump assets --merge-domains --format=json": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + } } } From 232720c650912ce4becd01f83f7f4d46af2d5779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 31 Jan 2022 07:47:49 +0100 Subject: [PATCH 3/3] Fix: Prevent minor updates of ergebnis/json-normalizer for now --- CHANGELOG.md | 12 ++++++++++-- composer.json | 2 +- composer.lock | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9054d0fe..feca3a05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## Unreleased -For a full diff see [`2.23.0...main`][2.23.0...main]. +For a full diff see [`2.23.1...main`][2.23.1...main]. + +## [`2.23.1`][2.23.1] + +For a full diff see [`2.23.0...2.23.1`][2.23.0...2.23.1]. ### Fixed - Required `composer/composer:2.2.5` for compiling `composer-normalize.phar` ([#871]), by [@localheinz] +- Prevented updates of `ergebnis/json-normalizer` beyond `2.1.0` for now ([#877]), by [@localheinz] ## [`2.23.0`][2.23.0] @@ -678,6 +683,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.21.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.21.0 [2.22.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.22.0 [2.23.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.23.0 +[2.23.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.23.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 @@ -743,7 +749,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.20.0...2.21.0]: https://github.com/ergebnis/composer-normalize/compare/2.20.0...2.21.0 [2.21.0...2.22.0]: https://github.com/ergebnis/composer-normalize/compare/2.21.0...2.22.0 [2.22.0...2.23.0]: https://github.com/ergebnis/composer-normalize/compare/2.22.0...2.23.0 -[2.23.0...main]: https://github.com/ergebnis/composer-normalize/compare/2.23.0...main +[2.23.0...2.23.1]: https://github.com/ergebnis/composer-normalize/compare/2.23.0...2.23.1 +[2.23.1...main]: https://github.com/ergebnis/composer-normalize/compare/2.23.1...main [#1]: https://github.com/ergebnis/composer-normalize/pull/1 [#2]: https://github.com/ergebnis/composer-normalize/pull/2 @@ -837,6 +844,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#863]: https://github.com/ergebnis/composer-normalize/pull/863 [#864]: https://github.com/ergebnis/composer-normalize/pull/864 [#871]: https://github.com/ergebnis/composer-normalize/pull/871 +[#875]: https://github.com/ergebnis/composer-normalize/pull/875 [@core23]: https://github.com/core23 [@dependabot]: https://github.com/dependabot diff --git a/composer.json b/composer.json index 3f72b51f..8c847d5f 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "require": { "php": "^7.4 || ^8.0", "composer-plugin-api": "^2.0.0", - "ergebnis/json-normalizer": "^2.1.0", + "ergebnis/json-normalizer": "~2.1.0", "ergebnis/json-printer": "^3.2.0", "justinrainbow/json-schema": "^5.2.11", "localheinz/diff": "^1.1.1" diff --git a/composer.lock b/composer.lock index 49942a8b..97d65ff7 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": "3a9e51d184fe74d4e4f167a35025187f", + "content-hash": "de8c9db9d8fed392a00420f7991d6ab6", "packages": [ { "name": "ergebnis/json-normalizer",