Reworked Travis build matrix

Travis now supports merged code coverage reports, so we do not need to merge them ourselves.

.travis.yml

@@ -5,14 +5,18 @@ php:
   - 7
   - hhvm
 
+env:
+  - CALCULATOR=GMP
+  - CALCULATOR=BCMath
+  - CALCULATOR=Native
+
 before_script:
   - composer self-update
   - composer install
-  - mkdir -p build/cov build/logs
 
 script:
-  - ./run-all-tests.sh build/cov
+  - mkdir -p build/cov build/logs
+  - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 
 after_script:
-  - vendor/bin/phpcov merge --clover build/logs/clover.xml build/cov
   - vendor/bin/coveralls -v

composer.json

@@ -16,8 +16,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "*",
-        "satooshi/php-coveralls": "dev-master",
-        "phpunit/phpcov": "*"
+        "satooshi/php-coveralls": "dev-master"
     },
     "autoload": {
         "psr-4": {

phpunit-main.xml → phpunit.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" bootstrap="phpunit-main.php">
+<phpunit colors="true" bootstrap="phpunit.php">
     <testsuites>
         <testsuite>
             <directory>tests</directory>
-            <exclude>tests/CalculatorDetectTest.php</exclude>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory>src</directory>
+            <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
 </phpunit>

tests/CalculatorDetectTest.php

@@ -11,7 +11,11 @@ class CalculatorDetectTest extends \PHPUnit_Framework_TestCase
 {
     public function testGetWithNoCalculatorSetDetectsCalculator()
     {
+        $currentCalculator = Calculator::get();
+
         Calculator::set(null);
         $this->assertInstanceOf(Calculator::class, Calculator::get());
+
+        Calculator::set($currentCalculator);
     }
 }