Skip to content

Commit 42f9bfa

Browse files
authored
PHPUnit 10 support (#456)
* Fix PHPMatcherConstraint compatibility with PHPUnit 10 * Upgrade tests to PHPUnit 10 * Fix dataProvider static method deprecation * Remove phpunit configuration file deprecation warning * Upgrade Composer dependencies * Fix coding style * Use PHP 8.1 in CI
1 parent ff032e6 commit 42f9bfa

18 files changed

+905
-1341
lines changed

.github/workflows/test-suite.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ jobs:
1919
- "lowest"
2020
- "highest"
2121
php-version:
22-
- "7.4"
23-
- "8.0"
2422
- "8.1"
2523
- "8.2"
2624
operating-system:
@@ -78,7 +76,7 @@ jobs:
7876
uses: "shivammathur/setup-php@v2"
7977
with:
8078
coverage: "pcov"
81-
php-version: "7.4"
79+
php-version: "8.1"
8280
ini-values: memory_limit=-1
8381
tools: composer:v2
8482

@@ -92,9 +90,9 @@ jobs:
9290
with:
9391
path: |
9492
${{ steps.composer-cache.outputs.dir }}
95-
key: "php-7.4-locked-composer-${{ hashFiles('**/composer.lock') }}"
93+
key: "php-8.1-locked-composer-${{ hashFiles('**/composer.lock') }}"
9694
restore-keys: |
97-
php-7.4-locked-composer-
95+
php-8.1-locked-composer-
9896
9997
- name: "Install locked dependencies"
10098
run: "composer install --no-interaction --no-progress --no-suggest"
@@ -114,7 +112,7 @@ jobs:
114112
with:
115113
coverage: "pcov"
116114
tools: composer:v2
117-
php-version: "7.4"
115+
php-version: "8.1"
118116
ini-values: memory_limit=-1
119117

120118
- name: "Get Composer Cache Directory"
@@ -127,9 +125,9 @@ jobs:
127125
with:
128126
path: |
129127
${{ steps.composer-cache.outputs.dir }}
130-
key: "php-7.4-locked-composer-${{ hashFiles('**/composer.lock') }}"
128+
key: "php-8.1-locked-composer-${{ hashFiles('**/composer.lock') }}"
131129
restore-keys: |
132-
php-7.4-locked-composer-
130+
php-8.1-locked-composer-
133131
134132
- name: "Install locked dependencies"
135133
run: "composer install --no-interaction --no-progress --no-suggest"

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ bin/
33
var/
44
.DS_Store
55
.idea
6-
.phpunit.result.cache
6+
.phpunit.cache/

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
}
1616
],
1717
"require": {
18-
"php": "^7.4.2 || ~8.0 || ~8.1 || ~8.2",
18+
"php": "~8.1 || ~8.2",
1919
"ext-filter": "*",
2020
"ext-json": "*",
2121
"ext-simplexml": "*",
22-
"aeon-php/calendar": "^0.14.0 || ^0.15.0 || ^0.16.0 || ^0.17.0 || ^0.18.0 || ^1.0",
22+
"aeon-php/calendar": "^1.0",
2323
"coduo/php-to-string": "^3",
2424
"doctrine/lexer": "^1.0||^2.0"
2525
},
2626
"require-dev": {
2727
"ext-pcov": "*",
2828
"openlss/lib-array2xml": "^1.0",
29-
"symfony/expression-language": "^2.3|^3.0|^4.0|^5.0"
29+
"symfony/expression-language": "^2.3|^3.0|^4.0|^5.0|^6.0"
3030
},
3131
"suggest": {
3232
"openlss/lib-array2xml": "In order ot use Coduo\\PHPMatcher\\Matcher\\XmlMatcher",

0 commit comments

Comments
 (0)