Skip to content

Commit

Permalink
Fix: Use JsonPointer as provided by ergebnis/json-pointer
Browse files Browse the repository at this point in the history
  • Loading branch information
localheinz committed Jan 30, 2022
1 parent 35c7962 commit 15bb1db
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/SchemaNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

namespace Ergebnis\Json\Normalizer;

use Ergebnis\Json\Pointer;
use Ergebnis\Json\SchemaValidator;
use JsonSchema\Exception\InvalidSchemaMediaTypeException;
use JsonSchema\Exception\JsonDecodingException;
Expand Down Expand Up @@ -53,7 +54,7 @@ public function normalize(Json $json): Json
$resultBeforeNormalization = $this->schemaValidator->validate(
SchemaValidator\Json::fromString($json->encoded()),
SchemaValidator\Json::fromString(\json_encode($schema)),
SchemaValidator\JsonPointer::empty(),
Pointer\JsonPointer::document(),
);

if (!$resultBeforeNormalization->isValid()) {
Expand All @@ -73,7 +74,7 @@ public function normalize(Json $json): Json
$resultAfterNormalization = $this->schemaValidator->validate(
SchemaValidator\Json::fromString($normalized->encoded()),
SchemaValidator\Json::fromString(\json_encode($schema)),
SchemaValidator\JsonPointer::empty(),
Pointer\JsonPointer::document(),
);

if (!$resultAfterNormalization->isValid()) {
Expand Down Expand Up @@ -238,7 +239,7 @@ private function resolveSchema(
$result = $this->schemaValidator->validate(
SchemaValidator\Json::fromString(\json_encode($data)),
SchemaValidator\Json::fromString(\json_encode($anyOfSchema)),
SchemaValidator\JsonPointer::empty(),
Pointer\JsonPointer::document(),
);

if ($result->isValid()) {
Expand All @@ -261,7 +262,7 @@ private function resolveSchema(
$result = $this->schemaValidator->validate(
SchemaValidator\Json::fromString(\json_encode($data)),
SchemaValidator\Json::fromString(\json_encode($oneOfSchema)),
SchemaValidator\JsonPointer::empty(),
Pointer\JsonPointer::document(),
);

if ($result->isValid()) {
Expand Down

0 comments on commit 15bb1db

Please sign in to comment.