From 9bbf9dc39e0976e413c41cf5c33af94774421a59 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 13 Jan 2021 14:36:59 +1300 Subject: [PATCH] MNT Travis shared config, use sminnee/phpunit --- .travis.yml | 34 +++------------------------------- composer.json | 4 ++-- phpcs.xml.dist | 3 +++ 3 files changed, 8 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65c6a35..c244c3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,32 +1,4 @@ -language: php +version: ~> 1.0 -dist: trusty - -matrix: - include: - - php: 5.6 - env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 - - php: 7.0 - env: DB=PGSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1 - - php: 7.1 - env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_COVERAGE_TEST=1 - - php: 7.2 - env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 - - php: 7.3 - env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 - -before_script: - - phpenv rehash - - phpenv config-rm xdebug.ini - - - composer validate - - if [[ $DB == "PGSQL" ]]; then composer require --no-update silverstripe/recipe-core:"$RECIPE_VERSION" silverstripe/postgresql:2.2.x-dev; fi - - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile - -script: - - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi - - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi - - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src tests; fi - -after_success: - - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi +import: + - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml diff --git a/composer.json b/composer.json index 9e58bd1..8e31f95 100644 --- a/composer.json +++ b/composer.json @@ -13,12 +13,12 @@ "license": "BSD-3-Clause", "minimum-stability": "dev", "require": { - "league/csv": "^8", + "league/csv": "^8 || ^9", "silverstripe/framework": "^4", "symbiote/silverstripe-queuedjobs": "^4" }, "require-dev": { - "phpunit/phpunit": "^5.7", + "sminnee/phpunit": "^5.7", "squizlabs/php_codesniffer": "^3.0" }, "extra": { diff --git a/phpcs.xml.dist b/phpcs.xml.dist index f6e295b..f3047d8 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -2,6 +2,9 @@ CodeSniffer ruleset for SilverStripe coding conventions. + src + tests +