Skip to content

Commit d37c233

Browse files
authored
Allow PHPUnit 12 (#364)
* Allow PHPUnit 12 * Workaround to include phpspec/prophecy-phpunit#67
1 parent 0b405dd commit d37c233

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/integrate.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
php-version: "${{ matrix.php-version }}"
4545

4646
- name: "Validate composer.json and composer.lock"
47-
run: "composer validate --ansi --strict"
47+
run: "composer validate --ansi"
4848

4949
- uses: "ramsey/composer-install@v3"
5050
with:
@@ -92,7 +92,7 @@ jobs:
9292
phpunit-version: "11.0"
9393
dependencies: "highest"
9494
- php-version: "8.4"
95-
phpunit-version: "11.0"
95+
phpunit-version: "12.0"
9696
dependencies: "highest"
9797

9898
steps:

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
"ergebnis/license": "^2.6.0",
1919
"ergebnis/php-cs-fixer-config": "^6.46.0",
2020
"phpspec/prophecy": "^1.7.0",
21-
"phpspec/prophecy-phpunit": "^2.3",
21+
"phpspec/prophecy-phpunit": "^2.3 || dev-master#d3c2804 as 2.4.0",
2222
"phpunit/phpunit": "^9.1.0"
2323
},
2424
"conflict": {
2525
"phpspec/prophecy": "<1.17.0 || >=2.0.0",
2626
"phpspec/prophecy-phpunit": "<2.3.0 || >=3.0.0",
27-
"phpunit/phpunit": "<9.1.0 || >=12.0.0"
27+
"phpunit/phpunit": "<9.1.0 || >=13.0.0"
2828
},
2929
"autoload": {
3030
"psr-4": {

composer.lock

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)