Skip to content

Resolve backport conflicts #402

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 19 commits into from
Closed

Resolve backport conflicts #402

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e10ce33
Reset to pre-5.2.0 master to avoid force-push rebase of 6.0.0-dev
erayd Mar 22, 2017
6600918
Add URI translation, package:// URI scheme & bundle spec schemas (#362)
erayd Mar 7, 2017
a0af784
centralize errors (#364)
shmax Mar 7, 2017
0bb66d3
Add use line for InvalidArgumentException (#370)
erayd Mar 17, 2017
8e20159
Add use line for InvalidArgumentException & adjust scope (#372)
erayd Mar 17, 2017
3aead21
Revert "An email is a string, not much else." (#373)
erayd Mar 17, 2017
03bd44a
[BUGFIX] Add provided schema under a dummy / internal URI (fixes #376…
erayd Mar 17, 2017
7d37a85
add quiet option (#382)
shmax Mar 17, 2017
9542bd8
Add option to disable validation of "format" constraint (#383)
erayd Mar 17, 2017
04d8fd9
Add more unit tests (#366)
erayd Mar 17, 2017
e9c4506
Reset errors prior to validation (#386)
erayd Mar 17, 2017
af52ed9
Allow the schema to be an associative array (#389)
erayd Mar 21, 2017
ad28f5f
Enable FILTER_FLAG_EMAIL_UNICODE for email format if present (#398)
erayd Mar 21, 2017
e2bfbeb
Don't throw exceptions until after checking anyOf / oneOf (#394)
erayd Mar 21, 2017
29a03ff
add enum wrapper (#375)
shmax Mar 21, 2017
ce1988f
Fix infinite recursion on some schemas when setting defaults (#359) (…
erayd Mar 21, 2017
b5bc719
Add option to also validate the schema (#357)
erayd Mar 21, 2017
1a0bf5f
Improvements to type coercion (#384)
erayd Mar 21, 2017
2bd5a39
Remove stale files from #357 (obviated by #362) (#400)
erayd Mar 21, 2017
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

These merge commits were added into this branch cleanly.

There are no new changes to show.