Fix: Throw CanNotResolve instead of ResolvedToRootSchema when JSON po…

…inter is invalid
ergebnis · Jan 30, 2022 · 6b07223 · 6b07223
1 parent e05587c
commit 6b07223
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 For a full diff see [`2.0.0...main`][2.0.0...main].
 
+### Fixed
+
+- Started throwing an `Exception\CanNotResolve` exception instead of an `Exception\ResolvedToRootSchema` when the `JsonPointer` is not a valid URI fragment identifier representation of a JSON pointer ([#202]), by [@localheinz]
+
 ### Changed
 
 - Required [`ergebnis/json-pointer`](https://github.com/ergebnis/json-pointer) ([#195]), by [@localheinz]
@@ -71,5 +75,6 @@ For a full diff see [`dcd4cfb...1.0.0`][dcd4cfb...1.0.0].
 [#169]: https://github.com/ergebnis/json-schema-validator/pull/169
 [#172]: https://github.com/ergebnis/json-schema-validator/pull/172
 [#195]: https://github.com/ergebnis/json-schema-validator/pull/195
+[#202]: https://github.com/ergebnis/json-schema-validator/pull/202
 
 [@localheinz]: https://github.com/localheinz
diff --git a/src/SchemaValidator.php b/src/SchemaValidator.php
@@ -14,7 +14,6 @@
 namespace Ergebnis\Json\SchemaValidator;
 
 use Ergebnis\Json\SchemaValidator\Exception\CanNotResolve;
-use Ergebnis\Json\SchemaValidator\Exception\ResolvedToRootSchema;
 use JsonSchema\Constraints;
 use JsonSchema\Exception;
 use JsonSchema\SchemaStorage;
@@ -25,7 +24,6 @@ final class SchemaValidator
 {
     /**
      * @throws CanNotResolve
-     * @throws ResolvedToRootSchema
      */
     public function validate(
         Json $json,
@@ -50,7 +48,7 @@ public function validate(
             }
 
             if ($schemaDecoded === $subSchemaDecoded) {
-                throw ResolvedToRootSchema::jsonPointer($jsonPointer);
+                throw CanNotResolve::jsonPointer($jsonPointer);
             }
 
             $schemaDecoded = $subSchemaDecoded;

diff --git a/test/Unit/Exception/CanNotResolveTest.php b/test/Unit/Exception/CanNotResolveTest.php
@@ -28,7 +28,7 @@ final class CanNotResolveTest extends Framework\TestCase
 {
     public function testJsonPointerReturnsException(): void
     {
-        $jsonPointer = JsonPointer::fromString('/foo/bar');
+        $jsonPointer = JsonPointer::fromString('#/foo/bar');
 
         $exception = Exception\CanNotResolve::jsonPointer($jsonPointer);
 

diff --git a/test/Unit/Exception/ResolvedToRootSchemaTest.php b/test/Unit/Exception/ResolvedToRootSchemaTest.php
@@ -28,7 +28,7 @@ final class ResolvedToRootSchemaTest extends Framework\TestCase
 {
     public function testJsonPointerReturnsException(): void
     {
-        $jsonPointer = JsonPointer::fromString('/foo/bar');
+        $jsonPointer = JsonPointer::fromString('#/foo/bar');
 
         $exception = Exception\ResolvedToRootSchema::jsonPointer($jsonPointer);
 

diff --git a/test/Unit/SchemaValidatorTest.php b/test/Unit/SchemaValidatorTest.php
@@ -253,7 +253,7 @@ public function testValidateThrowsCanNotResolveWhenJsonPointerIsNotEmptyAndSubSc
         );
     }
 
-    public function testValidateThrowsResolvedToRootSchemaWhenJsonPointerIsNotEmptyAndSubSchemaWasResolvedToRootSchema(): void
+    public function testValidateThrowsCanNotResolveWhenJsonPointerIsNotEmptyButCouldNotBeParsedAsUriFragmentIdentifierString(): void
     {
         $faker = self::faker();
 
@@ -292,7 +292,7 @@ public function testValidateThrowsResolvedToRootSchemaWhenJsonPointerIsNotEmptyA
 
         $schemaValidator = new SchemaValidator();
 
-        $this->expectException(Exception\ResolvedToRootSchema::class);
+        $this->expectException(Exception\CanNotResolve::class);
 
         $schemaValidator->validate(
             $data,