Merge branch '2.3' into 2

This commit is contained in:
Guy Sartorelli 2022-06-14 11:31:28 +12:00
commit c9bce8fe57
2 changed files with 14 additions and 16 deletions

View File

@ -11,30 +11,28 @@ env:
jobs:
fast_finish: true
include:
- php: 7.1
env:
- REQUIRE_INSTALLER="4.5.x-dev"
- PHPCS_TEST=1
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="framework"
- php: 7.2
env:
- REQUIRE_INSTALLER="4.6.x-dev"
- PHPUNIT_COVERAGE_TEST=1
- PHPUNIT_SUITE="postgresql"
- php: 7.3
env:
- REQUIRE_INSTALLER="4.7.x-dev"
- PHPUNIT_TEST=1
- REQUIRE_INSTALLER="4.10.x-dev"
- PHPUNIT_COVERAGE_TEST=1
- PHPUNIT_SUITE="framework"
- php: 7.4
env:
- REQUIRE_INSTALLER="4.11.x-dev"
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="postgresql"
- php: 7.4
env:
- REQUIRE_INSTALLER="4.x-dev"
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="postgresql"
- PHPUNIT_SUITE="framework"
- php: 8.0
env:
- REQUIRE_INSTALLER="4.x-dev"
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="postgresql"
- php: 8.1
env:
- REQUIRE_INSTALLER="4.x-dev"
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="framework"
- COMPOSER_INSTALL_ARG=--ignore-platform-reqs

View File

@ -19,7 +19,7 @@
"silverstripe/vendor-plugin": "^1.0"
},
"require-dev": {
"sminnee/phpunit": "^5.7",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3"
},
"autoload": {