tonyair/silverstripe-versionfeed
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-versionfeed synced 2024-10-22 11:05:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67 from creative-commoners/pulls/2/sapphire-test-nine

Browse Source 
API phpunit 9 support
This commit is contained in:
Maxime Rainville 2021-11-01 22:46:24 +13:00 committed by GitHub
commit feb6218035
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.json
View File

@ -16,12 +16,13 @@
} }
], ],
"require": { "require": {
"php": "^7.3 || ^8.0",
"silverstripe/cms": "^4", "silverstripe/cms": "^4",
"silverstripe/versioned": "^1", "silverstripe/versioned": "^1",
"silverstripe/siteconfig": "^4" "silverstripe/siteconfig": "^4"
}, },
"require-dev": { "require-dev": {
"sminnee/phpunit": "^5.7", "phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.0" "squizlabs/php_codesniffer": "^3.0"
}, },
"autoload": { "autoload": {
@ -30,11 +31,6 @@
"SilverStripe\\VersionFeed\\Tests\\": "tests/" "SilverStripe\\VersionFeed\\Tests\\": "tests/"
} }
}, },
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
}
},
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true "prefer-stable": true
} }

2
phpunit.xml.dist
View File

@ -1,7 +1,9 @@
<phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true"> <phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
<testsuites>
<testsuite name="Default"> <testsuite name="Default">
<directory>tests/</directory> <directory>tests/</directory>
</testsuite> </testsuite>
</testsuites>
<filter> <filter>
<whitelist addUncoveredFilesFromWhitelist="true"> <whitelist addUncoveredFilesFromWhitelist="true">
<directory suffix=".php">src/</directory> <directory suffix=".php">src/</directory>

4
tests/VersionFeedFunctionalTest.php
View File

@ -36,7 +36,7 @@ class VersionFeedFunctionalTest extends FunctionalTest
*/ */
protected $cache; protected $cache;
protected function setUp() protected function setUp(): void
{ {
Director::config()->set('alternate_base_url', $this->baseURI); Director::config()->set('alternate_base_url', $this->baseURI);
@ -64,7 +64,7 @@ class VersionFeedFunctionalTest extends FunctionalTest
Versioned::set_reading_mode(Versioned::DEFAULT_MODE); Versioned::set_reading_mode(Versioned::DEFAULT_MODE);
} }
protected function tearDown() protected function tearDown(): void
{ {
Director::config()->set('alternate_base_url', null); Director::config()->set('alternate_base_url', null);