From 22eb57e49c7071a5a5ccf3f25a86384a4f46216b Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Sat, 3 May 2014 11:30:26 +0100
Subject: [PATCH] Use new coverage approach.

---
 .travis.yml | 16 +++++++++-------
 phpunit.xml | 21 +++++++++------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8c9f61b..41b5699 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,12 +11,14 @@ matrix:
     - php: hhvm
 
 before_script:
-    - composer self-update
-    - composer --version
-    - composer install --prefer-source
+  - composer self-update
+  - composer require satooshi/php-coveralls:dev-master --no-update --dev
+  - composer install --prefer-source
 
-script: phpunit
+script: 
+  - mkdir -p build/logs
+  - phpunit --coverage-text
+  - ./vendor/bin/phpcs src --standard=psr2
 
-cache:
-  directories:
-    - vendor
+after_script:
+  - php vendor/bin/coveralls
diff --git a/phpunit.xml b/phpunit.xml
index cf403fe..81f5df0 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -7,19 +7,16 @@
 	</testsuites>
 
 	<filter>
-		<blacklist>
-			<directory suffix=".php">./vendor</directory>
-			<directory suffix=".php">./test</directory>
-		</blacklist>
-		<whitelist addUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">src</directory>
-		</whitelist>
+		<whitelist>
+            <directory suffix=".php">src/</directory>
+        </whitelist>
 	</filter>
 
 	<logging>
-		<log type="coverage-html" target="./build/logs/coverage" title="lncd/OAuth-client" charset="UTF-8" yui="true" highlight="true" lowUpperBound="50" highLowerBound="90"/>
-		<log type="coverage-text" target="php://stdout" title="lncd/OAuth-client" charset="UTF-8" yui="true" highlight="true" lowUpperBound="50" highLowerBound="90"/>
-		<log type="coverage-clover" target="./build/logs/clover.xml"/>
-		<log type="junit" target="./build/logs/junit.xml" logIncompleteSkipped="false"/>
-	</logging>
+        <log type="tap" target="build/report.tap"/>
+        <log type="junit" target="build/report.junit.xml"/>
+        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-text" target="build/coverage.txt"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
 </phpunit>