From 7b6f62968ce37e32971934d27e9337591919c223 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 18 Jun 2015 11:41:59 +1200 Subject: [PATCH 1/6] Set reports and siteconfig version dependency --- composer.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 9ba1b22..e522fea 100644 --- a/composer.json +++ b/composer.json @@ -5,16 +5,13 @@ "php": ">=5.3.2", "silverstripe/cms": "self.version", "silverstripe/framework": "self.version", + "silverstripe/reports": "self.version", + "silverstripe/siteconfig": "self.version", "silverstripe-themes/simple": "*" }, "require-dev": { "phpunit/PHPUnit": "~3.7@stable" }, - "extra": { - "branch-alias": { - "3.x-dev": "3.2.x-dev" - } - }, "config": { "process-timeout": 600 }, From f7f92b32260f31a5969dde4b1d8c55d81c289056 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Thu, 18 Jun 2015 11:28:22 +0100 Subject: [PATCH 2/6] FIX Invalid comment syntax for web.config This breaks the site on IIS --- web.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web.config b/web.config index 2418f45..2c7d6a7 100644 --- a/web.config +++ b/web.config @@ -1,4 +1,4 @@ -<--! Routing configuration for Microsoft IIS web server --> + From 8b015005301231cead97d6edaae050e18ce94418 Mon Sep 17 00:00:00 2001 From: David Alexander Date: Thu, 25 Jun 2015 12:16:03 +1200 Subject: [PATCH 3/6] DOCS: updated min php version updated minimum php version to 5.3.3 in doc block --- install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.php b/install.php index 97c288d..dd22f83 100644 --- a/install.php +++ b/install.php @@ -4,7 +4,7 @@ ************************************************************************************ ** ** ** If you can read this text in your browser then you don't have PHP installed. ** - ** Please install PHP 5.3.2 or higher, preferably PHP 5.3.4+. ** + ** Please install PHP 5.3.3 or higher, preferably PHP 5.3.4+. ** ** ** ************************************************************************************ ************************************************************************************/ From dec0b889ad95abb67d9df53e09197f81f95e792b Mon Sep 17 00:00:00 2001 From: David Alexander Date: Thu, 25 Jun 2015 12:42:57 +1200 Subject: [PATCH 4/6] Updated minimum php version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e522fea..bef0c76 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "silverstripe/installer", "description": "The SilverStripe Framework Installer", "require": { - "php": ">=5.3.2", + "php": ">=5.3.3", "silverstripe/cms": "self.version", "silverstripe/framework": "self.version", "silverstripe/reports": "self.version", From 357ab55b183ee87a7efe4247ddaadf7a6fbfc102 Mon Sep 17 00:00:00 2001 From: David Alexander Date: Thu, 25 Jun 2015 12:44:12 +1200 Subject: [PATCH 5/6] Update min php version --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index bb13fff..f45eb36 100644 --- a/index.php +++ b/index.php @@ -4,7 +4,7 @@ ************************************************************************************ ** ** ** If you can read this text in your browser then you don't have PHP installed. ** - ** Please install PHP 5.3.2 or higher, preferably PHP 5.3.4+. ** + ** Please install PHP 5.3.3 or higher, preferably PHP 5.3.4+. ** ** ** ************************************************************************************ ************************************************************************************/ From ea72c5def059a5912b21b40caae4a4df6ddb1c12 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Fri, 3 Jul 2015 17:34:58 +0100 Subject: [PATCH 6/6] Prefer stable packages while still allowing dev ones. Fixes #100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Although the original ticket recommended increasing our minimum-stability, this change gives us the best of both worlds. - Where stable packages are available and meet the requirements, they will be used. - Where stable packages aren’t available or they don’t meet the dependency requirements, non-stable packages are still allowed. As part of this I have also tightened up the silverstripe-themes req version, as “*” is an anti-pattern. The versioning of the theme has rightly split off from the versioning of the framework; it looks like 3.1.* is what we should expect. Arguably, we could set the dependency to ~3.1, but in this case I think it’s fine to be conservative. --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index bef0c76..346000e 100644 --- a/composer.json +++ b/composer.json @@ -7,13 +7,14 @@ "silverstripe/framework": "self.version", "silverstripe/reports": "self.version", "silverstripe/siteconfig": "self.version", - "silverstripe-themes/simple": "*" + "silverstripe-themes/simple": "3.1.*" }, "require-dev": { - "phpunit/PHPUnit": "~3.7@stable" + "phpunit/PHPUnit": "~3.7" }, "config": { "process-timeout": 600 }, + "prefer-stable": true, "minimum-stability": "dev" }