Merge pull request #55 from creative-commoners/pulls/1.1/update-travis

Update Travis matrix, Scrutinizer config and readme badges. Use codecov.io

.scrutinizer.yml

@@ -1,9 +1,5 @@
 inherit: true
 
-tools:
-  external_code_coverage:
-    timeout: 1800 # 30 minute delay to allow for coverage reporting taking ages!
-
 checks:
   php:
     code_rating: true

.travis.yml

@@ -1,16 +1,22 @@
 language: php
 
 php:
-    - 5.3
     - 5.4
     - 5.5
-    - 5.6
-    - 7.0
 
 sudo: false
 
 env:
-  - DB=MYSQL CORE_RELEASE=3.1
+  - DB=MYSQL CORE_RELEASE=3.5
+
+matrix:
+  include:
+    - php: 5.6
+      env: DB=MYSQL CORE_RELEASE=3
+    - php: 7.0
+      env: DB=MYSQL CORE_RELEASE=3.6
+    - php: 7.1
+      env: DB=PGSQL CORE_RELEASE=3.6 COVERAGE=1
 
 before_script:
   - composer self-update || true
@@ -20,16 +26,8 @@ before_script:
   - composer install
 
 script:
-    - vendor/bin/phpunit --coverage-clover coverage.clover environmentcheck/tests
+  - if [[ $COVERAGE ]]; then vendor/bin/phpunit --coverage-clover coverage.xml environmentcheck/tests; fi
-    - wget https://scrutinizer-ci.com/ocular.phar
+  - if [[ ! $COVERAGE ]]; then vendor/bin/phpunit environmentcheck/tests; fi
-    - git remote rm origin
-    - git remote add origin git@github.com:silverstripe-labs/silverstripe-environmentcheck.git
-    - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
 
-branches:
+after_success:
-    only:
+  - if [[ $COVERAGE ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
-        - master
-
-matrix:
-    allow_failures:
-        - php: 7.0

readme.md

@@ -1,10 +1,10 @@
 # SilverStripe Environment Checker Module
 
-[![Build Status](http://img.shields.io/travis/silverstripe-labs/silverstripe-environmentalcheck.svg?style=flat-square)](https://travis-ci.org/silverstripe-labs/silverstripe-environmentalcheck)
+[![Build Status](https://travis-ci.org/silverstripe/silverstripe-environmentcheck.svg?branch=master)](https://travis-ci.org/silverstripe/silverstripe-environmentcheck)
-[![Code Quality](http://img.shields.io/scrutinizer/g/silverstripe-labs/silverstripe-environmentalcheck.svg?style=flat-square)](https://scrutinizer-ci.com/g/silverstripe-labs/silverstripe-environmentalcheck)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/silverstripe/silverstripe-environmentcheck/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-environmentcheck/?branch=master)
-[![Code Coverage](http://img.shields.io/scrutinizer/coverage/g/silverstripe-labs/silverstripe-environmentalcheck.svg?style=flat-square)](https://scrutinizer-ci.com/g/silverstripe-labs/silverstripe-environmentalcheck)
+[![codecov](https://codecov.io/gh/silverstripe/comment-notifications/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/comment-notifications)
-[![Version](http://img.shields.io/packagist/v/silverstripe/environmentalcheck.svg?style=flat-square)](https://packagist.org/packages/silverstripe/silverstripe-environmentalcheck)
+[![Packagist](https://img.shields.io/packagist/v/silverstripe/environmentcheck.svg)](https://packagist.org/packages/silverstripe/environmentalcheck)
-[![License](http://img.shields.io/packagist/l/silverstripe/environmentalcheck.svg?style=flat-square)](LICENSE.md)
+[![License](http://img.shields.io/packagist/l/silverstripe/environmentcheck.svg)](LICENSE.md)
 
 This module adds an API for running environment checks to your API.
 

tests/checks/DatabaseCheckTest.php

@@ -4,6 +4,8 @@
  * @mixin PHPUnit_Framework_TestCase
  */
 class DatabaseCheckTest extends SapphireTest {
+    protected $usesDatabase = true;
+
 	public function testCheckReportsValidConnection() {
 		$check = new DatabaseCheck();