Merge pull request #132 from creative-commoners/pulls/4.7/phpcs

MNT Update how phpcs is called
This commit is contained in:
Steve Boyd 2020-11-11 13:02:46 +13:00 committed by GitHub
commit 123f542ca3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 53 deletions

View File

@ -1,51 +1,9 @@
language: php version: ~> 1.0
dist: xenial import:
- silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-fixed.yml
services:
- mysql
- postgresql
cache:
directories:
- $HOME/.composer/cache/files
env: env:
global: global:
- COMPOSER_ROOT_VERSION=4.x-dev - COMPOSER_ROOT_VERSION="4.7.x-dev"
- REQUIRE_RECIPE="$COMPOSER_ROOT_VERSION"
matrix:
fast_finish: true
include:
- php: 7.1
env: DB=MYSQL PHPUNIT_TEST=1 COMPOSER_ARG=--prefer-lowest
- php: 7.2
env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1
- php: 7.3
env: DB=MYSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1
- php: 7.4
env: DB=MYSQL PHPUNIT_TEST=1
- php: nightly
env: PHPUNIT_TEST=1 COMPOSER_ARG=--ignore-platform-reqs
before_script:
# Init PHP
- phpenv rehash
- phpenv config-rm xdebug.ini || true
# Install composer dependencies
- export PATH=~/.composer/vendor/bin:$PATH
- composer validate
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.x-dev --no-update; fi
- if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.x-dev --no-update; fi
- composer require silverstripe/recipe-core:4.x-dev silverstripe/admin:1.x-dev silverstripe/versioned:1.x-dev --no-update
- if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
- composer update --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile $COMPOSER_ARG
script:
- if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests; fi
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml tests; fi
- if [[ $PHPCS_TEST ]]; then composer run-script lint; fi
after_success:
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi

View File

@ -28,7 +28,8 @@
"silverstripe/vendor-plugin": "^1" "silverstripe/vendor-plugin": "^1"
}, },
"require-dev": { "require-dev": {
"sminnee/phpunit": "^5.7" "sminnee/phpunit": "^5.7",
"squizlabs/php_codesniffer": "^3.0"
}, },
"extra": { "extra": {
"expose": [ "expose": [
@ -41,10 +42,6 @@
"SilverStripe\\Reports\\Tests\\": "tests/" "SilverStripe\\Reports\\Tests\\": "tests/"
} }
}, },
"scripts": {
"lint": "phpcs code/ tests/",
"lint-clean": "phpcbf code/ tests/"
},
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true "prefer-stable": true
} }

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>code</file>
<file>tests</file>
<!-- base rules are PSR-2 --> <!-- base rules are PSR-2 -->
<rule ref="PSR2" > <rule ref="PSR2" >
<!-- Current exclusions --> <!-- Current exclusions -->
@ -19,4 +22,3 @@
<exclude name="PEAR.Functions.ValidDefaultValue.NotAtEnd" /> <exclude name="PEAR.Functions.ValidDefaultValue.NotAtEnd" />
</rule> </rule>
</ruleset> </ruleset>