Skip to content

Make allOf errors bubble up #155

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make allOf errors bubble up #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78385ab
Validate allOf properties after other errors
andreaswolf Aug 7, 2025
aa413f4
Collect errors for allOf keyword
andreaswolf Aug 7, 2025
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
22 changes: 19 additions & 3 deletions src/Keywords/AllOfKeyword.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,22 @@ public function validate(ValidationContext $context, Schema $schema): ?Validatio
{
$object = $this->createArrayObject($context);

$errors = [];

foreach ($this->value as $index => $value) {
if ($value === true) {
continue;
}

if ($value === false) {
$this->addEvaluatedFromArrayObject($object, $context);
return $this->error($schema, $context, 'allOf', 'The data should match all schemas', [
$error = $this->error($schema, $context, 'allOf', 'The data should match all schemas', [
'index' => $index,
]);
if ($context->stopAtFirstError()) {
return $error;
}
$errors[] = $error;
}

if (is_object($value) && !($value instanceof Schema)) {
Expand All @@ -65,14 +71,24 @@ public function validate(ValidationContext $context, Schema $schema): ?Validatio

if ($error = $context->validateSchemaWithoutEvaluated($value, null, false, $object)) {
$this->addEvaluatedFromArrayObject($object, $context);
return $this->error($schema, $context, 'allOf', 'The data should match all schemas', [
$error = $this->error($schema, $context, 'allOf', 'The data should match all schemas', [
'index' => $index,
], $error);
if ($context->stopAtFirstError()) {
return $error;
}
$errors[] = $error;
}
}

if (count($errors) > 0 && !$context->stopAtFirstError()) {
return $this->error($schema, $context, 'allOf', 'The data should match all schemas', [
'index' => $index,
], $errors);
}

$this->addEvaluatedFromArrayObject($object, $context);

return null;
}
}
}
33 changes: 27 additions & 6 deletions src/Schemas/ObjectSchema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,29 +77,50 @@ public function validate(ValidationContext $context): ?ValidationError
*/
public function doValidate(ValidationContext $context): ?ValidationError
{
$errors = [];
if ($this->before && ($error = $this->applyKeywords($this->before, $context))) {
return $error;
if ($context->stopAtFirstError()) {
return $error;
}
$errors[] = $error;
}

if ($this->types && ($type = $context->currentDataType())) {
if (isset($this->types[$type]) && ($error = $this->applyKeywords($this->types[$type], $context))) {
return $error;
if ($context->stopAtFirstError()) {
return $error;
}
$errors[] = $error;
}

if (($type = Helper::getJsonSuperType($type)) && isset($this->types[$type])) {
if ($error = $this->applyKeywords($this->types[$type], $context)) {
return $error;
if ($context->stopAtFirstError()) {
return $error;
}
$errors[] = $error;
}
}

unset($type);
}

if ($this->after && ($error = $this->applyKeywords($this->after, $context))) {
return $error;
if ($context->stopAtFirstError()) {
return $error;
}
$errors[] = $error;
}

if (count($errors) === 0) {
return null;
}

if (count($errors) === 1) {
return $errors[0];
}

return null;
return new ValidationError('', $this, DataInfo::fromContext($context), 'Data must match schema', [], $errors);
}

/**
Expand Down Expand Up @@ -145,4 +166,4 @@ protected function applyKeywords(array $keywords, ValidationContext $context): ?
$error_list
);
}
}
}