From 17092401a432866f578a48ca38661e6e7a2b93e6 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 6 Oct 2020 13:13:36 +0200 Subject: [PATCH 1/5] Remove "branch-alias", populate "version" --- composer.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 97f150f..0990c9d 100644 --- a/composer.json +++ b/composer.json @@ -32,9 +32,5 @@ "/Tests/" ] }, - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - } + "version": "3.4-dev" } From 4afd812a39c64f6a45e1f2b19e7cd0285fedcfc5 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 6 Oct 2020 16:37:11 +0200 Subject: [PATCH 2/5] Update versions in composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0990c9d..f291e20 100644 --- a/composer.json +++ b/composer.json @@ -32,5 +32,5 @@ "/Tests/" ] }, - "version": "3.4-dev" + "version": "3.4.x-dev" } From 30ec6eb3198aaa8d697cefb2a4aa5b09a3c00995 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 7 Oct 2020 14:58:11 +0200 Subject: [PATCH 3/5] Remove "version" from composer.json files, use "branch-version" instead --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f291e20..bf00a95 100644 --- a/composer.json +++ b/composer.json @@ -32,5 +32,7 @@ "/Tests/" ] }, - "version": "3.4.x-dev" + "extra": { + "branch-version": "3.4-dev" + } } From df12a498a643616a20009182b5b267de39153423 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 13 Oct 2020 15:20:16 +0200 Subject: [PATCH 4/5] Fix branch-version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bf00a95..ffab195 100644 --- a/composer.json +++ b/composer.json @@ -33,6 +33,6 @@ ] }, "extra": { - "branch-version": "3.4-dev" + "branch-version": "3.4" } } From a22265a9f3511c0212bf79f54910ca5a77c0e92c Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sat, 24 Oct 2020 12:23:57 +0200 Subject: [PATCH 5/5] Remove branch-version (keep them for contracts only) --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index ffab195..667df14 100644 --- a/composer.json +++ b/composer.json @@ -31,8 +31,5 @@ "exclude-from-classmap": [ "/Tests/" ] - }, - "extra": { - "branch-version": "3.4" } }