Skip to content

Commit 224cbd8

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature/use-accessor
2 parents 1c7f44d + c8a70e2 commit 224cbd8

File tree

7 files changed

+41
-80
lines changed

7 files changed

+41
-80
lines changed

.github/workflows/psalm.yml

-33
This file was deleted.

.github/workflows/run-tests.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [ubuntu-latest, windows-latest]
19-
php: [8.3, 8.2, 8.1]
20-
laravel: ['9.*', '10.*', '11.*']
19+
php: [8.1, 8.2, 8.3, 8.4]
20+
laravel: ['9.*', '10.*', '11.*', '12.*']
2121
dependency-version: [prefer-stable]
2222
include:
2323
- laravel: 9.*
@@ -26,9 +26,17 @@ jobs:
2626
testbench: 8.*
2727
- laravel: 11.*
2828
testbench: 9.*
29+
- laravel: 12.*
30+
testbench: 10.*
2931
exclude:
32+
- laravel: 10.*
33+
php: 8.3
34+
- laravel: 10.*
35+
php: 8.4
3036
- laravel: 11.*
3137
php: 8.1
38+
- laravel: 12.*
39+
php: 8.1
3240

3341
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
3442

CHANGELOG.md

+20-12
Original file line numberDiff line numberDiff line change
@@ -55,63 +55,71 @@ The following changes are required when updating:
5555

5656
## Changes
5757

58-
### 2.2.0
58+
### 2.4.0 - 2025-02-17
59+
60+
- Add Laravel 12 support
61+
62+
### 2.3.0 - 2024-12-26
63+
64+
- Add PHP 8.4 support
65+
66+
### 2.2.0 - 2024-02-28
5967

6068
- Add Laravel 11 support
6169

62-
### 2.1.0
70+
### 2.1.0 - 2023-12-21
6371

6472
- Add PHP 8.3 support
6573

66-
### 2.0.0
74+
### 2.0.0 - 2023-02-14
6775

6876
- Minimum PHP requirement 8.1
6977
- Add support for PHP 8.2
7078
- Minimum Laravel requirement 9.0
7179
- Add support for Laravel 10.*
7280

73-
### 1.3.0
81+
### 1.3.0 - 2023-01-18
7482

7583
- Added return types for better IDE completion by @shahruslan in #24
7684

77-
### 1.2.1
85+
### 1.2.1 - 2022-05-7
7886

7987
- Append instead of override when writign to a log file by @afiqiqmal in #21
8088
- Add Prefix Config by @afiqiqmal in #20
8189

82-
### 1.2.0
90+
### 1.2.0 - 2022-02-10
8391

8492
- Add Laravel 9 support
8593

86-
### 1.1.0
94+
### 1.1.0 - 2021-12-19
8795

8896
- Implement new MessageAccessor class by @bilfeldt in #13
8997
- Implement a new logWith-method + a LogAllFilter class and a NullLogger by @bilfeldt in #15
9098
- Apply fixes from StyleCI by @bilfeldt in #11
9199
- Apply fixes from StyleCI by @bilfeldt in #14
92100

93-
### 1.0.1
101+
### 1.0.1 - 2021-07-01
94102

95103
- Add unofficial support for Lumen
96104

97-
### 1.0.0
105+
### 1.0.0 - 2021-04-19
98106

99107
- Release first stable release
100108
- Flatten configuration (breaking change)
101109

102-
### 0.3.0
110+
### 0.3.0 - 2021-04-05
103111

104112
- Add on-demand configuration array (breaking change)
105113
- Fix evaluation of closures in `logWhen` macro
106114
- Add environmental variables for filtering options
107115
- Add new filtering option for enabling all logging
108116

109-
### 0.2.0
117+
### 0.2.0 - 2021-02-17
110118

111119
- Refactor configuration (breaking change)
112120
- Add logging to a flysystem disk
113121
- Bugfix: `$context` not being passed down when using request macros
114122

115-
### 0.1.0
123+
### 0.1.0 - 2021-02-15
116124

