Merge branch '3.7' into 3

This commit is contained in:
Steve Boyd 2020-11-11 17:00:07 +13:00
commit b3f21a5ef2
3 changed files with 14 additions and 34 deletions

View File

@ -1,41 +1,18 @@
language: php version: ~> 1.0
dist: trusty import:
- silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml
env: env:
global: global:
- COMPOSER_ROOT_VERSION="3.x-dev" - COMPOSER_ROOT_VERSION="3.x-dev"
- REQUIRE_EXTRA="symbiote/silverstripe-queuedjobs:^4.0"
matrix: jobs:
include: include:
- php: 7.1
env: DB=MYSQL INSTALLER_VERSION=4.2.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
- php: 7.1
env: DB=PGSQL INSTALLER_VERSION=4.3.x-dev PHPUNIT_TEST=1
- php: 7.2
env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_COVERAGE_TEST=1
- php: 7.3 - php: 7.3
env: DB=MYSQL INSTALLER_VERSION=4.5.x-dev PHPUNIT_TEST=1 SUBSITES=1 env: # SUBSITES
- php: 7.4 - DB=MYSQL
env: DB=MYSQL INSTALLER_VERSION=4.6.x-dev PHPUNIT_TEST=1 - REQUIRE_INSTALLER=4.x-dev
- PHPUNIT_TEST=1
before_script: - REQUIRE_EXTRA="symbiote/silverstripe-queuedjobs:^4.0 silverstripe/subsites:2.3.x-dev"
- phpenv rehash
- phpenv config-rm xdebug.ini
- echo 'memory_limit=2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- composer validate
- composer require symbiote/silverstripe-queuedjobs:^4 --no-update
- if [[ $SUBSITES ]]; then composer require silverstripe/subsites:^2 --no-update; fi
- if [[ $DB == "PGSQL" ]]; then composer require silverstripe/postgresql:^2 --no-update; fi
- composer require --no-update sminnee/phpunit-mock-objects:^3
- composer require silverstripe/installer "$INSTALLER_VERSION" --no-update
- 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

View File

@ -30,7 +30,7 @@
}, },
"require-dev": { "require-dev": {
"silverstripe/cms": "^4.0", "silverstripe/cms": "^4.0",
"phpunit/phpunit": "^5.7", "sminnee/phpunit": "^5.7",
"squizlabs/php_codesniffer": "^3.0" "squizlabs/php_codesniffer": "^3.0"
}, },
"autoload": { "autoload": {

View File

@ -2,6 +2,9 @@
<ruleset name="SilverStripe"> <ruleset name="SilverStripe">
<description>CodeSniffer ruleset for SilverStripe coding conventions.</description> <description>CodeSniffer ruleset for SilverStripe coding conventions.</description>
<file>src</file>
<file>tests</file>
<!-- base rules are PSR-2 --> <!-- base rules are PSR-2 -->
<rule ref="PSR2"> <rule ref="PSR2">
<!-- Current exclusions --> <!-- Current exclusions -->