From 157a2758557be4d7929780f4c60f874bf440fa49 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 1 Nov 2012 18:34:17 +0100
Subject: [PATCH 1/4] Removed custom repo sources from composer.json

We now own the packagist.org repos, no need for manual pointers.
---
 composer.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 composer.json

diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..4d36a69
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,16 @@
+{
+	"name": "silverstripe/installer",
+	"description": "The SilverStripe Framework Installer",
+	"require": {
+		"php": ">=5.2.4",
+		"silverstripe/cms": "2.4.x-dev",
+		"silverstripe/framework": "2.4.x-dev",
+		"silverstripe-themes/blackcandy": "2.4.x-dev"
+	},
+	"minimum-stability": "dev",
+	"extra": {
+		"installer-paths": {
+			"sapphire": ["silverstripe/framework"]
+		}
+	}
+}
\ No newline at end of file

From f8e860fac1e8cdbd56730da250420fafdf4eea92 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 8 Nov 2012 14:03:14 +0100
Subject: [PATCH 2/4] Removed .mergesources.yml, not used since the dark SVN
 days

---
 .mergesources.yml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 .mergesources.yml

diff --git a/.mergesources.yml b/.mergesources.yml
deleted file mode 100644
index bc71aae..0000000
--- a/.mergesources.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Data source for the "arb" svn merge tool (see http://github.com/sminnee/arborist).
-# Keeps track of all opensource branches of submodules 
-# that could be merged back to the current submodule paths.
-trunk:
-  .: /open/phpinstaller/trunk
-  sapphire: /open/modules/sapphire/trunk
-  cms: /open/modules/cms/trunk
-  jsparty: /open/modules/jsparty/trunk
\ No newline at end of file

From a2501ad2095edab8efd6bdece5b75f984a9905be Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 9 Nov 2012 11:48:34 +0100
Subject: [PATCH 3/4] Fixed bootstrap.php path in phpunit.xml.dist

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

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d0d294e..ea32e8a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -13,7 +13,7 @@
 	- sapphire/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool.
 -->
 <phpunit 
-	bootstrap="/sapphire/tests/bootstrap.php"
+	bootstrap="sapphire/tests/bootstrap.php"
 	colors="true"
 >
 	<testsuite name="Default">

From 9fa3c5216948cf5c1b7d3c6a219ecd3d9db7631c Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 28 Nov 2012 15:47:28 +0100
Subject: [PATCH 4/4] Exclude vendor/ folder from default phpunit run

Once we start placing SS modules in vendor/,
we need to find a smarter solution...
---
 phpunit.xml.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ea32e8a..3767765 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -18,6 +18,7 @@
 >
 	<testsuite name="Default">
 		<directory>./</directory>
+		<exclude>vendor/</exclude>
 	</testsuite>
 	
 	<filter>