summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-05-11 09:56:01 +0200
committerRemi Collet <fedora@famillecollet.com>2016-05-11 09:56:01 +0200
commite0deef35a6d990f0f8739fa125e04fc58acff926 (patch)
tree6a429724083937b795b69493935bda1acd4781ef /composer.json
parenta7d179b15f1985770cfded18712c81dfd76d3868 (diff)
composer: 1.1.0
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json8
1 files changed, 5 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index f457758..10fc4f8 100644
--- a/composer.json
+++ b/composer.json
@@ -24,15 +24,17 @@
"require": {
"php": "^5.3.2 || ^7.0",
"justinrainbow/json-schema": "^1.6",
- "composer/spdx-licenses": "^1.0",
+ "composer/ca-bundle": "^1.0",
"composer/semver": "^1.0",
+ "composer/spdx-licenses": "^1.0",
"seld/jsonlint": "^1.4",
"symfony/console": "^2.5 || ^3.0",
"symfony/finder": "^2.2 || ^3.0",
"symfony/process": "^2.1 || ^3.0",
"symfony/filesystem": "^2.5 || ^3.0",
"seld/phar-utils": "^1.0",
- "seld/cli-prompt": "^1.0"
+ "seld/cli-prompt": "^1.0",
+ "psr/log": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^4.5 || ^5.0.5",
@@ -58,7 +60,7 @@
"bin": ["bin/composer"],
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "1.1-dev"
}
},
"scripts": {