Skip to content

Commit f36863c

Browse files
authored
Merge pull request #21 from swaggest/upd-json-diff
updating json-diff
2 parents 8457c91 + 547fb16 commit f36863c

File tree

4 files changed

+1979
-5
lines changed

4 files changed

+1979
-5
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
vendor
22
.idea
3-
composer.lock
43
composer.phar
54
clover.xml
65
build

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ cache:
1919

2020
# execute any number of scripts before the test run, custom env's are available as variables
2121
before_script:
22-
- ls -la $HOME/.composer/cache
23-
- test -f $HOME/.composer/cache/composer.lock.$(phpenv version-name) && cp $HOME/.composer/cache/composer.lock.$(phpenv version-name) ./composer.lock || echo "No composer.lock cached"
2422
- composer install --dev --no-interaction --prefer-dist
25-
- test -f $HOME/.composer/cache/composer.lock.$(phpenv version-name) || cp ./composer.lock $HOME/.composer/cache/composer.lock.$(phpenv version-name)
2623
- if [[ $(phpenv version-name) =~ 7.2 ]] ; then test -f $HOME/.composer/cache/phpstan.phar || wget https://github.com/phpstan/phpstan/releases/download/0.9.2/phpstan.phar -O $HOME/.composer/cache/phpstan.phar; fi
2724
- if [[ $(phpenv version-name) =~ 7.2 ]] ; then test -f $HOME/.composer/cache/ocular.phar || wget https://scrutinizer-ci.com/ocular.phar -O $HOME/.composer/cache/ocular.phar; fi
2825
- if [[ $(phpenv version-name) =~ 7.2 ]] ; then test -f $HOME/.composer/cache/cctr || wget https://codeclimate.com/downloads/test-reporter/test-reporter-0.1.4-linux-amd64 -O $HOME/.composer/cache/cctr && chmod +x $HOME/.composer/cache/cctr; fi

composer.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"require": {
66
"php": ">=5.4",
77
"phplang/scope-exit": "^1.0",
8-
"swaggest/json-diff": "^2.0"
8+
"swaggest/json-diff": "^3.0"
99
},
1010
"require-dev": {
1111
"phpunit/phpunit": "4.8.35",
@@ -37,5 +37,10 @@
3737
},
3838
"scripts": {
3939
"gen-json-struct": "php ./tools/generate_json_structures.php"
40+
},
41+
"config": {
42+
"platform": {
43+
"php": "5.4.45"
44+
}
4045
}
4146
}

0 commit comments

Comments
 (0)