117125
- initial release

README.md

+5-7
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
![bilfeldt/laravel-http-client-logger](cover.jpg)
44

55
[![Latest Version on Packagist](https://img.shields.io/packagist/v/bilfeldt/laravel-http-client-logger)](https://packagist.org/packages/bilfeldt/laravel-http-client-logger)
6-
[![GitHub Tests Action Status](https://img.shields.io/github/workflow/status/bilfeldt/laravel-http-client-logger/run-tests?label=tests)](https://github.com/bilfeldt/laravel-http-client-logger/actions?query=workflow%3ATests+branch%3Amaster)
7-
[![GitHub Code Style Action Status](https://img.shields.io/github/workflow/status/bilfeldt/laravel-http-client-logger/Check%20&%20fix%20styling?label=code%20style)](https://github.com/bilfeldt/laravel-http-client-logger/actions?query=workflow%3A"Check+%26+fix+styling"+branch%3Amaster)
8-
[![Total Downloads](https://img.shields.io/packagist/dt/bilfeldt/laravel-http-client-logger)](https://packagist.org/packages/bilfeldt/laravel-http-client-logger)
6+
[![GitHub Tests Action Status](https://github.com/bilfeldt/laravel-http-client-logger/actions/workflows/run-tests.yml/badge.svg)](https://github.com/bilfeldt/laravel-http-client-logger/actions/workflows/run-tests.yml)
97

108

119
An easy yet very flexible logger for the Laravel HTTP Client.
1210

13-
| Version | Laravel | PHP |
14-
|---------|---------------------|-------------------------|
15-
| 1.* | 8.* \| 9.* | 7.4.* \| 8.0.* |
16-
| 2.* | 9.* \| 10.* \| 11.* | 8.1.* \| 8.2.* \| 8.3.* |
11+
| Version | Laravel | PHP |
12+
|---------|-----------------------------|----------------------------------|
13+
| 1.* | 8.* \| 9.* | 7.4.* \| 8.0.* |
14+
| 2.* | 9.* \| 10.* \| 11.* \| 12.* | 8.1.* \| 8.2.* \| 8.3.* \| 8.4.* |
1715

1816
## Installation
1917

composer.json

+6-8
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,17 @@
2020
}
2121
],
2222
"require": {
23-
"php": "~8.3.0 | ~8.2.0 | ~8.1.0",
23+
"php": "~8.1.0 | ~8.2.0 | ~8.3.0 | ~8.4.0",
2424
"ext-json": "*",
2525
"guzzlehttp/guzzle": "^7.2",
26-
"illuminate/http": "^9.0 || ^10.0 || ^11.0",
27-
"illuminate/support": "^9.0 || ^10.0 || ^11.0",
26+
"illuminate/http": "^9.0 || ^10.0 || ^11.0 || ^12.0",
27+
"illuminate/support": "^9.0 || ^10.0 || ^11.0 || ^12.0",
2828
"spatie/laravel-package-tools": "^1.1"
2929
},
3030
"require-dev": {
31-
"orchestra/testbench": "^7.0 || ^8.0 || ^9.0",
32-
"phpunit/phpunit": "^9.5.10 || ^10.0",
33-
"spatie/laravel-ray": "^1.29",
34-
"timacdonald/log-fake": "^2.0",
35-
"vimeo/psalm": "^4.20"
31+
"orchestra/testbench": "^7.0 || ^8.0 || ^9.0 || ^10.0",
32+
"phpunit/phpunit": "^9.5.10 || ^10.0 || ^11.0",
33+
"timacdonald/log-fake": "^2.0"
3634
},
3735
"autoload": {
3836
"psr-4": {

psalm.xml.dist

-16
This file was deleted.

tests/TestCase.php

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ abstract class TestCase extends Orchestra
99
{
1010
public function setUp(): void
1111
{
12-
ray()->newScreen("Test {$this->getName()}");
13-
1412
parent::setUp();
1513

1614
config()->set('http-client-logger.filter_2xx', true);

0 commit comments

Comments
 (0)