From 2902d08b423c20548ba43f2d3795d2a2412fb5c9 Mon Sep 17 00:00:00 2001 From: thedamnedrhino Date: Sat, 10 Jun 2017 11:17:14 +0430 Subject: [PATCH 1/3] Create composer.json --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 88aee8c6..089df8a1 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "php": ">=5.3.2", "symfony/framework-bundle": "~2.8 || ^3.0", "symfony/form": "~2.8 || ^3.0", - "twig/twig": "~1.14" + "twig/twig": "~1.14 || ~2.0" }, "suggest": { "symfony/twig-bridge": "For integration into Twig templates", @@ -38,7 +38,8 @@ "target-dir": "Genemu/Bundle/FormBundle", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.0-dev", + "dev-twig2": "3.1-dev" } } } From 44d651774f1a02988f6d0bdc5b48dfd025ee51fb Mon Sep 17 00:00:00 2001 From: thedamnedrhino Date: Sat, 10 Jun 2017 12:33:09 +0430 Subject: [PATCH 2/3] fix composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 089df8a1..a7a2869d 100644 --- a/composer.json +++ b/composer.json @@ -38,8 +38,8 @@ "target-dir": "Genemu/Bundle/FormBundle", "extra": { "branch-alias": { - "dev-master": "3.0-dev", - "dev-twig2": "3.1-dev" + "dev-master": "3.0.x-dev", + "dev-twig2": "3.1.x-dev" } } } From 133b7a7221b92b30492d42d47720a6c4bd7bd257 Mon Sep 17 00:00:00 2001 From: thedamnedrhino Date: Sun, 18 Jun 2017 14:45:19 +0430 Subject: [PATCH 3/3] removed the branch alias for the twig2 branch --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index a7a2869d..41a005dc 100644 --- a/composer.json +++ b/composer.json @@ -38,8 +38,7 @@ "target-dir": "Genemu/Bundle/FormBundle", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev", - "dev-twig2": "3.1.x-dev" + "dev-master": "3.0.x-dev" } } }