Merge branch '1.5' into 1

.travis.yml

@@ -2,26 +2,18 @@
 
 language: php
 
-sudo: false
-
-dist: precise
-
-php:
- - 5.4
-
-env:
- - DB=MYSQL CORE_RELEASE=3.5
+dist: trusty
 
 matrix:
   include:
-    - php: 5.3
-      env: DB=PGSQL CORE_RELEASE=3.4
-    - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3.6
-    - php: 5.4
-      env: DB=MYSQL CORE_RELEASE=3.6
-    - php: 7.1
-      env: DB=MYSQL CORE_RELEASE=3.6
+    - php: '7.1'
+      env: DB=PGSQL CORE_RELEASE=3.7
+    - php: '7.1'
+      env: DB=MYSQL CORE_RELEASE=3.7
+    - php: '7.2'
+      env: DB=MYSQL CORE_RELEASE=3.7
+    - php: '7.3'
+      env: DB=MYSQL CORE_RELEASE=3.7
 
 before_script:
   - composer self-update || true

composer.json

@@ -15,15 +15,11 @@
         }
     ],
     "require": {
-        "silverstripe/framework": "~3.2",
-        "silverstripe/cms": "~3.2"
+        "silverstripe/framework": "~3.7",
+        "silverstripe/cms": "~3.7"
     },
     "require-dev": {
-        "phpunit/PHPUnit": "~3.7@stable"
+        "phpunit/phpunit": "^5.7"
     },
-    "extra": {
-        "branch-alias": {
-            "1.x-dev": "1.5.x-dev"
-        }
-    }
+    "extra": []
 }

tests/SubsiteXHRControllerTest.php

@@ -1,10 +1,7 @@
 <?php
 
 /**
- * Created by PhpStorm.
- * User: dmooyman
- * Date: 27/05/16
- * Time: 3:10 PM
+ * @mixin PHPUnit_Framework_TestCase
  */
 class SubsiteXHRControllerTest extends FunctionalTest
 {
@@ -34,7 +31,7 @@ class SubsiteXHRControllerTest extends FunctionalTest
 			'X-Requested-With' => 'XMLHttpRequest'
 		));
 		$this->assertEquals(200, $result->getStatusCode());
-		$this->assertEquals('text/json', $result->getHeader('Content-Type'));
+		$this->assertEquals('application/json', $result->getHeader('Content-Type'));
 		$body = $result->getBody();
 		$this->assertContains('Main site', $body);
 		$this->assertContains('Test 1', $body);