feat: Add Draft-2019-09 by DannyvdSluijs · Pull Request #885 · jsonrainbow/json-schema

DannyvdSluijs · 2026-02-15T11:04:13Z

Description

This PR aims to add Draft 2019 support to JSON Schema for PHP, it is still. a work in progress.

Related Issue

N/A/

Type of Change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Documentation update
Code refactoring
Other (please describe):

Checklist

I have read the CONTRIBUTING guidelines
My code follows the code style of this project
I have added tests that prove my fix is effective or that my feature works
All new and existing tests pass
I have updated the documentation accordingly
My changes generate no new warnings

Additional Notes

None

DannyvdSluijs · 2026-03-24T20:34:31Z

Dependencies might no longer be in this draft.

## Description This PR updates the JSON Schema test-suite to use the main branch. This adds some additional test for the property names constraint in draft 06 and 07 for the const and enum. ## Related Issue - Fixes #905 ## Type of Change - [X] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] Documentation update - [ ] Code refactoring - [ ] Other (please describe): ## Checklist - [X] I have read the [CONTRIBUTING](CONTRIBUTING.md) guidelines - [X] My code follows the code style of this project - [X] I have added tests that prove my fix is effective or that my feature works - [X] All new and existing tests pass - [X] I have updated the documentation accordingly - [X] My changes generate no new warnings

## Description Fixes the error message for additional properties to show the property name instead of the value. Before: ``` The property 41.53824,2.42572 is not defined and the definition does not allow additional properties ``` After: ``` The property coordinates is not defined and the definition does not allow additional properties ``` ## Type of Change - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] Documentation update - [ ] Code refactoring - [ ] Other (please describe): ## Checklist - [x] I have read the [CONTRIBUTING](CONTRIBUTING.md) guidelines - [x] My code follows the code style of this project - [x] I have added tests that prove my fix is effective or that my feature works - [x] All new and existing tests pass - [x] I have updated the documentation accordingly - [x] My changes generate no new warnings

Due to a workflow failure this entry was added manually.

Copilot

Pull request overview

Adds initial JSON Schema Draft 2019-09 support to the PHP validator by introducing a Draft2019 constraint set, wiring it into the global constraint factory, and enabling the JSON Schema Test Suite draft2019-09 directory (with a large explicit skip list for currently unsupported/incorrect cases).

Changes:

Registers a new draft2019-09 constraint entry in the main JsonSchema\Constraints\Factory.
Introduces a new JsonSchema\Constraints\Drafts\Draft2019 constraint factory + keyword constraints (type, refs, applicators, validation keywords, etc.).
Updates tests to include draft2019-09 in strict-mode handling and to run the Test Suite draft2019-09 folder while skipping many currently failing cases; adds new minContains/maxContains errors.

Reviewed changes

