From dca1c67594e42481b2f91214379f193fc70fbe87 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 10 Nov 2020 13:31:11 +1300 Subject: [PATCH] MNT Use shared travis config, use sminnee/phpunit --- .travis.yml | 42 +++------------------------------------- composer.json | 2 +- phpcs.xml.dist | 3 +++ src/IFramePage.php | 1 + tests/IFramePageTest.php | 1 + 5 files changed, 9 insertions(+), 40 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93655bf..c244c3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,40 +1,4 @@ -language: php +version: ~> 1.0 -dist: trusty - -env: - global: - - COMPOSER_ROOT_VERSION=2.0.x-dev - -matrix: - include: - - php: 5.6 - env: DB=MYSQL RECIPE_VERSION=4.2.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 - - php: 7.0 - env: DB=MYSQL RECIPE_VERSION=4.3.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=PGSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1 - - php: 7.3 - env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 - -before_script: - # Init PHP - - phpenv rehash - - phpenv config-rm xdebug.ini - - echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - - # Install composer dependencies - - composer validate - - composer require --no-update silverstripe/recipe-cms:"$RECIPE_VERSION" - - if [[ $DB == PGSQL ]]; then composer require --no-update 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/ *.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 c225c29..f62c087 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "silverstripe/cms": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^5.7", + "sminnee/phpunit": "^5.7", "squizlabs/php_codesniffer": "^3.0" }, "autoload": { diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 2e216e9..b388ce1 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -2,6 +2,9 @@ CodeSniffer ruleset for SilverStripe coding conventions. + src + tests + diff --git a/src/IFramePage.php b/src/IFramePage.php index b8ed365..bd11733 100644 --- a/src/IFramePage.php +++ b/src/IFramePage.php @@ -1,4 +1,5 @@