From 46281d7d33920d7b8b237da0e7e150c3ec7e0b6c Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 18 Jun 2015 11:30:08 +1200 Subject: [PATCH 1/2] Alias 3 as 3.3 --- composer.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/composer.json b/composer.json index 2a8d893b..9f77cbfa 100644 --- a/composer.json +++ b/composer.json @@ -14,5 +14,10 @@ "require": { "php": ">=5.3.2", "silverstripe/framework": ">=3.1.x-dev" + }, + "extra": { + "branch-alias": { + "3.x-dev": "3.3.x-dev" + } } } From 2a76be8b942a955f4cb711a759a0952832aa46b6 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Sun, 21 Jun 2015 09:35:13 +0100 Subject: [PATCH 2/2] Bump PHP version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2a8d893b..1bc62e31 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "homepage": "http://silverstripe.org" }], "require": { - "php": ">=5.3.2", + "php": ">=5.3.3", "silverstripe/framework": ">=3.1.x-dev" } }