From 6a80314b17e11086d63bf2240e81c5d4da2745d5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Aug 2016 16:26:53 +0200 Subject: php-nette-di: 2.4.2 --- composer-dev.json | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'composer-dev.json') 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" + } + } } -- cgit