diff options
author | Remi Collet <remi@remirepo.net> | 2017-08-05 11:54:50 +0200 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2017-08-05 11:54:50 +0200 |
commit | 10e2fbbb54c5b4991c0cbd286c712a8a360d2900 (patch) | |
tree | 0679f1e4697460879e76513d0d8292b1148fada7 /composer.json | |
parent | afa3dceaedf5edbeec1f02edb3bf6e5d6cca2d9b (diff) |
switch
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/composer.json b/composer.json index 1018199..c4ef526 100644 --- a/composer.json +++ b/composer.json @@ -14,27 +14,27 @@ } ], "require": { - "php": ">=5.3.1", - "nette/di": "~2.3.0", - "nette/utils": "~2.2" + "php": ">=5.6.0", + "nette/di": "~2.4.7", + "nette/utils": "~2.4" }, "suggest": { "nette/robot-loader": "to use Configurator::createRobotLoader()", - "tracy/tracy": "to use Configurator::enableDebugger()" + "tracy/tracy": "to use Configurator::enableTracy()" }, "require-dev": { "nette/application": "~2.3", "nette/caching": "~2.3", "nette/database": "~2.3", "nette/forms": "~2.3", - "nette/http": "~2.3", + "nette/http": "~2.4.0", "nette/mail": "~2.3", - "nette/robot-loader": "~2.2", + "nette/robot-loader": "^2.4.2 || ^3.0", "nette/safe-stream": "~2.2", "nette/security": "~2.3", - "nette/tester": "~1.3", + "nette/tester": "~2.0", "latte/latte": "~2.2", - "tracy/tracy": "~2.3" + "tracy/tracy": "^2.4.1" }, "conflict": { "nette/nette": "<2.2" @@ -42,5 +42,10 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } } |