Fix: Adjust ComposerJsonNormalizer to reject JSON when it is not an object

CHANGELOG.md

@@ -20,6 +20,7 @@ For a full diff see [`3.0.0...main`][3.0.0...main].
 - Adjusted `Vendor\Composer\BinNormalizer`, `Vendor\Composer\PackageHashNormalizer`, `Vendor\Composer\VersionConstraintNormalizer`, and `SchemaNormalizer` to encode JSON with `JSON_PRETTY_PRINT` flag ([#795]), by [@localheinz]
 - Adjusted `Vendor\Composer\BinNormalizer`, `Vendor\Composer\PackageHashNormalizer`, `Vendor\Composer\VersionConstraintNormalizer`, and `SchemaNormalizer` to encode JSON with `JSON_UNESCAPED_SLASHES` flag ([#801]), by [@localheinz]
 - Adjusted `Vendor\Composer\BinNormalizer`, `Vendor\Composer\PackageHashNormalizer`, `Vendor\Composer\VersionConstraintNormalizer`, and `SchemaNormalizer` to encode JSON with `JSON_UNESCAPED_UNICODE` flag ([#802]), by [@localheinz]
+- Adjusted `Vendor\Composer\ComposerJsonNormalizer` to reject JSON when it is not an object ([#804]), by [@localheinz]
 
 ### Fixed
 
@@ -552,6 +553,7 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
 [#795]: https://github.com/ergebnis/json-normalizer/pull/795
 [#801]: https://github.com/ergebnis/json-normalizer/pull/801
 [#802]: https://github.com/ergebnis/json-normalizer/pull/802
+[#804]: https://github.com/ergebnis/json-normalizer/pull/804
 
 [@BackEndTea]: https://github.com/BackEndTea
 [@dependabot]: https://github.com/dependabot

psalm-baseline.xml

@@ -82,7 +82,8 @@
     </MixedAssignment>
   </file>
   <file src="test/Unit/Vendor/Composer/ComposerJsonNormalizerTest.php">
-    <MixedAssignment occurrences="1">
+    <MixedAssignment occurrences="2">
+      <code>$fileInfo</code>
       <code>$fileInfo</code>
     </MixedAssignment>
   </file>

src/Vendor/Composer/ComposerJsonNormalizer.php

@@ -80,10 +80,6 @@ public function __construct(string $schemaUri)
 
     public function normalize(Json $json): Json
     {
-        if (!\is_object($json->decoded())) {
-            return $json;
-        }
-
         return $this->normalizer->normalize($json);
     }
 }

test/Unit/Vendor/Composer/ComposerJsonNormalizerTest.php

@@ -14,6 +14,7 @@
 namespace Ergebnis\Json\Normalizer\Test\Unit\Vendor\Composer;
 
 use Ergebnis\Json\Json;
+use Ergebnis\Json\Normalizer\Exception;
 use Ergebnis\Json\Normalizer\Test;
 use Ergebnis\Json\Normalizer\Vendor;
 use PHPUnit\Framework;
@@ -25,6 +26,7 @@
  * @covers \Ergebnis\Json\Normalizer\Vendor\Composer\ComposerJsonNormalizer
  *
  * @uses \Ergebnis\Json\Normalizer\ChainNormalizer
+ * @uses \Ergebnis\Json\Normalizer\Exception\OriginalInvalidAccordingToSchema
  * @uses \Ergebnis\Json\Normalizer\Format\JsonEncodeOptions
  * @uses \Ergebnis\Json\Normalizer\SchemaNormalizer
  * @uses \Ergebnis\Json\Normalizer\Vendor\Composer\PackageHashNormalizer
@@ -35,9 +37,79 @@ final class ComposerJsonNormalizerTest extends Framework\TestCase
     use Test\Util\Helper;
 
     /**
-     * @dataProvider provideScenario
+     * @dataProvider provideScenarioWhereJsonIsInvalidAccordingToSchema
      */
-    public function testNormalizeNormalizes(Test\Fixture\Vendor\Composer\Scenario $scenario): void
+    public function testNormalizeRejectsJsonWhenItIsInvalidAccordingToSchema(Test\Fixture\Vendor\Composer\Scenario $scenario): void
+    {
+        $json = $scenario->original();
+
+        $normalizer = new Vendor\Composer\ComposerJsonNormalizer(\sprintf(
+            'file://%s',
+            \realpath(__DIR__ . '/../../../Fixture/Vendor/Composer/schema.json'),
+        ));
+
+        $this->expectException(Exception\OriginalInvalidAccordingToSchema::class);
+
+        $normalizer->normalize($json);
+    }
+
+    /**
+     * @return \Generator<string, array{0: Test\Fixture\Vendor\Composer\Scenario}>
+     */
+    public static function provideScenarioWhereJsonIsInvalidAccordingToSchema(): \Generator
+    {
+        $basePath = __DIR__ . '/../../../';
+
+        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__ . '/../../../Fixture/Vendor/Composer/ComposerJsonNormalizer/NormalizeRejectsJson'));
+
+        foreach ($iterator as $fileInfo) {
+            /** @var \SplFileInfo $fileInfo */
+            if (!$fileInfo->isFile()) {
+                continue;
+            }
+
+            if ('original.json' !== $fileInfo->getBasename()) {
+                continue;
+            }
+
+            $originalFile = $fileInfo->getRealPath();
+
+            $normalizedFile = \preg_replace(
+                '/original\.json$/',
+                'normalized.json',
+                $originalFile,
+            );
+
+            if (!\is_string($normalizedFile)) {
+                throw new \RuntimeException(\sprintf(
+                    'Unable to deduce normalized JSON file name from original JSON file name "%s".',
+                    $originalFile,
+                ));
+            }
+
+            if (!\file_exists($normalizedFile)) {
+                $normalizedFile = $originalFile;
+            }
+
+            $key = \substr(
+                $fileInfo->getPath(),
+                \strlen($basePath),
+            );
+
+            yield $key => [
+                Test\Fixture\Vendor\Composer\Scenario::create(
+                    $key,
+                    Json::fromFile($originalFile),
+                    Json::fromFile($normalizedFile),
+                ),
+            ];
+        }
+    }
+
+    /**
+     * @dataProvider provideScenarioWhereJsonIsValidAccordingToSchema
+     */
+    public function testNormalizeNormalizesJsonWhenItIsValidAccordingToSchema(Test\Fixture\Vendor\Composer\Scenario $scenario): void
     {
         $json = $scenario->original();
 
@@ -54,7 +126,7 @@ public function testNormalizeNormalizes(Test\Fixture\Vendor\Composer\Scenario $s
     /**
      * @return \Generator<string, array{0: Test\Fixture\Vendor\Composer\Scenario}>
      */
-    public static function provideScenario(): \Generator
+    public static function provideScenarioWhereJsonIsValidAccordingToSchema(): \Generator
     {
         $basePath = __DIR__ . '/../../../';