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

Merge pull request #191 from dhensby/pulls/5/phpunit-8

Browse Source 
Bump min-php and phpunit versions
This commit is contained in:
Loz Calver 2020-03-26 11:27:02 +00:00 committed by GitHub
commit 2a73afce20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -9,8 +9,9 @@ cache:
- $HOME/.composer/cache/files - $HOME/.composer/cache/files
php: php:
- 7.1
- 7.2 - 7.2
- 7.3
- 7.4
env: env:
matrix: matrix:
@ -20,9 +21,8 @@ env:
before_script: before_script:
- export PATH=~/.composer/vendor/bin:$PATH - export PATH=~/.composer/vendor/bin:$PATH
- composer validate - composer validate
- composer install --dev --prefer-dist - composer require --prefer-dist --no-update silverstripe/recipe-core:5.x-dev
- composer require --prefer-dist --no-update silverstripe/recipe-core:2.x-dev - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
- composer update
- if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
- phpenv rehash - phpenv rehash

4
composer.json
View File

@ -21,8 +21,8 @@
} }
], ],
"require": { "require": {
"php": ">=7.1", "php": "^7.2",
"phpunit/phpunit": "^7@dev", "phpunit/phpunit": "^7 || ^8",
"behat/behat": "^3.2", "behat/behat": "^3.2",
"behat/mink": "^1.7", "behat/mink": "^1.7",
"behat/mink-extension": "^2.1", "behat/mink-extension": "^2.1",

5
tests/php/SilverStripeContextTest.php
View File

@ -8,6 +8,7 @@ use Behat\Mink\Session;
use Behat\Mink\Mink; use Behat\Mink\Mink;
use Behat\Mink\Driver\DriverInterface; use Behat\Mink\Driver\DriverInterface;
use Behat\Mink\Element\Element; use Behat\Mink\Element\Element;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use SilverStripe\BehatExtension\Tests\SilverStripeContextTest\FeatureContext; use SilverStripe\BehatExtension\Tests\SilverStripeContextTest\FeatureContext;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
@ -17,7 +18,7 @@ class SilverStripeContextTest extends TestCase
protected $backupGlobals = false; protected $backupGlobals = false;
public static function setUpBeforeClass() public static function setUpBeforeClass(): void
{ {
// Bootstrap test environment // Bootstrap test environment
parent::setUpBeforeClass(); parent::setUpBeforeClass();
@ -100,7 +101,7 @@ class SilverStripeContextTest extends TestCase
} }
/** /**
* @return Element|\PHPUnit_Framework_MockObject_MockObject * @return Element|MockObject
*/ */
protected function getElementMock() protected function getElementMock()
{ {