254 Commits

Author SHA1 Message Date
Justin Rainbow
680d026082 Merge pull request #136 from lsv/php7-reserved-names
[Proposal] new constraints name - for PHP7
1.4.0
2015-03-23 13:38:38 -07:00
Martin Aarhof
dc310ac54c proposal on new constraints name 2015-03-19 15:09:03 +01:00
Justin Rainbow
87b54b460f Merge pull request #106 from openfryer/uriretriever-uriresolverexception
Fix UriRetriever::combineRelativePathWithBasePath() does not qualify UriResolverException
1.3.7
2014-08-24 19:48:14 -07:00
Justin Rainbow
d98033f1c5 Merge pull request #104 from hakre/patch-1
Constraint::check() uses wrong indefinite article in error message to express the type constraint
2014-08-24 19:37:48 -07:00
Justin Rainbow
3bf210b876 Merge pull request #101 from alexmmm/replace-directory-separator-references
replace  invalid filesystem dependent directory separator  references
2014-08-24 19:35:45 -07:00
Justin Rainbow
1c84802884 Merge pull request #107 from Nyholm/patch-1
Added PHP 5.6 and HHVM to travis.yml
2014-08-24 19:35:12 -07:00
Justin Rainbow
c587f9b13f Merge pull request #99 from xanagi/multibyte_strlen
Use mb_strlen instead of strlen when mbstring extension is available.
2014-08-24 19:33:27 -07:00
Justin Rainbow
04fed3677d Merge pull request #98 from alexmmm/fix-constraint-errors-getter
Fix constraint errors getter
2014-08-24 19:32:30 -07:00
Justin Rainbow
99fa58a849 Merge pull request #100 from alexmmm/fix-basic-types-test
minor fix of BasicTypeTests
2014-08-24 19:32:01 -07:00
Justin Rainbow
252e023d9b Merge pull request #103 from alexmmm/fix-required-property-validation
Fix required property validation
2014-08-24 19:31:42 -07:00
Tobias Nyholm
7eef0affe5 Added PHP 5.6 and HHVM to travis.yml 2014-07-09 12:17:36 +02:00
Leif Meyer
150cbaee08 Fix UriRetriever::combineRelativePathWithBasePath() does not qualify UriResolverException
Added full qualification to UriResolverException in
UriRetriever::combineRelativePathWithBasePath().
Added a test to verify that a UriResolverException is thrown when a
relative path contains more level-ups than the base path segments.
2014-06-12 17:06:34 -06:00
hakre
069fec2cea Fixes #104: Constraint::check() uses wrong indefinite article in ...
...error message to express the type constraint

Type::check() used a wrong indefinte article on occasion.

This has been fixed by providing a map of types and their wording so that
the correct indefinite article is used, always.

