Merge branch '3.0'

.travis.yml

@@ -1,4 +1,4 @@
-# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
+# See https://github.com/silverstripe/silverstripe-travis-support for setup details
 
 sudo: false
 
@@ -8,11 +8,9 @@ php:
   - 5.3
   - 5.4
   - 5.5
-  - 5.6
-  - 7.0
 
 env:
-  - DB=MYSQL CORE_RELEASE=3.2
+  - DB=MYSQL CORE_RELEASE=3.5
 
 matrix:
   include:
@@ -22,12 +20,12 @@ matrix:
       env: DB=MYSQL CORE_RELEASE=3.1
     - php: 5.6
       env: DB=PGSQL CORE_RELEASE=3.2
-  allow_failures:
-    - php: 7.0
+    - php: 7.1
+      env: DB=MYSQL CORE_RELEASE=3.6
 
 before_script:
   - 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
   - cd ~/builds/ss
   - composer install

code/extensions/SiteTreeContentReview.php

@@ -458,6 +458,10 @@ class SiteTreeContentReview extends DataExtension implements PermissionProvider
             return false;
         }
 
+        if (!$options || !$options->hasExtension($this->class)) {
+            return false;
+        }
+
         if ($options->OwnerGroups()->count() == 0 && $options->OwnerUsers()->count() == 0) {
             return false;
         }

composer.json

@@ -4,7 +4,11 @@
     "description": "Flags pages for periodical author review (incl. reporting)",
     "homepage": "http://silverstripe.org",
     "license": "BSD-3-Clause",
-	"keywords": ["silverstripe", "cms", "workflow"],
+    "keywords": [
+        "silverstripe",
+        "cms",
+        "workflow"
+    ],
     "authors": [
         {
             "name": "SilverStripe",
@@ -20,12 +24,8 @@
         "silverstripe/framework": "~3.1",
         "silverstripe/cms": "~3.1"
     },
-    "suggests": {
+    "suggest": {
         "silverstripe/queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created"
     },
-	"extra": {
-		"branch-alias": {
-			"dev-master": "3.0.x-dev"
-		}
-	}
+    "extra": []
 }

tests/ContentReviewCMSPageEditControllerTest.php

@@ -67,7 +67,7 @@ class ContentReviewCMSPageEditControllerTest extends ContentReviewBaseTest
         );
 
         $this->get('admin/pages/edit/show/' . $page->ID);
-        $response = $this->post("admin/pages/edit/EditForm", $data);
+        $response = $this->post(singleton('CMSPageEditController')->getEditForm($page->ID)->FormAction(), $data);
 
         $this->assertEquals("OK", $response->getStatusDescription());
         $this->assertEquals(200, $response->getStatusCode());
@@ -90,7 +90,7 @@ class ContentReviewCMSPageEditControllerTest extends ContentReviewBaseTest
         );
 
         $this->get('admin/pages/edit/show/' . $page->ID);
-        $response = $this->post("admin/pages/edit/EditForm", $data);
+        $response = $this->post(singleton('CMSPageEditController')->getEditForm($page->ID)->FormAction(), $data);
 
         $this->assertEquals("OK", $response->getStatusDescription());
         $this->assertEquals(200, $response->getStatusCode());