Merge branch '2.0' into 2

This commit is contained in:
Steve Boyd 2020-11-11 17:16:06 +13:00
commit 040defb708
3 changed files with 7 additions and 44 deletions

View File

@ -1,44 +1,4 @@
language: php version: ~> 1.0
dist: xenial import:
- silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml
services:
- mysql
- postgresql
env:
global:
- COMPOSER_ROOT_VERSION=2.x-dev
matrix:
include:
- php: 5.6
env: DB=MYSQL PHPUNIT_TEST=1 RECIPE_VERSION="~4.2.0"
- php: 7.0
env: DB=MYSQL PHPUNIT_TEST=1 RECIPE_VERSION="~4.3.0"
- php: 7.1
env: DB=MYSQL PHPUNIT_TEST=1 RECIPE_VERSION="~4.4.0"
- php: 7.2
env: DB=PGSQL PHPUNIT_TEST=1 PHPCS_TEST=1 RECIPE_VERSION="4.5.x-dev"
- php: 7.3
env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1 RECIPE_VERSION="4.x-dev"
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; 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

View File

@ -14,7 +14,7 @@
"silverstripe/cms": "^4.0" "silverstripe/cms": "^4.0"
}, },
"require-dev": { "require-dev": {
"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>
<rule ref="PSR12" > <rule ref="PSR12" >
<!-- Current exclusions --> <!-- Current exclusions -->
<exclude name="PSR1.Methods.CamelCapsMethodName" /> <exclude name="PSR1.Methods.CamelCapsMethodName" />