From 04297f36f6b814bb221aeca0bab8e2b579a05003 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Aug 2017 10:34:33 +0200 Subject: switch --- composer.json | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index be91142..684350f 100644 --- a/composer.json +++ b/composer.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/caching": "^2.2 || ^3.0", + "nette/utils": "^2.4 || ^3.0" }, "require-dev": { - "nette/di": "~2.3", - "nette/tester": "~1.4" + "nette/di": "^2.4 || ^3.0", + "nette/tester": "^2.0", + "tracy/tracy": "^2.4" }, "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" + } + } } -- cgit