Enhancement: Remove dependency on ergebnis/composer-json-normalizer

ergebnis · Jan 9, 2020 · 6ee6c8a · 6ee6c8a
1 parent 4a1f7ff
commit 6ee6c8a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 75 deletions.
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
@@ -23,7 +23,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'
                 )),