Skip to content

Commit 26d3282

Browse files
committed
Merge branch 'pulls/1.0/stabilisation'
2 parents b41c07b + e469fad commit 26d3282

File tree

4 files changed

+26
-11
lines changed

4 files changed

+26
-11
lines changed

.gitattributes

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/tests export-ignore
2+
/docs export-ignore
3+
/.travis.yml export-ignore
4+
/.scrutinizer.yml export-ignore
5+
/.gitignore export-ignore
6+
/.gitattributes export-ignore
7+
/codecov.yml export-ignore
8+
/phpunit.xml.dist export-ignore

.scrutinizer.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
inherit: true
22

3-
filter:
4-
paths: [src/*, tests/*]
3+
build:
4+
nodes:
5+
analysis:
6+
tests:
7+
override: [php-scrutinizer-run]
58

69
checks:
710
php:
811
code_rating: true
912
duplication: true
1013

14+
filter:
15+
paths: [src/*, tests/*]

.travis.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,27 @@ env:
77
matrix:
88
include:
99
- php: 5.6
10-
env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
10+
env: DB=MYSQL RECIPE_VERSION=1.0.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
1111
- php: 7.0
12-
env: DB=PGSQL PHPUNIT_TEST=1
12+
env: DB=PGSQL RECIPE_VERSION=1.1.x-dev PHPUNIT_TEST=1
1313
- php: 7.1
14-
env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
14+
env: DB=MYSQL RECIPE_VERSION=1.2.x-dev PHPUNIT_COVERAGE_TEST=1
15+
- php: 7.2
16+
env: DB=MYSQL RECIPE_VERSION=1.x-dev PHPUNIT_TEST=1
1517

1618
before_script:
1719
- phpenv rehash
1820
- phpenv config-rm xdebug.ini
1921

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

2527
script:
2628
- if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
2729
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
28-
- if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=vendor/silverstripe/framework/phpcs.xml.dist src/ tests/ ; fi
30+
- if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=PSR2 src/ tests/ *.php; fi
2931

3032
after_success:
3133
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
}
1414
],
1515
"require": {
16-
"silverstripe/admin": "^1.0@dev",
17-
"silverstripe/framework": "^4.0@dev",
16+
"silverstripe/admin": "^1",
17+
"silverstripe/framework": "^4",
1818
"monolog/monolog": "~1.11",
19-
"silverstripe/crontask": "2.x-dev"
19+
"silverstripe/crontask": "^2"
2020
},
2121
"require-dev": {
2222
"phpunit/phpunit": "^5.7",
23-
"squizlabs/php_codesniffer": "^3.0"
23+
"squizlabs/php_codesniffer": "^3"
2424
},
2525
"autoload": {
2626
"psr-4": {

0 commit comments

Comments
 (0)