Skip to content

Commit

Permalink
Merge branch 'pulls/1.0/stabilisation'
Browse files Browse the repository at this point in the history
  • Loading branch information
robbieaverill committed Apr 4, 2018
2 parents b41c07b + e469fad commit 26d3282
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 11 deletions.
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/tests export-ignore
/docs export-ignore
/.travis.yml export-ignore
/.scrutinizer.yml export-ignore
/.gitignore export-ignore
/.gitattributes export-ignore
/codecov.yml export-ignore
/phpunit.xml.dist export-ignore
9 changes: 7 additions & 2 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
inherit: true

filter:
paths: [src/*, tests/*]
build:
nodes:
analysis:
tests:
override: [php-scrutinizer-run]

checks:
php:
code_rating: true
duplication: true

filter:
paths: [src/*, tests/*]
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,27 @@ env:
matrix:
include:
- php: 5.6
env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
env: DB=MYSQL RECIPE_VERSION=1.0.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
- php: 7.0
env: DB=PGSQL PHPUNIT_TEST=1
env: DB=PGSQL RECIPE_VERSION=1.1.x-dev PHPUNIT_TEST=1
- php: 7.1
env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
env: DB=MYSQL RECIPE_VERSION=1.2.x-dev PHPUNIT_COVERAGE_TEST=1
- php: 7.2
env: DB=MYSQL RECIPE_VERSION=1.x-dev PHPUNIT_TEST=1

before_script:
- phpenv rehash
- phpenv config-rm xdebug.ini

- composer validate
- composer require --prefer-dist --no-update silverstripe/recipe-core:1.0.x-dev
- composer require --prefer-dist --no-update silverstripe/recipe-core:$RECIPE_VERSION
- if [[ $DB == PGSQL ]]; then composer require --prefer-dist --no-update silverstripe/postgresql:2.0.x-dev; fi
- composer update

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 --standard=vendor/silverstripe/framework/phpcs.xml.dist src/ tests/ ; fi
- if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=PSR2 src/ tests/ *.php; fi

after_success:
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
}
],
"require": {
"silverstripe/admin": "^1.0@dev",
"silverstripe/framework": "^4.0@dev",
"silverstripe/admin": "^1",
"silverstripe/framework": "^4",
"monolog/monolog": "~1.11",
"silverstripe/crontask": "2.x-dev"
"silverstripe/crontask": "^2"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
"squizlabs/php_codesniffer": "^3.0"
"squizlabs/php_codesniffer": "^3"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 26d3282

Please sign in to comment.