Skip to content

improve RefResolver #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

improve RefResolver #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions src/JsonSchema/RefResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function getUriRetriever()
* @param object $schema JSON Schema to flesh out
* @param string $sourceUri URI where this schema was located
*/
public function resolve($schema, $sourceUri = null)
public function resolve($schema, $sourceUri = null, $rootSchema = null)
{
if (self::$depth > self::$maxDepth) {
self::$depth = 0;
Expand All @@ -116,12 +116,8 @@ public function resolve($schema, $sourceUri = null)
$sourceUri = $schema->id;
}

if (null === $this->rootSchema) {
$this->rootSchema = $schema;
}

// Resolve $ref first
$this->resolveRef($schema, $sourceUri);
$this->resolveRef($schema, $sourceUri, $rootSchema ?: $schema);

// These properties are just schemas
// eg. items can be a schema or an array of schemas
Expand Down Expand Up @@ -159,7 +155,7 @@ public function resolveArrayOfSchemas($schema, $propertyName, $sourceUri)
}

foreach ($schema->$propertyName as $possiblySchema) {
$this->resolve($possiblySchema, $sourceUri);
$this->resolve($possiblySchema, $sourceUri, $schema);
}
}

Expand All @@ -178,7 +174,7 @@ public function resolveObjectOfSchemas($schema, $propertyName, $sourceUri)
}

foreach (get_object_vars($schema->$propertyName) as $possiblySchema) {
$this->resolve($possiblySchema, $sourceUri);
$this->resolve($possiblySchema, $sourceUri, $schema);
}
}

Expand All @@ -196,7 +192,7 @@ public function resolveProperty($schema, $propertyName, $sourceUri)
return;
}

$this->resolve($schema->$propertyName, $sourceUri);
$this->resolve($schema->$propertyName, $sourceUri, $schema);
}

/**
Expand All @@ -207,7 +203,7 @@ public function resolveProperty($schema, $propertyName, $sourceUri)
* @param object $schema JSON Schema to flesh out
* @param string $sourceUri URI where this schema was located
*/
public function resolveRef($schema, $sourceUri)
public function resolveRef($schema, $sourceUri, $rootSchema = null)
{
$ref = '$ref';

Expand All @@ -232,7 +228,7 @@ public function resolveRef($schema, $sourceUri)
if (!empty($refDoc)) {
$refSchema = $this->fetchRef($refDoc, $sourceUri);
} else {
$refSchema = $this->rootSchema;
$refSchema = $rootSchema ?: $schema;
}

if (null !== $refPath) {
Expand Down