From 9e31c3240bf44134fd51d46099d96618dda103ca Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dan@hens.by>
Date: Wed, 25 Oct 2017 17:58:53 +0100
Subject: [PATCH 1/2] Add composer autoloading support to 3.x

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 5e6db2e6..20b92514 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
 		}
 	},
 	"autoload": {
-		"classmap": ["tests/behat/"]
+		"classmap": ["tests/behat/", "code"]
 	},
 	"minimum-stability": "dev"
 }

From 39edaedc8f6736e26d40e0b05f2f8cd080e447bb Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dan@hens.by>
Date: Fri, 17 Nov 2017 11:45:41 +0000
Subject: [PATCH 2/2] Loosen PHPUnit constraints

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

diff --git a/composer.json b/composer.json
index 20b92514..94135c1d 100644
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,9 @@
 		"silverstripe/reports": "~3.4",
 		"silverstripe/siteconfig": "~3.4"
 	},
+	"require-dev": {
+		"phpunit/phpunit": "^3 || ^4 || ^5"
+	},
 	"extra": {
 		"branch-alias": {
 			"3.x-dev": "3.6.x-dev"