summaryrefslogtreecommitdiffstats
path: root/composer-dev.json
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-08-04 09:50:08 +0200
committerRemi Collet <fedora@famillecollet.com>2016-08-04 09:50:08 +0200
commit8b0a4032838b545a1bf816cd7dfda02fb65083fa (patch)
tree93e75a72c2c84480cb701660d95f19d767f117e5 /composer-dev.json
parent15922b67844d6c700ceaa59e1cf5d4bc915f92d2 (diff)
php-nette-robot-loader: 2.4.0
Diffstat (limited to 'composer-dev.json')
-rw-r--r--composer-dev.json14
1 files changed, 10 insertions, 4 deletions
diff --git a/composer-dev.json b/composer-dev.json
index 92d3d12..a407f85 100644
--- a/composer-dev.json
+++ b/composer-dev.json
@@ -14,13 +14,14 @@
}
],
"require": {
- "php": ">=5.3.1",
+ "php": ">=5.6.0",
"nette/caching": "~2.2",
"nette/finder": "~2.3",
- "nette/utils": "~2.2"
+ "nette/utils": "~2.4"
},
"require-dev": {
- "nette/tester": "~1.4"
+ "nette/tester": "~2.0",
+ "tracy/tracy": "^2.3"
},
"conflict": {
"nette/nette": "<2.2"
@@ -28,5 +29,10 @@
"autoload": {
"classmap": ["src/"]
},
- "minimum-stability": "dev"
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.4-dev"
+ }
+ }
}