From f41ccdb5eaac21b75d94630a7a1c4d153742feb5 Mon Sep 17 00:00:00 2001
From: Yves P <havokinspiration@gmail.com>
Date: Fri, 15 Jan 2016 12:39:51 +0100
Subject: [PATCH] Make Coveralls work again

---
 .travis.yml      | 5 +++--
 phpunit.xml.dist | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8dcc7707..b1a9b9fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
   fast_finish: true
 
   include:
-    - php: 5.4
+    - php: 7.0
       env: COVERALLS=1 DEFAULT=0
 
     - php: 5.4
@@ -52,6 +52,7 @@ matrix:
       env: HHVM=1 DB=mysql db_dsn='mysql://travis@0.0.0.0/cakephp_test'
 
 before_script:
+  - sh -c "if [ '$HHVM' != '1' ]; then phpenv config-rm xdebug.ini; fi"
   - composer self-update
   - sh -c "if [ '$PREFER_LOWEST' != '1' ]; then composer install --prefer-source --no-interaction; fi"
   - sh -c "if [ '$PREFER_LOWEST' = '1' ]; then composer update --prefer-source --no-interaction --prefer-lowest --prefer-stable; fi"
@@ -72,7 +73,7 @@ before_script:
 script:
   - sh -c "if [ '$DEFAULT' = '1' ]; then phpunit --stderr; fi"
   - sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p --extensions=php --standard=psr2 --ignore=tests/bootstrap.php,tests/comparisons/*,tests/test_app/* ./src ./tests ; fi"
-  - sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
+  - sh -c "if [ '$COVERALLS' = '1' ]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover build/logs/clover.xml || true; fi"
   - sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"
 
 notifications:
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 08d01f53..d694c8c6 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -36,5 +36,12 @@
             <directory suffix=".ctp">./tests/</directory>
         </blacklist>
     </filter>
+    
+    <!-- Prevent coverage reports from looking in tests, vendors, config folders -->
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src/</directory>
+        </whitelist>
+    </filter>
 
 </phpunit>