Merge remote-tracking branch 'origin/3.5' into 3.6

.cow.json

@@ -0,0 +1,19 @@
+{
+  "github-slug": "silverstripe/silverstripe-installer",
+  "changelog-holder": "silverstripe/framework",
+  "changelog-path": "docs/en/04_Changelogs/{stability}/{version}.md",
+  "child-stability-inherit": true,
+  "dependency-constraint": "exact",
+  "vendors": [
+    "silverstripe"
+  ],
+  "archives": [
+    {
+      "recipe": "silverstripe/installer",
+      "files": [
+        "SilverStripe-cms-v{version}.zip",
+        "SilverStripe-cms-v{version}.tar.gz"
+      ]
+    }
+  ]
+}

.gitignore

@@ -4,8 +4,10 @@
 # ignore all environment files
 _ss_environment.php
 
-# ignore build tools
-/tools/phing-metadata
-
 # ignore composer vendor folder
 /vendor/
+/framework/
+/cms/
+/assets/
+/siteconfig/
+/reports/

assets/.gitignore

@@ -1,4 +1,4 @@
-# Ignore sensible defaults
-/*/
-/error-*.html
-/_combinedfiles/
+/**/*
+!.gitignore
+!.htaccess
+!web.config

composer.json

@@ -10,7 +10,7 @@
 		"silverstripe-themes/simple": "3.1.*"
 	},
 	"require-dev": {
-		"phpunit/PHPUnit": "~3.7@stable"
+		"phpunit/phpunit": "^3 || ^4 || ^5"
 	},
 	"extra": {
 		"branch-alias": {