From e1f36c96394b4fdb7bf78445a65264b2eaaa8434 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Dec 2019 10:57:54 +0100 Subject: v3.1.2 --- composer.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 4cafd69..6dc6dc7 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "issues": "https://github.com/zendframework/zend-di/issues", "source": "https://github.com/zendframework/zend-di", "rss": "https://github.com/zendframework/zend-di/releases.atom", - "slack": "https://zendframework-slack.herokuapp.com", + "chat": "https://zendframework-slack.herokuapp.com", "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { @@ -24,12 +24,13 @@ }, "require-dev": { "container-interop/container-interop": "^1.2.0", - "mikey179/vfsStream": "^1.6", - "phpunit/phpunit": "^7.3", + "mikey179/vfsstream": "^1.6.7", + "phpunit/phpunit": "^7.5.18 || ^8.5", "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-servicemanager": "^3.0" }, "conflict": { + "phpspec/prophecy": "<1.9.0", "zendframework/zend-servicemanager-di": "*" }, "suggest": { @@ -50,8 +51,8 @@ }, "extra": { "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" + "dev-master": "3.1.x-dev", + "dev-develop": "3.2.x-dev" }, "zf": { "component": "Zend\\Di", -- cgit