Merge pull request #316 from ergebnis/feature/json-normalizer

Enhancement: Remove dependency on ergebnis/composer-json-normalizer
ergebnis · Jan 9, 2020 · 139de17 · 139de17
2 parents eb6ecb9 + 826b8d8
commit 139de17
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 78 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-For a full diff see [`2.2.0...master`][2.2.0...master].
+For a full diff see [`2.2.1...master`][2.2.1...master].
+
+## [`2.2.1`][2.2.1]
+
+For a full diff see [`2.2.0...2.2.1`][2.2.0...2.2.1].
+
+### Changed
+
+* Removed dependency on `ergebnis/composer-json-normalizer` ([#316]), by [@localheinz]
 
 ## [`2.2.0`][2.2.0]
 
@@ -293,6 +301,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [2.1.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.1.1
 [2.1.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.1.2
 [2.2.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.2.0
+[2.2.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.2.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
@@ -319,7 +328,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [2.1.0...2.1.1]: https://github.com/ergebnis/composer-normalize/compare/2.1.0...2.1.1
 [2.1.1...2.1.2]: https://github.com/ergebnis/composer-normalize/compare/2.1.1...2.1.2
 [2.1.2...2.2.0]: https://github.com/ergebnis/composer-normalize/compare/2.1.2...2.2.0
-[2.2.0...master]: https://github.com/ergebnis/composer-normalize/compare/2.2.0...master
+[2.2.0...2.2.1]: https://github.com/ergebnis/composer-normalize/compare/2.2.0...2.2.1
+[2.2.1...master]: https://github.com/ergebnis/composer-normalize/compare/2.2.1...master
 
 [#1]: https://github.com/ergebnis/composer-normalize/pull/1
 [#2]: https://github.com/ergebnis/composer-normalize/pull/2
@@ -360,6 +370,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [#297]: https://github.com/ergebnis/composer-normalize/pull/297
 [#301]: https://github.com/ergebnis/composer-normalize/pull/301
 [#303]: https://github.com/ergebnis/composer-normalize/pull/303
+[#316]: https://github.com/ergebnis/composer-normalize/pull/316
 
 [@ergebnis]: https://github.com/ergebnis
 [@localheinz]: https://github.com/localheinz

diff --git a/composer.json b/composer.json
@@ -19,8 +19,7 @@
   "require": {
     "php": "^7.1",
     "composer-plugin-api": "^1.1.0",
-    "ergebnis/composer-json-normalizer": "^2.0.1",
-    "ergebnis/json-normalizer": "~0.10.1",
+    "ergebnis/json-normalizer": "~0.11.0",
     "ergebnis/json-printer": "^3.0.2",
     "localheinz/diff": "^1.0.1"
   },

diff --git a/composer.lock b/composer.lock
diff --git a/phar/composer-normalize.php b/phar/composer-normalize.php
@@ -12,7 +12,6 @@
  */
 
 use Composer\Factory;
-use Ergebnis\Composer\Json;
 use Ergebnis\Composer\Normalize;
 use Ergebnis\Json\Normalizer;
 use Ergebnis\Json\Printer;
@@ -23,7 +22,7 @@
 
 $command = new Normalize\Command\NormalizeCommand(
     new Factory(),
-    new Json\Normalizer\ComposerJsonNormalizer(__DIR__ . '/../resource/schema.json'),
+    new Normalizer\Vendor\Composer\ComposerJsonNormalizer(__DIR__ . '/../resource/schema.json'),
     new Normalizer\Format\Formatter(new Printer\Printer()),
     new Diff\Differ(new Diff\Output\StrictUnifiedDiffOutputBuilder([
         'fromFile' => 'original',

diff --git a/src/NormalizePlugin.php b/src/NormalizePlugin.php
@@ -17,7 +17,6 @@
 use Composer\Factory;
 use Composer\IO;
 use Composer\Plugin;
-use Ergebnis\Composer\Json\Normalizer\ComposerJsonNormalizer;
 use Ergebnis\Json\Normalizer;
 use Ergebnis\Json\Printer;
 use Localheinz\Diff;
@@ -40,7 +39,7 @@ public function getCommands(): array
         return [
             new Command\NormalizeCommand(
                 new Factory(),
-                new ComposerJsonNormalizer(\sprintf(
+                new Normalizer\Vendor\Composer\ComposerJsonNormalizer(\sprintf(
                     'file://%s',
                     __DIR__ . '/../resource/schema.json'
                 )),