Merge branch 'pulls/phpunit-composer' into 3.0

build.xml

@@ -119,6 +119,20 @@ Options:
 		=================================================================
 	-->
 
+	<target name="phpunit"
+		description="Runs unit tests as defined through phpunix.xml. Requires the 'phpunit' binary.">
+		<if>
+			<available file="${basedir}/vendor/bin/phpunit" />
+			<then>
+				<property name="phpunit_bin" value="vendor/bin/phpunit" />
+			</then>
+			<else>
+				<property name="phpunit_bin" value="phpunit" />
+			</else>
+		</if>
+		<exec command="${phpunit_bin}" checkreturn="true" passthru="true" />
+	</target>
+
 	<target name="tag" if="basedir" 
 		description="Creates a new git tag in all the nested working copies (optionally pushes the created tag)"
 		depends="_gitRepositories,_gitBinary">

composer.json

@@ -9,7 +9,8 @@
 	},
 	"require-dev": {
 		"silverstripe/compass": "*",
-		"silverstripe/docsviewer": "*"
+		"silverstripe/docsviewer": "*",
+		"phpunit/phpunit": "3.7.*"
 	},
 	"minimum-stability": "dev"
 }