diff options
Diffstat (limited to 'composer-dev.json')
| -rw-r--r-- | composer-dev.json | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/composer-dev.json b/composer-dev.json index be91142..07cbec3 100644 --- a/composer-dev.json +++ b/composer-dev.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/utils": "~2.4" }, "require-dev": { "nette/di": "~2.3", - "nette/tester": "~1.4" + "nette/tester": "~2.0", + "tracy/tracy": "^2.3" }, "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" + } + } } |