Merge pull request #2759 from malukenho/feature/add-scrutnizer

Move coverage session to sqlite.travis.xml file

.travis.yml

@@ -17,6 +17,7 @@ env:
 
 before_script:
   - if [[ $TRAVIS_PHP_VERSION = '7.1' && $DB = 'sqlite' ]]; then PHPUNIT_FLAGS="--coverage-clover .clover.xml"; else PHPUNIT_FLAGS=""; fi
+  - if [[ "$PHPUNIT_FLAGS" == "" ]]; then phpenv config-rm xdebug.ini || true; fi
 
 matrix:
   fast_finish: true
@@ -117,7 +118,7 @@ matrix:
 
 after_script:
  - if [[ "$PHPUNIT_FLAGS" != "" ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- - if [[ "$PHPUNIT_FLAGS" != "" ]]; then php ocular.phar code-coverage:upload --format=php-clover ./clover.xml; fi
+ - if [[ "$PHPUNIT_FLAGS" != "" ]]; then php ocular.phar code-coverage:upload --format=php-clover .clover.xml; fi
 
 install:
   - travis_retry composer install

phpunit.xml.dist

@@ -49,11 +49,6 @@
             <directory>./tests/Doctrine/Tests/DBAL/Performance</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./lib/Doctrine</directory>
-        </whitelist>
-    </filter>
     <listeners>
         <listener class="Doctrine\Tests\DbalPerformanceTestListener"/>
     </listeners>

tests/travis/sqlite.travis.xml

@@ -14,7 +14,11 @@
             <directory>../Doctrine/Tests/DBAL</directory>
         </testsuite>
     </testsuites>
-
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./../../lib/Doctrine</directory>
+        </whitelist>
+    </filter>
     <groups>
         <exclude>
             <group>performance</group>