Merge pull request #1056 from ergebnis/dependabot/composer/ergebnis/j…

…son-normalizer-4.0.0 composer(deps): Bump ergebnis/json-normalizer from 2.1.0 to 4.0.0
ergebnis · Feb 26, 2023 · 015cf9d · 015cf9d
2 parents 0c5753f + 9abb427
commit 015cf9d
Show file tree

Hide file tree

Showing 5 changed files with 183 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ For a full diff see [`2.29.0...main`][2.29.0...main].
 
 - Started injecting `Printer\Printer` instead of `Formatter\Formatter` into `NormalizeCommand` ([#1008]), by [@ergebnis-bot]
 - Required `composer/composer:2.5.1` for compiling `composer-normalize.phar` ([#1020]), by [@localheinz]
+- Required `ergebnis/json-normalizer:^4.0.0` ([#1056]), by [@dependabot]
 
 ## [`2.29.0`][2.29.0]
 
@@ -1000,6 +1001,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [#1004]: https://github.com/ergebnis/composer-normalize/pull/1004
 [#1008]: https://github.com/ergebnis/composer-normalize/pull/1008
 [#1020]: https://github.com/ergebnis/composer-normalize/pull/1020
+[#1056]: https://github.com/ergebnis/composer-normalize/pull/1056
 
 [@core23]: https://github.com/core23
 [@dependabot]: https://github.com/dependabot

diff --git a/composer.json b/composer.json
@@ -24,7 +24,8 @@
     "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
     "ext-json": "*",
     "composer-plugin-api": "^2.0.0",
-    "ergebnis/json-normalizer": "~2.1.0",
+    "ergebnis/json": "^1.0.1",
+    "ergebnis/json-normalizer": "~4.0.0",
     "ergebnis/json-printer": "^3.3.0",
     "justinrainbow/json-schema": "^5.2.12",
     "localheinz/diff": "^1.1.1"

diff --git a/composer.lock b/composer.lock
diff --git a/src/Command/NormalizeCommand.php b/src/Command/NormalizeCommand.php
@@ -20,6 +20,7 @@
 use Composer\IO;
 use Ergebnis\Composer\Normalize\Exception;
 use Ergebnis\Composer\Normalize\Version;
+use Ergebnis\Json\Json;
 use Ergebnis\Json\Normalizer;
 use Ergebnis\Json\Printer;
 use Localheinz\Diff;
@@ -32,7 +33,7 @@ final class NormalizeCommand extends Command\BaseCommand
 {
     public function __construct(
         private Factory $factory,
-        private Normalizer\NormalizerInterface $normalizer,
+        private Normalizer\Normalizer $normalizer,
         private Printer\PrinterInterface $printer,
         private Diff\Differ $differ,
     ) {
@@ -185,7 +186,7 @@ protected function execute(
         /** @var string $encoded */
         $encoded = \file_get_contents($composerFile);
 
-        $json = Normalizer\Json::fromEncoded($encoded);
+        $json = Json::fromString($encoded);
 
         $format = Normalizer\Format\Format::fromJson($json);
 
@@ -195,14 +196,14 @@ protected function execute(
 
         $normalizer = new Normalizer\ChainNormalizer(
             $this->normalizer,
-            new class($this->printer, $format) implements Normalizer\NormalizerInterface {
+            new class($this->printer, $format) implements Normalizer\Normalizer {
                 public function __construct(
                     private Printer\PrinterInterface $printer,
                     private Normalizer\Format\Format $format,
                 ) {
                 }
 
-                public function normalize(Normalizer\Json $json): Normalizer\Json
+                public function normalize(Json $json): Json
                 {
                     $encoded = \json_encode(
                         $json->decoded(),
@@ -216,17 +217,17 @@ public function normalize(Normalizer\Json $json): Normalizer\Json
                     );
 
                     if (!$this->format->hasFinalNewLine()) {
-                        return Normalizer\Json::fromEncoded($printed);
+                        return Json::fromString($printed);
                     }
 
-                    return Normalizer\Json::fromEncoded($printed . $this->format->newLine()->toString());
+                    return Json::fromString($printed . $this->format->newLine()->toString());
                 }
             },
         );
 
         try {
             $normalized = $normalizer->normalize($json);
-        } catch (Normalizer\Exception\OriginalInvalidAccordingToSchemaException $exception) {
+        } catch (Normalizer\Exception\OriginalInvalidAccordingToSchema $exception) {
             $io->writeError('<error>Original composer.json does not match the expected JSON schema:</error>');
 
             self::showValidationErrors(
@@ -235,7 +236,7 @@ public function normalize(Normalizer\Json $json): Normalizer\Json
             );
 
             return 1;
-        } catch (Normalizer\Exception\NormalizedInvalidAccordingToSchemaException $exception) {
+        } catch (Normalizer\Exception\NormalizedInvalidAccordingToSchema $exception) {
             $io->writeError('<error>Normalized composer.json does not match the expected JSON schema:</error>');
 
             self::showValidationErrors(

diff --git a/test/Integration/Command/NormalizeCommand/Normalizer/Throws/Test.php b/test/Integration/Command/NormalizeCommand/Normalizer/Throws/Test.php
@@ -17,6 +17,7 @@
 use Ergebnis\Composer\Normalize\Command\NormalizeCommand;
 use Ergebnis\Composer\Normalize\Test\Integration;
 use Ergebnis\Composer\Normalize\Test\Util;
+use Ergebnis\Json\Json;
 use Ergebnis\Json\Normalizer;
 use Ergebnis\Json\Printer;
 use Localheinz\Diff;
@@ -51,12 +52,12 @@ public function testFailsWhenNormalizerThrowsRuntimeExceptionDuringNormalization
 
         $application = self::createApplication(new NormalizeCommand(
             new Factory(),
-            new class($exceptionMessage) implements Normalizer\NormalizerInterface {
+            new class($exceptionMessage) implements Normalizer\Normalizer {
                 public function __construct(private string $exceptionMessage)
                 {
                 }
 
-                public function normalize(Normalizer\Json $json): Normalizer\Json
+                public function normalize(Json $json): Json
                 {
                     throw new \RuntimeException($this->exceptionMessage);
                 }