merge coverage

.travis.yml

@@ -31,7 +31,9 @@ before_script: make before_script
 
 script: composer test
 
-after_success: bash <(curl -s https://codecov.io/bash)
+after_success:
+  - make covegare
+  - bash <(curl -s https://codecov.io/bash)
 
 jobs:
   include:

Makefile

@@ -21,3 +21,6 @@ before_script:
 	bin/robo --load-from tests/RoboFile.php project:deploy
 	(php -S localhost:8000 -t www &) 2> /dev/null > /dev/null
 	sleep 2
+
+covegare:
+	wget https://phar.phpunit.de/phpcov.phar && php phpcov.phar merge coverage/cov --clover coverage.xml

composer.json

@@ -25,7 +25,12 @@
       "opencart-dir" : "www"
     },
     "scripts" : {
-      "test": "bin/phpunit --testsuite tests --colors=always",
+      "test-admin": "bin/phpunit --coverage-php coverage/cov/admin.cov --testsuite tests --colors=always",
+      "test-catalog": "bin/phpunit --coverage-php coverage/cov/catalog.cov --testsuite catalog-tests --colors=always",
+      "test": [
+        "@test-admin",
+        "@test-catalog"
+      ],
       "setup" : "bin/robo --load-from tests/RoboFile.php opencart:setup"
     }
 }

phpunit.xml.dist

@@ -30,7 +30,4 @@
             <directory suffix=".php">./www/system/library/retailcrm</directory>
         </whitelist>
     </filter>
-    <logging>
-        <log type="coverage-clover" target="coverage.xml"/>
-    </logging>
 </phpunit>