Skip to content

Commit

Permalink
Merge pull request #68 from creative-commoners/pulls/4/sapphire-test-…
Browse files Browse the repository at this point in the history
…nine

API phpunit 9 support
  • Loading branch information
emteknetnz authored Nov 9, 2021
2 parents 19f0726 + 15fd452 commit 748bf42
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ env:
jobs:
fast_finish: true
include:
- php: 7.1
- php: 7.3
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- COMPOSER_ARG=--prefer-lowest
- php: 7.2
- php: 7.3
env:
- DB=PGSQL
- PHPUNIT_TEST=1
Expand All @@ -34,7 +34,7 @@ jobs:
- DB=MYSQL
#- PHPUNIT_COVERAGE_TEST=1
- PHPUNIT_TEST=1
- php: nightly
- php: 8.0
env:
- DB=MYSQL
- PHPUNIT_TEST=1
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
"homepage": "http://silverstripe.org",
"license": "BSD-3-Clause",
"require": {
"php": "^7.1 || ^8",
"php": "^7.3 || ^8.0",
"silverstripe/recipe-plugin": "^1.2",
"silverstripe/assets": "1.x-dev",
"silverstripe/config": "1.x-dev",
"silverstripe/framework": "4.x-dev",
"silverstripe/mimevalidator": "2.x-dev"
},
"require-dev": {
"sminnee/phpunit": "^5.7",
"sminnee/phpunit-mock-objects": "^3.4.5"
"phpunit/phpunit": "^9.5"
},
"extra": {
"project-files": [
Expand Down
12 changes: 7 additions & 5 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
<testsuite name="recipe-core">
<directory>vendor/silverstripe/assets/tests</directory>
<directory>vendor/silverstripe/config/tests</directory>
<directory>vendor/silverstripe/framework/tests</directory>
</testsuite>
<testsuites>
<testsuite name="recipe-core">
<directory>vendor/silverstripe/assets/tests</directory>
<directory>vendor/silverstripe/config/tests</directory>
<directory>vendor/silverstripe/framework/tests</directory>
</testsuite>
</testsuites>
</phpunit>

0 comments on commit 748bf42

Please sign in to comment.