From 1742fa79c9bd8be6823dd6dcc73e59acdd7ed6f6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Aug 2017 09:53:24 +0200 Subject: switch --- composer.json | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index a138339..d8dca7c 100644 --- a/composer.json +++ b/composer.json @@ -14,13 +14,14 @@ } ], "require": { - "php": ">=5.3.1", + "php": ">=5.6.0", "ext-iconv": "*", - "nette/utils": "~2.2" + "nette/utils": "^2.4 || ~3.0.0" }, "require-dev": { - "nette/di": "~2.3", - "nette/tester": "~1.3" + "nette/di": "^2.4 || ~3.0.0", + "nette/tester": "^2.0", + "tracy/tracy": "^2.4" }, "conflict": { "nette/nette": "<2.2" @@ -31,5 +32,10 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } } -- cgit