From 77be6bc44bffb6f5302ca4fddab09126bd2f1f19 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 1 Dec 2020 16:33:21 +1300 Subject: [PATCH] MNT Travis shared config, use sminnee/phpunit --- .travis.yml | 48 +++--------------------------------------------- composer.json | 2 +- phpcs.xml.dist | 3 +++ 3 files changed, 7 insertions(+), 46 deletions(-) diff --git a/.travis.yml b/.travis.yml index 41862e4..c244c3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,46 +1,4 @@ -language: php +version: ~> 1.0 -dist: xenial - -services: - - mysql - - postgresql - -cache: - directories: - - $HOME/.composer/cache/files - -global: - - COMPOSER_ROOT_VERSION=2.2.x-dev - -matrix: - include: - - php: 7.1 - env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1 PDO=1 - - php: 7.2 - env: DB=PGSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_COVERAGE_TEST=1 - - php: 7.3 - env: DB=MYSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1 - - php: 7.4 - env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 - -before_script: - # Init PHP - - phpenv rehash - - phpenv config-rm xdebug.ini - - # Install composer dependencies - - composer validate - - composer require --no-update silverstripe/recipe-core:$RECIPE_VERSION - # Fix for running phpunit 5 on php 7.4+ - - composer require --no-update sminnee/phpunit-mock-objects:^3 - - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; 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/ *.php; 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 be6c8ee..0e2ee9b 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "silverstripe/framework": "^4" }, "require-dev": { - "phpunit/phpunit": "^5.7", + "sminnee/phpunit": "^5.7", "squizlabs/php_codesniffer": "^3.0", "silverstripe/versioned": "^1" }, diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 1b984f8..fe5cff7 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -2,6 +2,9 @@ CodeSniffer ruleset for SilverStripe coding conventions. + src + tests +