From 2e3172c17369ad3ef5e72d8a900607c476aba90a Mon Sep 17 00:00:00 2001 From: Mike van Riel Date: Sun, 7 Jun 2015 15:07:32 +0200 Subject: [PATCH 1/2] Upped master dev version to 3.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cdd2b0f..5ab46f7 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0.x-dev" } } } From 9440ae1b6b26149c057fe56ffb8e7693a37342a4 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Fri, 12 Jun 2015 23:17:06 +0100 Subject: [PATCH 2/2] dev-master should always be avoided --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 05b2051..882dc8a 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ ], "require": { "php": ">=5.5", - "phpdocumentor/reflection-common": "dev-master@dev" + "phpdocumentor/reflection-common": "~1.0@dev" }, "autoload": { "psr-4": {"phpDocumentor\\Reflection\\": ["src/"]}