fix: replace filter_var for uri and uri-reference to userland code to be RFC 3986 compliant #800
+212
−22
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… be RFC 3986 compliant #685
DannyvdSluijs
added a commit
that referenced
this pull request
Mar 14, 2025
… be RFC 3986 compliant (#800) This pull request introduces new validators for URI and relative references and integrates them into the `FormatConstraint` class. The changes also include corresponding unit tests to ensure the validators work as expected. ### New Validators: * [`src/JsonSchema/Tool/Validator/UriValidator.php`](diffhunk://#diff-2019f410f3ef4cdf8478ffa71444226beb8a118d60b3337c40eaaec8d3aef7a3R1-R65): Added a new class `UriValidator` to validate URIs according to RFC 3986 and RFC 5322 for `mailto:` URIs. * [`src/JsonSchema/Tool/Validator/RelativeReferenceValidator.php`](diffhunk://#diff-0bfeeb9c38593a2d65cc2e8c49fe873c78765eac81c00cf0a398bd754ca9c7a8R1-R53): Added a new class `RelativeReferenceValidator` to validate relative references according to RFC 3986. ### Integration into `FormatConstraint`: * [`src/JsonSchema/Constraints/FormatConstraint.php`](diffhunk://#diff-44020f0c0690a2a4c1c446e97185986c31b19374b4a99f4b0970c5df36279067L104-R114): Integrated the new `UriValidator` and `RelativeReferenceValidator` into the `check` method to replace the previous inline validation logic for `uri` and `uri-reference` formats. ### Unit Tests: * [`tests/Tool/Validator/UriValidatorTest.php`](diffhunk://#diff-6b107cb8679795fb59c070ba500d0646f6d357e4c03a585f4a0c67181e4101fcR1-R49): Added unit tests for `UriValidator` to ensure it correctly validates valid and invalid URIs. * [`tests/Tool/Validator/RelativeReferenceValidatorTest.php`](diffhunk://#diff-97a7acc2a16f7653d307a16e356c7545b0a0bc26156ce60f7ca13332a6656729R1-R40): Added unit tests for `RelativeReferenceValidator` to ensure it correctly validates valid and invalid relative references. # Closing keywords fixes #685
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request introduces new validators for URI and relative references and integrates them into the
FormatConstraintclass. The changes also include corresponding unit tests to ensure the validators work as expected.New Validators:
src/JsonSchema/Tool/Validator/UriValidator.php: Added a new classUriValidatorto validate URIs according to RFC 3986 and RFC 5322 formailto:URIs.src/JsonSchema/Tool/Validator/RelativeReferenceValidator.php: Added a new classRelativeReferenceValidatorto validate relative references according to RFC 3986.Integration into
FormatConstraint:src/JsonSchema/Constraints/FormatConstraint.php: Integrated the newUriValidatorandRelativeReferenceValidatorinto thecheckmethod to replace the previous inline validation logic forurianduri-referenceformats.Unit Tests:
tests/Tool/Validator/UriValidatorTest.php: Added unit tests forUriValidatorto ensure it correctly validates valid and invalid URIs.tests/Tool/Validator/RelativeReferenceValidatorTest.php: Added unit tests forRelativeReferenceValidatorto ensure it correctly validates valid and invalid relative references.Closing keywords
fixes #685