diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-08-02 16:26:53 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-08-02 16:26:53 +0200 |
| commit | 6a80314b17e11086d63bf2240e81c5d4da2745d5 (patch) | |
| tree | df0ac53f7f747088672a58eb949244b45583bb7a /composer-dev.json | |
| parent | ae734c3ec4f23f53026cda4e4e1d13dfaab2d67c (diff) | |
php-nette-di: 2.4.2
Diffstat (limited to 'composer-dev.json')
| -rw-r--r-- | composer-dev.json | 20 |
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" + } + } } |