From c02d8515002f7702f2c6ea5227bd8a1e1633fa91 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Tue, 13 Jun 2017 11:09:56 +1200
Subject: [PATCH 1/2] FIX Remove providePermissions tests

Removed the testProvidePermissions case since it is testing localisations that do not exist, and a localisation that belongs to the framework which should not be tested here.
---
 tests/CommentAdminTest.php | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/tests/CommentAdminTest.php b/tests/CommentAdminTest.php
index b357fe0..4629149 100644
--- a/tests/CommentAdminTest.php
+++ b/tests/CommentAdminTest.php
@@ -2,34 +2,7 @@
 
 class CommentAdminTest extends SapphireTest
 {
-
     protected $usesDatabase = true;
-    
-    public function testProvidePermissions()
-    {
-        $commentAdmin = new CommentAdmin();
-        $locale = i18n::get_locale();
-
-        i18n::set_locale('fr');
-        $expected = array(
-            'CMS_ACCESS_CommentAdmin' => array(
-                # FIXME - this is a bug, missing from lang.yml files
-                'name' => 'Access to \'Comments\' section',
-                'category' => 'Accès au CMS'
-            )
-        );
-        $this->assertEquals($expected, $commentAdmin->providePermissions());
-
-        i18n::set_locale($locale);
-        $expected = array(
-            'CMS_ACCESS_CommentAdmin' => array(
-                # FIXME - this is a bug, missing from lang.yml files
-                'name' => 'Access to \'Comments\' section',
-                'category' => 'CMS Access'
-            )
-        );
-        $this->assertEquals($expected, $commentAdmin->providePermissions());
-    }
 
     public function testGetEditForm()
     {

From 8ede35e6bd48403461da9bc4bdd8c2036d6c3222 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Tue, 13 Jun 2017 11:13:48 +1200
Subject: [PATCH 2/2] Update Travis build matrix to include PHP 7.1, SS 3.5,
 3.6 and 3.x-dev explicitly

---
 .travis.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bbdf9f8..a166ee2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,15 +11,13 @@ php:
   - 5.3
   - 5.4
   - 5.5
-  - 5.6
-  - 7.0
 
 before_install:
   - pip install --user codecov
 
 env:
   global:
-    - DB=MYSQL CORE_RELEASE=3.1
+    - DB=MYSQL CORE_RELEASE=3.5
     - MODULE_PATH=comments
 
     # Set to 1 in the matrix to enable code coverage
@@ -29,15 +27,13 @@ matrix:
   include:
     - php: 5.6
       #CommentsListTest breaks with this env: DB=MYSQL CORE_RELEASE=3.2 COVERAGE=1
-      env: DB=SQLITE CORE_RELEASE=3.2 COVERAGE=1
+      env: DB=SQLITE CORE_RELEASE=3.5 COVERAGE=1
+    - php: 7.1
+      env: DB=MYSQL CORE_RELEASE=3.6
     - php: 5.6
+      env: DB=PGSQL CORE_RELEASE=3.5
+    - php: 7.1
       env: DB=MYSQL CORE_RELEASE=3
-    - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3.1
-    - php: 5.6
-      env: DB=PGSQL CORE_RELEASE=3.2
-  allow_failures:
-    - php: 7.0
 
 before_script:
   - phpenv rehash