Skip to content

Commit 72882d9

Browse files
committed
PHP 8.5 Support
1 parent dab7e80 commit 72882d9

File tree

3 files changed

+26
-17
lines changed

3 files changed

+26
-17
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ jobs:
88
strategy:
99
fail-fast: true
1010
matrix:
11-
php: [8.4, 8.3, 8.2]
12-
laravel: [11.*, 12.*]
11+
php: [8.5, 8.4, 8.3, 8.2]
12+
laravel: [12.*, 11.*]
1313
stability: [prefer-lowest, prefer-stable]
14+
os: [ubuntu-latest]
1415
include:
1516
- laravel: 12.*
1617
testbench: 10.*
@@ -19,8 +20,10 @@ jobs:
1920
exclude:
2021
- php: 8.4
2122
stability: prefer-lowest
23+
- php: 8.5
24+
stability: prefer-lowest
2225

23-
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
26+
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.stability }}
2427

2528
steps:
2629
- name: Checkout code
@@ -30,12 +33,24 @@ jobs:
3033
uses: shivammathur/setup-php@v2
3134
with:
3235
php-version: ${{ matrix.php }}
33-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
36+
extensions: >
37+
dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite,
38+
bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
3439
coverage: xdebug
3540

41+
- name: Cache Composer dependencies
42+
uses: actions/cache@v4
43+
with:
44+
path: vendor
45+
key: composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('composer.lock') }}
46+
restore-keys: composer-
47+
3648
- name: Install dependencies
3749
run: |
38-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
50+
composer require \
51+
"laravel/framework:${{ matrix.laravel }}" \
52+
"orchestra/testbench:${{ matrix.testbench }}" \
53+
--no-interaction --no-update
3954
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
4055
4156
- name: Execute tests

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@
2929
"php": "^8.2",
3030
"illuminate/http": "^11.0||^12.0",
3131
"illuminate/support": "^11.0||^12.0",
32-
"monolog/monolog": "^3.0"
32+
"monolog/monolog": "^3.9"
3333
},
3434
"require-dev": {
3535
"laravel/framework": "^11.0||^12.0",
36-
"laravel/pint": "^1.21",
36+
"laravel/pint": "^1.25",
3737
"orchestra/testbench": "^9.0||^10.0",
38-
"pestphp/pest": "^3.7",
39-
"pestphp/pest-plugin-arch": "^3.0",
40-
"pestphp/pest-plugin-laravel": "^3.1",
38+
"pestphp/pest": "^3.8",
39+
"pestphp/pest-plugin-arch": "^3.1",
40+
"pestphp/pest-plugin-laravel": "^3.2",
4141
"saloonphp/laravel-http-sender": "^3.1",
42-
"saloonphp/laravel-plugin": "^3.5.1",
42+
"saloonphp/laravel-plugin": "^3.7",
4343
"spatie/invade": "^2.1"
4444
},
4545
"suggest": {

src/Traits/ObfuscatesBody.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44

55
namespace Onlime\LaravelHttpClientGlobalLogger\Traits;
66

7-
use GuzzleHttp\MessageFormatter;
8-
use GuzzleHttp\Middleware;
9-
use Illuminate\Http\Client\PendingRequest;
10-
use Illuminate\Support\Facades\Log;
11-
use Monolog\Logger;
12-
137
trait ObfuscatesBody
148
{
159
protected function obfuscateBody(string $message): string

0 commit comments

Comments
 (0)