From 9ce1eedf2f41d5d216cfaab940a5052558d4ee9d Mon Sep 17 00:00:00 2001
From: Ingo Schommer <me@chillu.com>
Date: Wed, 27 Sep 2017 18:09:56 +1300
Subject: [PATCH 1/4] Expose as vendor module

---
 composer.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index e7fa293a..7b19f6a4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "silverstripe/reports",
-    "type": "silverstripe-module",
+    "type": "silverstripe-vendormodule",
     "description": "Reports module for SilverStripe CMS",
     "homepage": "http://silverstripe.org",
     "license": "BSD-3-Clause",
@@ -24,7 +24,8 @@
         "silverstripe/admin": "^1.0@dev",
         "silverstripe/versioned": "^1.0@dev",
         "silverstripe/config": "^1.0@dev",
-        "silverstripe/assets": "^1.0@dev"
+        "silverstripe/assets": "^1.0@dev",
+        "silverstripe/vendor-plugin": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7"
@@ -33,7 +34,10 @@
         "branch-alias": {
             "4.x-dev": "4.0.x-dev",
             "dev-master": "5.x-dev"
-        }
+        },
+        "expose": [
+          "javascript"
+        ]
     },
     "autoload": {
         "psr-4": {

From ca60b94f2e982a7b42a74c15c6aa3431c8f2f153 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 5 Oct 2017 09:50:04 +1300
Subject: [PATCH 2/4] BUG Fix vendor bootstrap path

---
 phpunit.xml.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a07c0ae4..6852caf8 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,4 +1,4 @@
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
+<phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
 
     <testsuite name="Default">
         <directory>tests</directory>

From 7a2344117edc781344d711914abe5ec94de2889e Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 11 Oct 2017 17:31:46 +1300
Subject: [PATCH 3/4] Remove obsolete branch-alias

---
 composer.json | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 7b19f6a4..c0287b85 100644
--- a/composer.json
+++ b/composer.json
@@ -31,12 +31,8 @@
         "phpunit/phpunit": "^5.7"
     },
     "extra": {
-        "branch-alias": {
-            "4.x-dev": "4.0.x-dev",
-            "dev-master": "5.x-dev"
-        },
         "expose": [
-          "javascript"
+            "javascript"
         ]
     },
     "autoload": {
@@ -51,4 +47,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}
\ No newline at end of file

From c5ca89a173d76d7927d5c03db4a51539616da141 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 12 Oct 2017 12:57:05 +1300
Subject: [PATCH 4/4] Update editorconfig

---
 .editorconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index 3dfb23c7..91e325d6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,5 +14,8 @@ trim_trailing_whitespace = true
 indent_size = 2
 indent_style = space
 
+[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