Skip to content

Commit

Permalink
API phpunit 9 support
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Nov 3, 2021
1 parent 7091a7b commit f062977
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 56 deletions.
55 changes: 3 additions & 52 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,53 +1,4 @@
language: php
version: ~> 1.0

dist: xenial

services:
- mysql
- postgresql

cache:
directories:
- $HOME/.composer/cache/files

addons:
apt:
packages:
- tidy

env:
global:
- COMPOSER_ROOT_VERSION=dev-master

matrix:
include:
- php: 5.6
env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
- php: 7.1
env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_COVERAGE_TEST=1
- php: 7.2
env: DB=PGSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1
- php: 7.3
env: DB=PGSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1
- php: 7.4
env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1

before_script:
# Init PHP
- phpenv rehash
- phpenv config-rm xdebug.ini || true
- echo 'memory_limit=2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

- composer require --no-update silverstripe/recipe-cms "$RECIPE_VERSION"
# Fix for running phpunit 5 on php 7.4+
- composer require --no-update sminnee/phpunit-mock-objects:^3
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi
- composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile

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 src/ tests/; fi

after_success:
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
import:
- silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": "^7.3 || ^8.0",
"composer/composer": "^1",
"silverstripe/framework": "^4",
"silverstripe/framework": "^4.10",
"bringyourownideas/silverstripe-maintenance": "^2"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion tests/Extensions/CheckComposerUpdatesExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class CheckComposerUpdatesExtensionTest extends SapphireTest
*/
protected $allowedTypes;

protected function setUp()
protected function setUp(): void
{
parent::setUp();

Expand Down
2 changes: 1 addition & 1 deletion tests/UpdateCheckerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class UpdateCheckerTest extends SapphireTest
*/
protected $updateChecker;

protected function setUp()
protected function setUp(): void
{
parent::setUp();

Expand Down

0 comments on commit f062977

Please sign in to comment.