From 244578769d2d157043462e879af4e55bbb1ec3ac 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 d994a4604..b5e8b73af 100644 --- a/composer.json +++ b/composer.json @@ -48,9 +48,5 @@ ] }, "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - } + "version": "3.4-dev" } From a67c235fec4eba14b096c5a800f524b4177b6403 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 b5e8b73af..9135a767a 100644 --- a/composer.json +++ b/composer.json @@ -48,5 +48,5 @@ ] }, "minimum-stability": "dev", - "version": "3.4-dev" + "version": "3.4.x-dev" } From ff9374c1eb5e339bae16126f6949142fd83caaf2 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 9135a767a..bb8be863e 100644 --- a/composer.json +++ b/composer.json @@ -48,5 +48,7 @@ ] }, "minimum-stability": "dev", - "version": "3.4.x-dev" + "extra": { + "branch-version": "3.4-dev" + } } From 3040ea7c88044e6fe15a21ad6aa7f9b59116641f 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 bb8be863e..06b0b1471 100644 --- a/composer.json +++ b/composer.json @@ -49,6 +49,6 @@ }, "minimum-stability": "dev", "extra": { - "branch-version": "3.4-dev" + "branch-version": "3.4" } } From a10b1da6fc93080c180bba7219b5ff5b7518fe81 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 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 06b0b1471..298b99b66 100644 --- a/composer.json +++ b/composer.json @@ -47,8 +47,5 @@ "/Tests/" ] }, - "minimum-stability": "dev", - "extra": { - "branch-version": "3.4" - } + "minimum-stability": "dev" }