Skip to content

Commit ebe6c15

Browse files
authored
Merge pull request #60 from gsteel/allow-psr-http-messsage-2
Allow psr/http-message ^2
2 parents eb5d1d4 + 8e7c4c6 commit ebe6c15

File tree

6 files changed

+1212
-1198
lines changed

6 files changed

+1212
-1198
lines changed

.github/workflows/tests.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,13 @@ jobs:
3333
composer-flags: ['']
3434
include:
3535
- php: '7.2'
36-
coverage: false
36+
coverage: 'none'
3737
- php: '8.0'
38-
coverage: false
39-
composer-flags: '--ignore-platform-req=php'
38+
coverage: 'none'
39+
- php: '8.1'
40+
coverage: 'none'
41+
- php: '8.2'
42+
coverage: 'none'
4043

4144
steps:
4245
- uses: actions/checkout@v2
@@ -52,9 +55,9 @@ jobs:
5255

5356
- run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
5457

55-
- name: "Use PHPUnit 9.3+ on PHP 8"
58+
- name: "Use PHPUnit 9.3+ on PHP 8+"
5659
run: composer require --no-update --dev phpunit/phpunit:^9.3
57-
if: "matrix.php == '8.0'"
60+
if: ${{ matrix.php == '8.0' || matrix.php == '8.1' || matrix.php == '8.2' }}
5861

5962
- run: composer update --no-progress ${{ matrix.composer-flags }}
6063

@@ -65,7 +68,7 @@ jobs:
6568
if: ${{ matrix.coverage != 'none' }}
6669

6770
- run: php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
68-
if: ${{ matrix.coverage != 'none' }}
71+
if: ${{ matrix.coverage != 'none' && github.repository == 'dflydev/dflydev-fig-cookies' }}
6972

7073
phpstan:
7174
name: PHPStan

composer.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,16 @@
99
"email": "[email protected]"
1010
}
1111
],
12+
"config": {
13+
"allow-plugins": {
14+
"dealerdirect/phpcodesniffer-composer-installer": true,
15+
"phpstan/extension-installer": true
16+
}
17+
},
1218
"require": {
1319
"php": "^7.2 || ^8.0",
1420
"ext-pcre": "*",
15-
"psr/http-message": "^1"
21+
"psr/http-message": "^1.0.1 || ^2"
1622
},
1723
"autoload": {
1824
"psr-4": {

0 commit comments

Comments
 (0)