Merge pull request #875 from ergebnis/fix/allow-plugins

Fix: Prevent updates of `ergebnis/json-normalizer` for now
ergebnis · Jan 31, 2022 · a54e28d · a54e28d
2 parents 61964cb + 232720c
commit a54e28d
Show file tree

Hide file tree

Showing 22 changed files with 200 additions and 24 deletions.
diff --git 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
@@ -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
diff --git a/.../Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/fixture/composer.json b/.../Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/fixture/composer.json
@@ -20,7 +20,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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/...egration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/fixture/composer.json b/...egration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/fixture/composer.json
@@ -17,7 +17,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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/...mmand/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/fixture/composer.json b/...mmand/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/fixture/composer.json
@@ -18,7 +18,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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/...ation/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/fixture/composer.json b/...ation/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/fixture/composer.json
@@ -20,7 +20,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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/...gration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/fixture/composer.json b/...gration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/fixture/composer.json
@@ -17,7 +17,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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/...n/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/fixture/composer.json b/...n/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/fixture/composer.json
@@ -18,7 +18,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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/...ation/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/fixture/composer.json b/...ation/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/fixture/composer.json
@@ -20,7 +20,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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
@@ -18,7 +18,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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
@@ -18,7 +18,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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/.../NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/fixture/composer.json b/.../NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/fixture/composer.json
@@ -18,7 +18,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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/...d/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/fixture/composer.json b/...d/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/fixture/composer.json
@@ -12,7 +12,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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/...eCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/fixture/composer.json b/...eCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/fixture/composer.json
@@ -18,7 +18,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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/...alid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/fixture/composer.json b/...alid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/fixture/composer.json
@@ -13,7 +13,16 @@
   "_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
+    }
+  },
+  "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/...d/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/fixture/composer.json b/...d/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/fixture/composer.json
@@ -11,12 +11,18 @@
     "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": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "ergebnis/composer-normalize": true,
+      "ergebnis/*": false
     }
   }
 }
diff --git a/.../Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/fixture/composer.json b/.../Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/fixture/composer.json
@@ -18,7 +18,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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/...d/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/fixture/composer.json b/...d/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/fixture/composer.json
@@ -18,7 +18,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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/...zeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/fixture/composer.json b/...zeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/fixture/composer.json
@@ -18,7 +18,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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
@@ -12,7 +12,16 @@
   },
   "config": {
     "allow-plugins": {
-      "ergebnis/composer-normalize": true
+      "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"
     }
   }
 }