Skip to content

Commit a087d14

Browse files
authored
Merge pull request #107 from aik099/support-newer-phpunit-feat
Support newer PHPUnit versions
2 parents 90d0e5d + 2e4b5c9 commit a087d14

57 files changed

Lines changed: 1363 additions & 533 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
runs-on: ubuntu-20.04
2323
strategy:
2424
matrix:
25-
php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3' ]
25+
php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
2626
with_coverage: [ false ]
2727
include:
28-
- php: '7.3'
28+
- php: '7.4'
2929
with_coverage: true
3030
fail-fast: false
3131

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
vendor
22
composer.phar
33
phpunit.xml
4+
.phpunit.result.cache
45
build

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
88

99
### Changed
1010
- Bumped minimum PHPUnit version to 4.8.35 or 5.4.3.
11+
- Lifted restriction on used PHPUnit version.
1112
- Use namespaced class versions of PHPUnit.
13+
- Bumped minimum PHP version to 5.4.7.
14+
- Test case configuration method renamed from "BrowserTestCase::setUp" into "BrowserTestCase::setUpTest".
1215

1316
### Fixed
1417
- Fixed "PHP Strict standards" notice when used with PHPUnit 5+.

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@
1313
],
1414

1515
"require": {
16-
"php": ">=5.3.2",
16+
"php": ">=5.4.7",
1717
"behat/mink": "~1.6@dev",
1818
"behat/mink-selenium2-driver": "~1.2",
1919
"symfony/event-dispatcher": "~2.4|~3.0",
20-
"phpunit/phpunit": ">=4.8.35 <5|>=5.4.3 <6"
20+
"phpunit/phpunit": ">=4.8.35 <5|>=5.4.3"
2121
},
2222

2323
"require-dev": {
2424
"aik099/coding-standard": "dev-master",
25-
"mockery/mockery": "~0.9"
25+
"mockery/mockery": "~0.9|^1.5",
26+
"yoast/phpunit-polyfills": "^1.0"
2627
},
2728

2829
"autoload": {

0 commit comments

Comments
 (0)