Merge branch '1.2' into 1

This commit is contained in:
Robbie Averill 2018-05-03 16:00:34 +12:00
commit a788b37de5
3 changed files with 16 additions and 15 deletions

View File

@ -5,25 +5,20 @@ sudo: false
language: php language: php
php: php:
- 5.3
- 5.4 - 5.4
- 5.5 - 5.5
- 5.6
- 7.0
env: env:
- DB=MYSQL CORE_RELEASE=3.2 - DB=MYSQL CORE_RELEASE=3.5
matrix: matrix:
include: include:
- php: 5.6 - php: 5.6
env: DB=MYSQL CORE_RELEASE=3 env: DB=MYSQL CORE_RELEASE=3
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3.1
- php: 5.6
env: DB=PGSQL CORE_RELEASE=3.2
allow_failures:
- php: 7.0 - php: 7.0
env: DB=MYSQL CORE_RELEASE=3.6
- php: 7.1
env: DB=PGSQL CORE_RELEASE=3.6 COVERAGE=1
before_script: before_script:
- composer self-update || true - composer self-update || true
@ -33,4 +28,8 @@ before_script:
- composer install - composer install
script: script:
- vendor/bin/phpunit environmentcheck/tests - if [[ $COVERAGE ]]; then vendor/bin/phpunit --coverage-clover coverage.xml environmentcheck/tests; fi
- if [[ ! $COVERAGE ]]; then vendor/bin/phpunit environmentcheck/tests; fi
after_success:
- if [[ $COVERAGE ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi

View File

@ -1,10 +1,10 @@
# SilverStripe Environment Checker Module # SilverStripe Environment Checker Module
[![Build Status](http://img.shields.io/travis/silverstripe-labs/silverstripe-environmentcheck.svg?style=flat-square)](https://travis-ci.org/silverstripe-labs/silverstripe-environmentcheck) [![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-environmentcheck.svg?style=flat-square)](https://scrutinizer-ci.com/g/silverstripe-labs/silverstripe-environmentcheck) [![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-environmentcheck.svg?style=flat-square)](https://scrutinizer-ci.com/g/silverstripe-labs/silverstripe-environmentcheck) [![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/environmentcheck.svg?style=flat-square)](https://packagist.org/packages/silverstripe/environmentcheck) [![Packagist](https://img.shields.io/packagist/v/silverstripe/environmentcheck.svg)](https://packagist.org/packages/silverstripe/environmentalcheck)
[![License](http://img.shields.io/packagist/l/silverstripe/environmentcheck.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. This module adds an API for running environment checks to your API.

View File

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