Skip to content

Commit d5a0fe4

Browse files
authored
Forward port PHP 8.4 & 8.5 CI support from 1.x (#196)
* Support PHP 8.4 & 8.5 in CI * Remove Prophecy and use PHPUnit mocks. * Support PHPUnit 10.x for PHP 8.1+
1 parent 1859330 commit d5a0fe4

File tree

4 files changed

+358
-309
lines changed

4 files changed

+358
-309
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
php: [7.4, 8.0, 8.1, 8.2, 8.3]
12+
php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5]
1313

1414
steps:
1515
- name: Checkout

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ See https://github.com/slimphp/Slim-Csrf/releases for a full list
44

55
## 2.x
66

7+
- Added: Support for PHP 8.4 and 8.5
78
- Fixed: The key names are now the correct format to be sent as headers.
89

910
This is a potential BC break. The key names now use a dash rather than an
@@ -12,6 +13,10 @@ See https://github.com/slimphp/Slim-Csrf/releases for a full list
1213

1314
- Changed: Increased likelihood that tokens are unique.
1415

16+
## 1.5.1
17+
18+
- Added: Support for PHP 8.4 and 8.5
19+
1520
## 1.5.0
1621

1722
- Added: Support for PHP 8.2 and 8.3

composer.json

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
"psr/http-server-middleware": "^1.0"
2424
},
2525
"require-dev": {
26-
"phpspec/prophecy": "^1.19",
27-
"phpspec/prophecy-phpunit": "^2.2",
28-
"phpunit/phpunit": "^9.6",
26+
"phpunit/phpunit": "^9.6 || ^10.5",
2927
"squizlabs/php_codesniffer": "^3.10"
3028
},
3129
"autoload": {
@@ -37,5 +35,19 @@
3735
"psr-4": {
3836
"Slim\\Csrf\\Tests\\": "tests"
3937
}
38+
},
39+
"scripts": {
40+
"sniffer:check": "phpcs --standard=phpcs.xml",
41+
"sniffer:fix": "phpcbf --standard=phpcs.xml",
42+
"test": "phpunit --do-not-cache-result --colors=always",
43+
"check": [
44+
"@sniffer:check",
45+
"@test:coverage"
46+
],
47+
"test:coverage": [
48+
"@putenv XDEBUG_MODE=coverage",
49+
"phpunit --do-not-cache-result --colors=always --coverage-clover build/coverage/clover.xml --coverage-html build/coverage --coverage-text"
50+
]
4051
}
52+
4153
}

0 commit comments

Comments
 (0)