diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5ff5326..0000000 --- a/.travis.yml +++ /dev/null @@ -1,53 +0,0 @@ -language: php - -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 diff --git a/composer.json b/composer.json index b67060e..44a7eaf 100644 --- a/composer.json +++ b/composer.json @@ -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": { diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 6f34b9b..b608dee 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -2,6 +2,9 @@ CodeSniffer ruleset for SilverStripe coding conventions. + src + tests + diff --git a/tests/Extensions/CheckComposerUpdatesExtensionTest.php b/tests/Extensions/CheckComposerUpdatesExtensionTest.php index 6cde2fe..be33726 100644 --- a/tests/Extensions/CheckComposerUpdatesExtensionTest.php +++ b/tests/Extensions/CheckComposerUpdatesExtensionTest.php @@ -30,7 +30,7 @@ class CheckComposerUpdatesExtensionTest extends SapphireTest */ protected $allowedTypes; - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/UpdateCheckerTest.php b/tests/UpdateCheckerTest.php index 08f425e..d1cb6b5 100644 --- a/tests/UpdateCheckerTest.php +++ b/tests/UpdateCheckerTest.php @@ -21,7 +21,7 @@ class UpdateCheckerTest extends SapphireTest */ protected $updateChecker; - protected function setUp() + protected function setUp(): void { parent::setUp();