Copilot reviewed 41 out of 41 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
tests/ValidatorTest.php	Treats Draft 2019-09 as supported for strict-mode default dialect resolution.
tests/JsonSchemaTestSuiteTest.php	Enables running draft2019-09 tests; expands skip list; updates check-mode typing and strict-mode mapping for draft2019-09.
src/JsonSchema/Constraints/Factory.php	Registers `draft2019-09` to map to the new Draft2019 constraint implementation.
src/JsonSchema/ConstraintError.php	Adds `MAX_CONTAINS` / `MIN_CONTAINS` error types and messages used by Draft2019 contains handling.
src/JsonSchema/Constraints/Drafts/Draft2019/Factory.php	Draft2019-specific constraint map for keyword dispatch.
src/JsonSchema/Constraints/Drafts/Draft2019/Draft2019Constraint.php	Draft2019 schema constraint orchestrating keyword checks (including dependent* keywords).
src/JsonSchema/Constraints/Drafts/Draft2019/AdditionalPropertiesConstraint.php	Draft2019 `additionalProperties` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/AdditionalItemsConstraint.php	Draft2019 `additionalItems` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/AllOfConstraint.php	Draft2019 `allOf` applicator handling.
src/JsonSchema/Constraints/Drafts/Draft2019/AnyOfConstraint.php	Draft2019 `anyOf` applicator handling.
src/JsonSchema/Constraints/Drafts/Draft2019/OneOfConstraint.php	Draft2019 `oneOf` applicator handling.
src/JsonSchema/Constraints/Drafts/Draft2019/NotConstraint.php	Draft2019 `not` applicator handling.
src/JsonSchema/Constraints/Drafts/Draft2019/IfThenElseConstraint.php	Draft2019 `if`/`then`/`else` applicator handling.
src/JsonSchema/Constraints/Drafts/Draft2019/RefConstraint.php	Draft2019 `$ref` resolution and validation.
src/JsonSchema/Constraints/Drafts/Draft2019/PropertiesConstraint.php	Draft2019 `properties` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/PatternPropertiesConstraint.php	Draft2019 `patternProperties` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/PropertiesNamesConstraint.php	Draft2019 `propertyNames` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/ItemsConstraint.php	Draft2019 `items` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/ContainsConstraint.php	Draft2019 `contains` + `minContains`/`maxContains` handling.
src/JsonSchema/Constraints/Drafts/Draft2019/TypeConstraint.php	Draft2019 `type` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/EnumConstraint.php	Draft2019 `enum` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/ConstConstraint.php	Draft2019 `const` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/RequiredConstraint.php	Draft2019 `required` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/UniqueItemsConstraint.php	Draft2019 `uniqueItems` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/MinItemsConstraint.php	Draft2019 `minItems` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/MaxItemsConstraint.php	Draft2019 `maxItems` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/MinPropertiesConstraint.php	Draft2019 `minProperties` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/MaxPropertiesConstraint.php	Draft2019 `maxProperties` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/MinLengthConstraint.php	Draft2019 `minLength` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/MaxLengthConstraint.php	Draft2019 `maxLength` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/MinimumConstraint.php	Draft2019 `minimum` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/MaximumConstraint.php	Draft2019 `maximum` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/ExclusiveMinimumConstraint.php	Draft2019 `exclusiveMinimum` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/ExclusiveMaximumConstraint.php	Draft2019 `exclusiveMaximum` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/MultipleOfConstraint.php	Draft2019 `multipleOf` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/FormatConstraint.php	Draft2019 `format` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/PatternConstraint.php	Draft2019 `pattern` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/DependenciesConstraint.php	Draft2019 legacy `dependencies` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/DependentSchemasConstraint.php	Draft2019 `dependentSchemas` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/DependentRequiredConstraint.php	Draft2019 `dependentRequired` keyword handling.
src/JsonSchema/Constraints/Drafts/Draft2019/ContentConstraint.php	Draft2019 `content*` keyword placeholder/stub.

Comments suppressed due to low confidence (4)

src/JsonSchema/Constraints/Drafts/Draft2019/FormatConstraint.php:212

validatePhone() currently returns true when preg_match() returns 0 (no match), because it checks !== false. This makes the phone format validation effectively always pass unless the regex errors. Compare the result to === 1 instead.

    private function validatePhone(string $phone): bool
    {
        return preg_match('/^\+?(\(\d{3}\)|\d{3}) \d{3} \d{4}$/', $phone) !== false;
    }

tests/JsonSchemaTestSuiteTest.php:203

Typo in skipped test name: "doest" -> "does" (currently the string likely won’t match the actual test name, so the intended skip may not apply).
tests/JsonSchemaTestSuiteTest.php:258
Typo in skipped test name: "evalation" -> "evaluation" (if the actual test name uses the correct spelling, this skip entry won’t match).
tests/JsonSchemaTestSuiteTest.php:210
Repeated word in skipped test names: "with with" -> "with". If the upstream test names don’t contain this duplication, these skip entries won’t match and won’t be applied.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 51 out of 51 changed files in this pull request and generated 5 comments.

Comments suppressed due to low confidence (1)

src/JsonSchema/Constraints/Drafts/Draft06/FormatConstraint.php:172

