Skip to content

Commit

Permalink
Fix support for psr/log 1|2|3
Browse files Browse the repository at this point in the history
  • Loading branch information
asgrim committed Mar 2, 2022
1 parent 1f6dc8d commit a5f16d2
Show file tree
Hide file tree
Showing 6 changed files with 191 additions and 269 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,17 @@ jobs:
uses: shivammathur/setup-php@v2
with:
coverage: "none"
php-version: "8.0"
php-version: "7.1"
tools: composer:v2.2
env:
fail-fast: true
- name: "Replace guzzlehttp/guzzle with php-http/guzzle6-adapter (PHP 7.1)"
if: ${{ matrix.php-version == '7.1' }}
run: |
composer remove --dev guzzlehttp/guzzle --no-update --no-interaction
composer require --dev php-http/guzzle6-adapter --no-update --no-interaction
- name: "Install dependencies"
run: "composer install"
run: "composer update --no-interaction --prefer-dist --prefer-stable"
- name: "Run Psalm"
run: "vendor/bin/psalm"

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0",
"psr/log": "^1.0",
"psr/log": "^1.0|^2.0|^3.0",
"psr/simple-cache": "^1.0",
"ralouphie/getallheaders": "^2.0.5|^3.0",
"ramsey/uuid": "^3.0|^4.2.2",
Expand Down
Loading

0 comments on commit a5f16d2

Please sign in to comment.