summaryrefslogtreecommitdiffstats
path: root/composer-dev.json
diff options
context:
space:
mode:
Diffstat (limited to 'composer-dev.json')
-rw-r--r--composer-dev.json20
1 files changed, 14 insertions, 6 deletions
diff --git a/composer-dev.json b/composer-dev.json
index ea85af1..ef4a5da 100644
--- a/composer-dev.json
+++ b/composer-dev.json
@@ -14,19 +14,27 @@
}
],
"require": {
- "php": ">=5.3.1",
+ "php": ">=5.6.0",
+ "ext-tokenizer": "*",
"nette/neon": "^2.3.3",
- "nette/php-generator": "^2.3.6",
- "nette/utils": "^2.3.5"
+ "nette/php-generator": "^2.4",
+ "nette/utils": "^2.4"
},
"require-dev": {
- "nette/tester": "^1.6"
+ "nette/tester": "~2.0",
+ "tracy/tracy": "^2.3"
},
"conflict": {
- "nette/nette": "<2.2"
+ "nette/nette": "<2.2",
+ "nette/bootstrap": "<2.4"
},
"autoload": {
"classmap": ["src/"]
},
- "minimum-stability": "dev"
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.4-dev"
+ }
+ }
}