Minor style: ===1 should be spaced as === 1 for consistency with the surrounding code and typical PHP CS fixer rules.

    private function validatePhone(string $phone): bool
    {
        return preg_match('/^\+?(\(\d{3}\)|\d{3}) \d{3} \d{4}$/', $phone) ===1;
    }

    private function validateRegex(string $regex): bool
    {
-        return preg_match(self::jsonPatternToPhpRegex($regex), '') !== false;
+        return preg_match(self::jsonPatternToPhpRegex($regex), '') === 1;


    private function validateRegex(string $regex): bool
    {
-        return preg_match(self::jsonPatternToPhpRegex($regex), '') !== false;
+        return preg_match(self::jsonPatternToPhpRegex($regex), '') === 1;


+
+    private function validateRegex(string $regex): bool
+    {
+        return preg_match(self::jsonPatternToPhpRegex($regex), '') === 1;


@@ -59,11 +59,11 @@
            "type": "package",
            "package": {
                "name": "json-schema/json-schema-test-suite",
-                "version": "23.2.0",
+                "version": "dev-main",
                "source": {
                    "type": "git",
                    "url": "https://github.com/json-schema/JSON-Schema-Test-Suite",
-                    "reference": "23.2.0"
+                    "reference": "main"
                }


 ## [Unreleased]

+### Fixed
+- Display the additional property on error instead of the value ([#904](https://github.com/jsonrainbow/json-schema/pull/904))
+
+## [6.8.2] - 2026-05-05
+
+### Fixed
+- Update to json schema test suite main branch ([#906](https://github.com/jsonrainbow/json-schema/pull/906))


DannyvdSluijs added added draft-2019 labels Feb 15, 2026

DannyvdSluijs force-pushed the Add-Draft-2019-09-support branch 3 times, most recently from 65eaaf5 to 65e95cd Compare February 18, 2026 20:02

DannyvdSluijs commented Mar 24, 2026

View reviewed changes

DannyvdSluijs force-pushed the Add-Draft-2019-09-support branch from 746fab9 to 3886d6b Compare March 28, 2026 08:03

DannyvdSluijs force-pushed the main branch from 89ac92b to 7a56bfc Compare May 4, 2026 18:55

DannyvdSluijs force-pushed the Add-Draft-2019-09-support branch 2 times, most recently from 746fab9 to d0c5240 Compare May 4, 2026 20:26

github-actions Bot and others added 6 commits May 4, 2026 21:31

docs: Prepare release 6.8.1

318bd68

docs: Update CHANGELOG.md for PR #906

861125a

docs: Prepare release 6.8.2

2c89ebb

docs: Update CHANGELOG.md for PR #904

bea1f52

Due to a workflow failure this entry was added manually.

DannyvdSluijs changed the title ~~feat: Add draft2019 as copy from draft07~~ feat: Add draft2019 May 13, 2026

DannyvdSluijs changed the title ~~feat: Add draft2019~~ feat: Add Draft-2019-09 May 13, 2026

DannyvdSluijs mentioned this pull request May 13, 2026

Add support for unevaluatedProperties for more efficient useage of allOf schemas #907

Open

DannyvdSluijs and others added 10 commits May 13, 2026 20:21

feat: Add draft2019 as copy from draft07

dfd2dcc

fix: Fixes for minContains and maxContains

69bdc84

fix: Skip validation of content due to security concerns

4239e10

feat: Add dependentSchemas support

ebde670

feat: Add support for dependentRequired

e7cc753

fix: Add cont and enum support to propertyNames constraint

e406ef9

test: Skip recursiveRef.json test for draft 2019-09

4e25b28

refactor: Correct return value scope

30f723d

style: Remove unused imports

9b42d56

test: Skip more test for draft 2019-09

72e285d

DannyvdSluijs force-pushed the Add-Draft-2019-09-support branch from 6aedc26 to 72e285d Compare May 13, 2026 18:21

DannyvdSluijs added 2 commits May 13, 2026 20:36

test: Skip more test fomr initial implementation

4073b40

fix: Correct PHPStan finding

d0194bf

DannyvdSluijs requested a review from Copilot May 16, 2026 19:28

Copilot started reviewing on behalf of DannyvdSluijs May 16, 2026 19:29 View session

Copilot AI reviewed May 16, 2026

View reviewed changes

refactor: Address review comments and fix accross other drafts

128bc26

DannyvdSluijs force-pushed the main branch from bea1f52 to 8ab9f1e Compare May 17, 2026 08:49

DannyvdSluijs requested a review from Copilot May 17, 2026 09:28

Copilot started reviewing on behalf of DannyvdSluijs May 17, 2026 09:28 View session

Copilot AI reviewed May 17, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: Add Draft-2019-09#885

feat: Add Draft-2019-09#885
DannyvdSluijs wants to merge 19 commits into
mainfrom
Add-Draft-2019-09-support

DannyvdSluijs commented Feb 15, 2026

Uh oh!

DannyvdSluijs Mar 24, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

DannyvdSluijs commented Feb 15, 2026

Description

Related Issue

Type of Change

Checklist

Additional Notes

Uh oh!

DannyvdSluijs Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants