Merge branch '2.0' into 2

.editorconfig

@@ -13,5 +13,8 @@ trim_trailing_whitespace = true
 [{*.yml,*.json}]
 indent_size = 2
 
+[composer.json]
+indent_size = 4
+
 # The indent size used in the package.json file cannot be changed:
 # https://github.com/npm/npm/pull/3180#issuecomment-16336516

composer.json

@@ -1,36 +1,31 @@
 {
-  "name": "silverstripe/testsession",
-  "type": "silverstripe-module",
-  "description": "Support module for browser-based test sessions, e.g. for Behat behaviour testing",
-  "homepage": "http://silverstripe.org",
-  "license": "BSD-3-Clause",
-  "keywords": [
-    "silverstripe",
-    "testing"
-  ],
-  "authors": [
-    {
-      "name": "SilverStripe",
-      "homepage": "http://silverstripe.com"
-    }
-  ],
-  "require": {
-    "composer/installers": "*",
-    "silverstripe/framework": "^4@dev"
-  },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "2.0.x-dev"
-    }
-  },
-  "scripts": {
-    "lint": "phpcs -s src/ tests/"
-  },
-  "autoload": {
-    "psr-4": {
-      "SilverStripe\\TestSession\\": "src/",
-      "SilverStripe\\TestSession\\Tests\\": "tests/"
-    }
-  },
-  "minimum-stability": "dev"
+    "name": "silverstripe/testsession",
+    "type": "silverstripe-module",
+    "description": "Support module for browser-based test sessions, e.g. for Behat behaviour testing",
+    "homepage": "http://silverstripe.org",
+    "license": "BSD-3-Clause",
+    "keywords": [
+        "silverstripe",
+        "testing"
+    ],
+    "authors": [
+        {
+            "name": "SilverStripe",
+            "homepage": "http://silverstripe.com"
+        }
+    ],
+    "require": {
+        "composer/installers": "*",
+        "silverstripe/framework": "^4@dev"
+    },
+    "scripts": {
+        "lint": "phpcs -s src/ tests/"
+    },
+    "autoload": {
+        "psr-4": {
+            "SilverStripe\\TestSession\\": "src/",
+            "SilverStripe\\TestSession\\Tests\\": "tests/"
+        }
+    },
+    "minimum-stability": "dev"
 }