- https://github.com/justinrainbow/json-schema/pull/104
- https://github.com/composer/composer/issues/1616
2014-06-09 16:01:06 +02:00
hakre
3bbbc37b79 Add test-case for Type error messages 2014-06-09 15:37:48 +02:00
alexmmm
e8a72f0018 dont validate draft4 required attribute when value is undefined
- fixes regression introduced by 61059b2
2014-05-05 11:43:34 +02:00
alexmmm
31401668ff add unit tests to validate issue #102 2014-05-05 11:43:22 +02:00
alexmmm
7d8c945ea2 replace invalid filesystem dependent DIRECTORY_SEPARATOR references in uri mechanics by forward slashes
- fixes failing UriResolver tests on windows systems
2014-05-02 19:18:12 +02:00
alexmmm
cd0d3a9e26 split composite invalid case into independent testcases
- the composite case proved that one type check failed not all of them
2014-05-02 17:45:13 +02:00
Tomonori Kusanagi
3996ce742b Use mb_strlen instead of stlen when mbstring extension is available. 2014-05-02 01:45:31 +09:00
alexmmm
0c39a5b92d add unit tests to validate issue #76 2014-05-01 17:33:33 +02:00
alexmmm
ea98009d77 fix Constraint::getErrors implementation
- remove presentation logic from implementation and dont filter returned errors by array_unique, business logic requires getErrors to return all existing errors, even if it contains duplicates
- make Validator::getErrors() return the same filtered result as before and apply array_unique when setting errors on Validator instance
2014-05-01 16:02:11 +02:00
alexmmm
e994ca8a1f add unit tests to validate issue #97 2014-05-01 15:40:03 +02:00
Justin Rainbow
d97cf3ce89 Merge pull request #92 from AwardWallet/master
added configurable maximum recursion depth
1.3.6
2014-03-05 08:03:52 -07:00
Vladimir Silantyev
ac1316687c https://github.com/justinrainbow/json-schema/pull/92 2014-03-05 15:00:30 +06:00
Justin Rainbow
cb428b3bbe Merge pull request #95 from gwagner/master
Fix a case of 2 invalid oneOf were considered valid
2014-03-03 16:27:04 -07:00
Geoffrey Wagner
ef2427a416 Update Undefined.php
Doh, missed another php < 5.4 compatibility bug
2014-03-03 14:07:48 -06:00
Geoffrey Wagner
0943a248d0 Update Undefined.php
Fix the php < 5.4 compatability
2014-03-03 11:34:41 -06:00
Justin Rainbow
14f4327666 Merge pull request #94 from Seldaek/additionalProp
Add support for additionalProperties set to true
2014-03-02 08:30:04 -07:00
Geoffrey Wagner
57f366bc1e Fix a case of 2 invalid oneOf were considered valid
* When using oneOf, one of the schemas should be considered valid for things to be successful.  The old logic would take a schema (that could have had an error) and evaluate against a clean object that could have also contained an error (meaning the logic would assume no error existed)
2014-02-25 17:11:20 -06:00
Jordi Boggiano
5ec2d4255a Add support for additionalProperties set to true 2014-02-19 17:08:23 +01:00
Vladimir Silantyev
43e6b776c7 added configurable maximum recursion depth 2014-02-12 14:19:08 +06:00
Justin Rainbow
01949f6d21 Merge pull request #86 from alexmmm/extend-travis-conf
add specific php version 5.3.3 to travis build to validate issue #84
1.3.5
2013-12-13 07:21:04 -08:00
Justin Rainbow
9a84f8bc89 Merge pull request #85 from alexmmm/fix-duplicate-abstract-declaration
remove abstract declaration of 'retrieve' which duplicated interface declaration
2013-12-13 07:20:35 -08:00
alexmmm
45960baa4d add specific php version 5.3.3 to validate issue #84
- add composer install option '--prefer-source', see issue travis-ci/travis-ci#1385
2013-12-10 17:10:03 +01:00
alexmmm
22cdf78dfd remove abstract declaration of 'retrieve' which duplicated interface declaration 2013-12-10 14:55:43 +01:00
Justin Rainbow
ad8b959e59 Merge pull request #68 from webdevel/travis-ci-dev
Add Sphinx Doc and PHPDocumentor to Travis-CI
1.3.4
2013-12-08 13:17:57 -08:00
Justin Rainbow
f618a51d60 Merge pull request #83 from dazz/undefinedOfProperty
Validation with oneOf, allOf and anyOf only if property is set
2013-12-08 13:17:09 -08:00
dazz
959323edd4 Validation with oneOf, allOf and anyOf only if property is set
Added check if property is defined before values are checked with
ofProperty validators
2013-12-08 02:13:59 +01:00
Justin Rainbow
91ed23e496 Merge pull request #79 from schmeiserd/master
fixed "empty array"-bug
2013-12-06 16:39:51 -08:00
Justin Rainbow
dea4e26d1b Merge pull request #78 from hglattergotz/ofPropertyFix
Add *Of properties to RefResolver
2013-12-06 16:38:30 -08:00
dominik.schmeiser
6bf095614a fixed "empty array"-bug 2013-11-05 09:55:35 +01:00
Henning Glatter-Götz
6d8dbed8e1 Update test case to account for 3 additional parameters
In JsonSchema\Tests\RefResolverTest::testResolve the
JsonSchema\RefResolver::resolveArrayOfSchemas method is now called 7
instead of 4 times due to the addition of 'oneOf', 'allOf' and 'anyOf'.
Change expected count from 4 to 7 in resolveProvider.
2013-10-10 22:43:47 +02:00
Henning Glatter-Götz
af5478d2cc Add *Of properties to RefResolver
The RefResolver currently skips any part of the schema that contains
'allOf', 'anyOf' or 'oneOf'. This prevents proper resolving of
references ($ref) that are inside of an array that is part of the above
mentioned properties.
Add the three property names to the array that is used to execute
resolveArrayOfSchemas().
2013-10-10 20:21:52 +02:00
Steven Garcia
508271550d Merge with upstream master branch. 2013-09-11 08:07:51 -07:00
Steven Garcia
b2165e188e Merge with upstream master 2013-09-11 07:59:41 -07:00
Justin Rainbow
22d97c2518 Merge pull request #75 from netresearch/ASTV-22
Fix for #62, #63, #64: automatically detect schema URL
2013-09-11 07:27:11 -07:00
Christian Weiske
97f1612358 Resolve relative schema path to cwd(), not json file 2013-09-10 08:59:01 +02:00
Christian Weiske
eac0fce135 Disallow persistent HTTP connections 2013-09-10 08:39:02 +02:00
Christian Weiske
0e0d4781be Fix #62: detect JSON schema from HTTP headers of data file 2013-09-10 08:38:56 +02:00
Christian Weiske
850319d4b2 Part of #62: support http/https schemas 2013-09-10 08:38:50 +02:00