Updated CI config (#215)

Fix for broken code coverage and removed no longer needed Travis matrix hack

Author: JeroenDeDauw

.scrutinizer.yml

@@ -2,7 +2,7 @@ build: true
 inherit: true
 
 tools:
-    php_code_coverage: true
+    external_code_coverage: true
     php_code_sniffer: true
     php_cpd: true
     php_cs_fixer: true

.travis.yml

@@ -1,8 +1,5 @@
 language: php
 
-env:
-  - THENEEDFORTHIS=FAIL
-
 matrix:
   fast_finish: true
   include:
@@ -16,18 +13,21 @@ matrix:
       php: 7
     - env: DM=~4.2
       php: hhvm
-  exclude:
-    - env: THENEEDFORTHIS=FAIL
   allow_failures:
     - env: DM=@dev
 
 sudo: false
 
-before_script:
-  - travis_retry composer require "wikibase/data-model=$DM" --prefer-source
+install: travis_retry composer require "wikibase/data-model=$DM" --prefer-source
 
 script: composer ci
 
+after_success:
+  - if [[ "`phpenv version-name`" != "7.1" ]]; then exit 0; fi
+  - vendor/bin/phpunit --coverage-clover coverage.clover
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+
 notifications:
   irc:
     channels: