diff options
| author | Remi Collet <remi@remirepo.net> | 2017-08-06 10:48:01 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-08-06 10:48:01 +0200 |
| commit | 1626cab82826d919e306dd51ea228f3ab8465e19 (patch) | |
| tree | 37c994ca9ef9c2c869d842b7964cc800fff2a7d2 /composer.json | |
| parent | db01fa5f6704479e1f2a6230c04ec19a99f24e04 (diff) | |
switch
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/composer.json b/composer.json index 153ed1f..f7b1268 100644 --- a/composer.json +++ b/composer.json @@ -14,15 +14,16 @@ } ], "require": { - "php": ">=5.3.1", + "php": ">=5.6.0", "ext-pdo": "*", "nette/caching": "^2.2", - "nette/utils": "^2.3.5" + "nette/utils": "^2.4 || ~3.0.0" }, "require-dev": { - "nette/tester": "^1.3", - "nette/di": "^2.3", - "mockery/mockery": "^0.9.1" + "nette/tester": "^2.0", + "nette/di": "^2.4 || ~3.0.0", + "mockery/mockery": "^1.0.0", + "tracy/tracy": "^2.4" }, "conflict": { "nette/nette": "<2.2" @@ -30,5 +31,10 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } } |