From 68dad26482ec60b56ba859e1d8b89bcc5c080ad2 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Mon, 24 Jul 2017 16:27:53 +0200 Subject: [PATCH 1/2] Allow DBAL 2.6 to be installed DBAL 2.6 is released but currently dependencies can't be resolved as ORM 2.5 does not allow DBAL 2.6 and ORM 2.6 is not relased yet. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 759ae5c04..6bc5c1b0d 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "php": ">=5.4", "ext-pdo": "*", "doctrine/collections": "~1.2", - "doctrine/dbal": ">=2.5-dev,<2.6-dev", + "doctrine/dbal": ">=2.5-dev,<2.7-dev", "doctrine/instantiator": "~1.0.1", "doctrine/common": ">=2.5-dev,<2.8-dev", "doctrine/cache": "~1.4", From 11659f5cfed02685fb82584987837b0178d7f2b4 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Mon, 24 Jul 2017 16:38:01 +0200 Subject: [PATCH 2/2] Allow common 2.8 to be installed --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6bc5c1b0d..332eef010 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "doctrine/collections": "~1.2", "doctrine/dbal": ">=2.5-dev,<2.7-dev", "doctrine/instantiator": "~1.0.1", - "doctrine/common": ">=2.5-dev,<2.8-dev", + "doctrine/common": ">=2.5-dev,<2.9-dev", "doctrine/cache": "~1.4", "symfony/console": "~2.5|~3.0" },