From 8f42b93713440512131ecfc3617e16818bd69785 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Thu, 21 Feb 2019 11:09:25 +0700
Subject: [PATCH 1/2] Update framework to 3.7.3 and docsviewer to 2.0 stable

---
 composer.json |  4 ++--
 composer.lock | 25 ++++++++++++-------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/composer.json b/composer.json
index 543f94c..a30a1c9 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
 	"require": {
 		"ext-gd": "*",
 		"ext-mbstring": "*",
-		"silverstripe/docsviewer": "^2.0@rc",
+		"silverstripe/docsviewer": "^2.0",
 		"silverstripe/framework": "~3.6",
 		"silverstripe/toolbar": "^4.2",
 		"silverstripe/dynamodb": "^1.1",
@@ -12,7 +12,7 @@
 		"silverstripe/raygun": "^1.1"
 	},
 	"require-dev": {
-		"phpunit/PHPUnit": "~3.7@stable"
+		"phpunit/phpunit": "~3.7@stable"
 	},
 	"repositories": [
         {
diff --git a/composer.lock b/composer.lock
index fb6c0a2..67d7a3c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1d2f6da0ba93e21841fdd1d85a5d60cd",
+    "content-hash": "4f381c5fae8e2f6af144bbbcd81fa6c3",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
@@ -712,16 +712,16 @@
         },
         {
             "name": "silverstripe/docsviewer",
-            "version": "2.0.0-rc3",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
-                "reference": "03ec3d287e909e8b33811c1e7121a9f2f7554190"
+                "reference": "171652b33821d342ac1603c3bb0e0bdddc111a26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/03ec3d287e909e8b33811c1e7121a9f2f7554190",
-                "reference": "03ec3d287e909e8b33811c1e7121a9f2f7554190",
+                "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/171652b33821d342ac1603c3bb0e0bdddc111a26",
+                "reference": "171652b33821d342ac1603c3bb0e0bdddc111a26",
                 "shasum": ""
             },
             "require": {
@@ -755,7 +755,7 @@
                 "documentation",
                 "silverstripe"
             ],
-            "time": "2018-06-08T04:14:53+00:00"
+            "time": "2019-02-14T07:56:02+00:00"
         },
         {
             "name": "silverstripe/dynamodb",
@@ -800,16 +800,16 @@
         },
         {
             "name": "silverstripe/framework",
-            "version": "3.7.0",
+            "version": "3.7.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/silverstripe/silverstripe-framework.git",
-                "reference": "d9261af1f3201fcea0d67a72b6fa1408ec69effc"
+                "reference": "bb5701b73d40909caf99d71bac02e0329d301335"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/d9261af1f3201fcea0d67a72b6fa1408ec69effc",
-                "reference": "d9261af1f3201fcea0d67a72b6fa1408ec69effc",
+                "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/bb5701b73d40909caf99d71bac02e0329d301335",
+                "reference": "bb5701b73d40909caf99d71bac02e0329d301335",
                 "shasum": ""
             },
             "require": {
@@ -877,7 +877,7 @@
                 "framework",
                 "silverstripe"
             ],
-            "time": "2018-06-08T00:19:40+00:00"
+            "time": "2019-02-12T08:44:41+00:00"
         },
         {
             "name": "silverstripe/raygun",
@@ -1546,7 +1546,6 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
-        "silverstripe/docsviewer": 5,
         "phpunit/phpunit": 0
     },
     "prefer-stable": true,

From eaea536819e33933852efd871db231185ff9c9a1 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Thu, 21 Feb 2019 11:11:13 +0700
Subject: [PATCH 2/2] Add platform configuration for PHP version and reference
 PHP 7.1 in readme

---
 .platform.yml | 2 ++
 README.md     | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .platform.yml

diff --git a/.platform.yml b/.platform.yml
new file mode 100644
index 0000000..dbb8008
--- /dev/null
+++ b/.platform.yml
@@ -0,0 +1,2 @@
+php_settings:
+  version: 7.1
diff --git a/README.md b/README.md
index ff23ed6..95c5991 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,8 @@ For adding functionality or editing the style of the documentation, see the
 
 To set up a local instance of [doc.silverstripe.org](https://github.com/SpiritLevel/doc.silverstripe.org):
 
-* Install [Composer](https://docs.silverstripe.org/en/getting_started/composer).
+* Ensure you are running the required PHP version (see .platform.yml)
+* Install [Composer](https://docs.silverstripe.org/en/getting_started/composer)
 * Install [sake](https://docs.silverstripe.org/en/developer_guides/cli).
 * Clone this repository to a LAMP server. For example, the shell command
 ```
@@ -118,3 +119,5 @@ versions that are not stable.
 ## Deployment
 
 Deployment is via the [SilverStripe Platform](https://www.silverstripe.com/platform/) deployment tool and uses [StackShare](http://www.silverstripe.com/platform/technical/).
+
+For platform configuration, see .platform.yml.