Skip to content

Commit a23c680

Browse files
committed
Merge branch 'mchiocca-master'
* mchiocca-master: Updates PHP scrutinizer configs Add subset of draft-04 tests from JSON-Schema-Test-Suite. Delete composer.lock and add it back to .gitignore. Add draft-03 tests from json-schema/JSON-Schema-Test-Suite.
2 parents 241e147 + 235b79f commit a23c680

File tree

8 files changed

+568
-1
lines changed

8 files changed

+568
-1
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/composer.lock
21
/vendor
32
/bin
43
!/bin/validate-json

.scrutinizer.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
before_commands:
2+
- composer install --dev
3+
4+
tools:
5+
php_analyzer: true

composer.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,23 @@
2323
"email": "[email protected]"
2424
}
2525
],
26+
"repositories": [{
27+
"type": "package",
28+
"package": {
29+
"name": "json-schema/JSON-Schema-Test-Suite",
30+
"version": "1.1.0",
31+
"source": {
32+
"url": "https://github.com/json-schema/JSON-Schema-Test-Suite",
33+
"type": "git",
34+
"reference": "1.1.0"
35+
}
36+
}
37+
}],
2638
"require": {
2739
"php": ">=5.3.0"
2840
},
2941
"require-dev": {
42+
"json-schema/JSON-Schema-Test-Suite": "1.1.0",
3043
"phpunit/phpunit": "~3.7.0"
3144
},
3245
"autoload": {

0 commit comments

Comments
 (0)