summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-07-05 08:26:36 +0200
committerRemi Collet <fedora@famillecollet.com>2016-07-05 08:26:36 +0200
commit1831f73d89bb7b39cbc4e77f10fcf63c96284663 (patch)
treed7ec4da119540c5d91fb8e40020fac769f481b3f /composer.json
parentd9bf2ed8e3744dd093ba0a9375577cf35a5583af (diff)
php-bartlett-php-compatinfo-db: 1.10.0
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json7
1 files changed, 3 insertions, 4 deletions
diff --git a/composer.json b/composer.json
index 10fc4f8..fc3d584 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
},
"require": {
"php": "^5.3.2 || ^7.0",
- "justinrainbow/json-schema": "^1.6",
+ "justinrainbow/json-schema": "^1.6 || ^2.0",
"composer/ca-bundle": "^1.0",
"composer/semver": "^1.0",
"composer/spdx-licenses": "^1.0",
@@ -38,9 +38,8 @@
},
"require-dev": {
"phpunit/phpunit": "^4.5 || ^5.0.5",
- "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+ "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
},
- "_": "phpunit/phpunit-mock-objects required in 2.3.0 due to https://github.com/sebastianbergmann/phpunit-mock-objects/issues/223 - needs hhvm 3.8+ on travis",
"config": {
"platform": {
"php": "5.3.9"
@@ -60,7 +59,7 @@
"bin": ["bin/composer"],
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "1.2-dev"
}
},
"scripts": {