Skip to content

Correctly set the schema ID when passing it as assoc array #794

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.

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

Merged
merged 4 commits into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Upgrade php cs fixer to latest ([#783](https://github.com/jsonrainbow/json-schema/pull/783))
- Create deep copy before checking each sub schema in oneOf ([#791](https://github.com/jsonrainbow/json-schema/pull/791))
- Create deep copy before checking each sub schema in anyOf ([#792](https://github.com/jsonrainbow/json-schema/pull/792))
- Correctly set the schema ID when passing it as assoc array ([#794](https://github.com/jsonrainbow/json-schema/pull/794))

### Changed
- Used PHPStan's int-mask-of<T> type where applicable ([#779](https://github.com/jsonrainbow/json-schema/pull/779))
Expand Down
2 changes: 1 addition & 1 deletion src/JsonSchema/Constraints/TypeCheck/LooseTypeCheck.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static function propertyExists($value, $property)
return property_exists($value, $property);
}

return array_key_exists($property, $value);
return is_array($value) && array_key_exists($property, $value);
}

public static function propertyCount($value)
Expand Down
8 changes: 4 additions & 4 deletions src/JsonSchema/Validator.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

use JsonSchema\Constraints\BaseConstraint;
use JsonSchema\Constraints\Constraint;
use JsonSchema\Constraints\TypeCheck\LooseTypeCheck;

/**
* A JsonSchema Constraint
Expand Down Expand Up @@ -59,10 +60,9 @@ public function validate(&$value, $schema = null, $checkMode = null)
}

// add provided schema to SchemaStorage with internal URI to allow internal $ref resolution
if (is_object($schema) && property_exists($schema, 'id')) {
$schemaURI = $schema->id;
} else {
$schemaURI = SchemaStorage::INTERNAL_PROVIDED_SCHEMA_URI;
$schemaURI = SchemaStorage::INTERNAL_PROVIDED_SCHEMA_URI;
if (LooseTypeCheck::propertyExists($schema, 'id')) {
$schemaURI = LooseTypeCheck::propertyGet($schema, 'id');
}
$this->factory->getSchemaStorage()->addSchema($schemaURI, $schema);

Expand Down
11 changes: 11 additions & 0 deletions tests/ValidatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ public function testValidateWithAssocSchema(): void
$this->assertFalse($validator->isValid(), 'Validation succeeded, but should have failed.');
}

public function testValidateWithAssocSchemaWithRelativeRefs(): void
{
$schema = json_decode(file_get_contents(__DIR__ . '/fixtures/relative.json'), true);
$data = json_decode('{"foo":{"foo": "bar"}}', false);

$validator = new Validator();
$validator->validate($data, $schema);

$this->assertTrue($validator->isValid(), 'Validation failed, but should have succeeded.');
}

public function testBadAssocSchemaInput(): void
{
if (version_compare(phpversion(), '5.5.0', '<')) {
Expand Down
11 changes: 11 additions & 0 deletions tests/fixtures/relative.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"id": "tests/fixtures/relative.json",
"type": "object",
"properties": {
"foo": {
"$ref": "foobar.json"
}
},
"required": ["foo"],
"additionalProperties": false
}