summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-08-06 10:34:33 +0200
committerRemi Collet <remi@remirepo.net>2017-08-06 10:34:33 +0200
commit04297f36f6b814bb221aeca0bab8e2b579a05003 (patch)
treeea02c31a4b49df56812313b5f6903a10a280f95c /composer.json
parentad1953ba93b82811a49eb3ead8602291fbd0213c (diff)
switch
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json18
1 files changed, 12 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index be91142..684350f 100644
--- a/composer.json
+++ b/composer.json
@@ -14,14 +14,15 @@
}
],
"require": {
- "php": ">=5.3.1",
+ "php": ">=5.6.0",
"ext-tokenizer": "*",
- "nette/caching": "~2.2",
- "nette/utils": "~2.2"
+ "nette/caching": "^2.2 || ^3.0",
+ "nette/utils": "^2.4 || ^3.0"
},
"require-dev": {
- "nette/di": "~2.3",
- "nette/tester": "~1.4"
+ "nette/di": "^2.4 || ^3.0",
+ "nette/tester": "^2.0",
+ "tracy/tracy": "^2.4"
},
"conflict": {
"nette/nette": "<2.2"
@@ -29,5 +30,10 @@
"autoload": {
"classmap": ["src/"]
},
- "minimum-stability": "dev"
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.4-dev"
+ }
+ }
}