From e263ba33ec5cb36123169a917ba00e1167888a5c Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Tue, 20 Dec 2016 16:57:05 +1300
Subject: [PATCH] Update Travis and Scrutinizer configuration, add note to
 readme

---
 .scrutinizer.yml |  2 +-
 .travis.yml      | 33 ++++++++++++++++-----------------
 README.md        | 20 ++++++++++++--------
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 61b0c9f..de09355 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -6,4 +6,4 @@ checks:
     duplication: true
 
 filter:
-  paths: [code/*, tests/*]
+  paths: [src/*, tests/*]
diff --git a/.travis.yml b/.travis.yml
index 41abb51..ab21202 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,6 @@ before_install:
 
 env:
   global:
-    - DB=MYSQL CORE_RELEASE=3.1
-
     # Turn coverage off by default, as it's expensive time wise
     - COVERAGE=0
 
@@ -21,31 +19,32 @@ env:
     - MODULE_PATH=blog
 
 matrix:
-  allow_failures:
-    - php: hhvm-nightly
   include:
-    - php: 5.6
-      env: DB=MYSQL COVERAGE=1
     - php: 5.5
-      env: DB=MYSQL
+      env: DB=MYSQL CORE_RELEASE=4
+
     - php: 5.6
-      env: DB=PGSQL
+      env: DB=MYSQL CORE_RELEASE=4 COVERAGE=1
     - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3.2
+      env: DB=PGSQL CORE_RELEASE=4
     - php: 5.6
-      env: DB=PGSQL CORE_RELEASE=3.2
-    - php: 5.4
-      env: DB=SQLITE
-    - php: 5.3
-      env: DB=MYSQL
-    - php: hhvm
-      env: DB=MYSQL
+      env: DB=SQLITE CORE_RELEASE=4
+
+    - php: 7.0
+      env: DB=MYSQL CORE_RELEASE=4
+
+    - php: 7.1
+      env: DB=MYSQL CORE_RELEASE=4
+    - php: 7.1
+      env: DB=PGSQL CORE_RELEASE=4
+    - php: 7.1
+      env: DB=SQLITE CORE_RELEASE=4
 
 
 before_script:
   - phpenv rehash
   - composer self-update || true
-  - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
+  - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support
   - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require "silverstripe/comments" --require "silverstripe/widgets"
   - cd ~/builds/ss
 
diff --git a/README.md b/README.md
index a612d19..800304f 100755
--- a/README.md
+++ b/README.md
@@ -10,16 +10,16 @@
 
 
 ## Documentation
-[User guide](docs/en/userguide/index.md)
 
-[Developer documentation](docs/en/index.md)
+* [User guide](docs/en/userguide/index.md)
+* [Developer documentation](docs/en/index.md)
 
 ## Requirements
 
 ```
-silverstripe/cms: ^3.1
-silverstripe/lumberjack: ^1.1
-silverstripe/tagfield: ^1.0
+silverstripe/cms: ^4.0
+silverstripe/lumberjack: ^2.0
+silverstripe/tagfield: ^2.0
 ```
 
 ### Suggested Modules
@@ -35,8 +35,12 @@ silverstripe/comments: *
 composer require silverstripe/blog
 ```
 
-## Upgrading legacy blog to 2.x
+## Upgrading
+
+### Upgrading from 2.x to 3.x
+
+Aside from the framework and CMS upgrades required the blog module should not require anything extra to be completed.
+
+### Upgrading legacy blog to 2.x
 
 If you're upgrading from blog version 1.0 to 2.x you will need to run the `BlogMigrationTask`. Run the task using `dev/tasks/BlogMigrationTask` either via the browser or sake CLI to migrate your legacy blog to the new version data structure.
-
-