Skip to content

Commit de5747f

Browse files
subzero10the-pulli
subzero10
and
the-pulli
authored
perf: add PHP 8.4 to test matrix (#218)
* Update honeybadger-php to play nice with PHP 8.4 * Update missing files * ci: add 8.4 to test matrix and fix tests * ci: do not prefer lowest * chore: remove changelog entry It will be added by the release action. --------- Co-authored-by: PuLLi <[email protected]>
1 parent 3f84e54 commit de5747f

12 files changed

+35
-24
lines changed

‎.github/workflows/run-tests.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ jobs:
1212
strategy:
1313
matrix:
1414
composer-flags: ["--prefer-stable", "--prefer-lowest"]
15-
php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2']
15+
php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.4']
1616
exclude:
1717
- {php-versions: '8.1', composer-flags: "--prefer-lowest"}
1818
- {php-versions: '8.2', composer-flags: "--prefer-lowest"}
19+
- {php-versions: '8.4', composer-flags: "--prefer-lowest"}
1920
name: PHP ${{ matrix.php-versions }} Tests (${{ matrix.composer-flags }})
2021
steps:
2122
- name: Checkout

‎src/CheckInsClientWithErrorHandling.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class CheckInsClientWithErrorHandling
1818
*/
1919
private $baseClient;
2020

21-
public function __construct(Config $config, Client $httpClient = null)
21+
public function __construct(Config $config, ?Client $httpClient = null)
2222
{
2323
$this->config = $config;
2424
$this->baseClient = new CheckInsClient($config, $httpClient);

‎src/CheckInsManager.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class CheckInsManager implements SyncCheckIns {
2424
* @param array $config
2525
* @param CheckInsClient|null $client
2626
*/
27-
public function __construct(array $config, CheckInsClient $client = null) {
27+
public function __construct(array $config, ?CheckInsClient $client = null) {
2828
$this->config = new Config($config);
2929
$this->client = $client ?? new CheckInsClient($this->config);
3030
}

‎src/Contracts/ApiClient.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ abstract class ApiClient {
2020

2121
/**
2222
* @param Config $config
23-
* @param Client|null $httpClient
23+
* @param ?Client $httpClient
2424
*/
25-
public function __construct(Config $config, Client $httpClient = null) {
25+
public function __construct(Config $config, ?Client $httpClient = null) {
2626
$this->config = $config;
2727
$this->client = $httpClient ?? $this->makeClient();
2828
}

‎src/Contracts/Reporter.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ interface Reporter
99
{
1010
/**
1111
* @param \Throwable $throwable
12-
* @param \Symfony\Component\HttpFoundation\Request $request
12+
* @param ?\Symfony\Component\HttpFoundation\Request $request
1313
* @param array $additionalParams
1414
* @return array
1515
*
1616
* @throws \Honeybadger\Exceptions\ServiceException
1717
*/
18-
public function notify(Throwable $throwable, FoundationRequest $request = null, array $additionalParams = []): array;
18+
public function notify(Throwable $throwable, ?FoundationRequest $request = null, array $additionalParams = []): array;
1919

2020
/**
2121
* @param array $payload
@@ -89,7 +89,7 @@ public function clear(): self;
8989
*
9090
* @return void
9191
*/
92-
public function event($eventTypeOrPayload, array $payload = null): void;
92+
public function event($eventTypeOrPayload, ?array $payload = null): void;
9393

9494
/**
9595
* Flush all events from the queue.

‎src/Environment.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class Environment
5252
*/
5353
protected $server = [];
5454

55-
public function __construct(array $server = null, array $env = null)
55+
public function __construct(?array $server = null, ?array $env = null)
5656
{
5757
$this->server = array_merge(
5858
$server ?? $_SERVER,

‎src/ExceptionNotification.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ public function __construct(Config $config, Repository $context, Breadcrumbs $br
6565

6666
/**
6767
* @param \Throwable $e
68-
* @param \Symfony\Component\HttpFoundation\Request $request
68+
* @param ?\Symfony\Component\HttpFoundation\Request $request
6969
* @param array $additionalParams
7070
* @return array
7171
*/
72-
public function make(Throwable $e, FoundationRequest $request = null, array $additionalParams = []): array
72+
public function make(Throwable $e, ?FoundationRequest $request = null, array $additionalParams = []): array
7373
{
7474
$this->throwable = $e;
7575
$this->backtrace = $this->makeBacktrace();
@@ -138,10 +138,10 @@ private function makeBacktrace(): BacktraceFactory
138138
}
139139

140140
/**
141-
* @param \Symfony\Component\HttpFoundation\Request $request
141+
* @param ?\Symfony\Component\HttpFoundation\Request $request
142142
* @return \Honeybadger\Request
143143
*/
144-
private function makeRequest(FoundationRequest $request = null): Request
144+
private function makeRequest(?FoundationRequest $request = null): Request
145145
{
146146
return (new Request($request))
147147
->filterKeys($this->config['request']['filter']);

‎src/Exceptions/ServiceException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static function unexpectedResponseCode(int $code): self
6060
* @param Throwable|null $e
6161
* @return self
6262
*/
63-
public static function generic(Throwable $e = null): self
63+
public static function generic(?Throwable $e = null): self
6464
{
6565
$message = $e
6666
? 'There was an error sending the payload to Honeybadger: '.$e->getMessage()

‎src/Handlers/ErrorHandler.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function register(): void
3232
$this->previousHandler = set_error_handler([$this, 'handle']);
3333
}
3434

35-
public function handle(int $level, string $error, string $file = null, int $line = null)
35+
public function handle(int $level, string $error, ?string $file = null, ?int $line = null)
3636
{
3737
// When the @ operator is used, it temporarily changes `error_reporting()`'s return value
3838
// to reflect what error types should be reported. This means we should get 0 (no errors).

‎src/Honeybadger.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class Honeybadger implements Reporter
6868
*/
6969
protected $events;
7070

71-
public function __construct(array $config = [], Client $client = null, BulkEventDispatcher $eventsDispatcher = null)
71+
public function __construct(array $config = [], ?Client $client = null, ?BulkEventDispatcher $eventsDispatcher = null)
7272
{
7373
$this->config = new Config($config);
7474

@@ -84,7 +84,7 @@ public function __construct(array $config = [], Client $client = null, BulkEvent
8484
/**
8585
* {@inheritdoc}
8686
*/
87-
public function notify(Throwable $throwable, FoundationRequest $request = null, array $additionalParams = []): array
87+
public function notify(Throwable $throwable, ?FoundationRequest $request = null, array $additionalParams = []): array
8888
{
8989
if (! $this->shouldReport($throwable)) {
9090
return [];
@@ -223,7 +223,7 @@ public function clear(): Reporter
223223
/**
224224
* {@inheritdoc}
225225
*/
226-
public function event($eventTypeOrPayload, array $payload = null): void
226+
public function event($eventTypeOrPayload, ?array $payload = null): void
227227
{
228228
if (empty($this->config['api_key']) || ! $this->config['events']['enabled']) {
229229
return;

‎src/Request.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ class Request
1515
protected $request;
1616

1717
/**
18-
* @param \Symfony\Component\HttpFoundation\Request $request
18+
* @param ?\Symfony\Component\HttpFoundation\Request $request
1919
* @param array $options
2020
*/
21-
public function __construct(FoundationRequest $request = null)
21+
public function __construct(?FoundationRequest $request = null)
2222
{
2323
$this->request = $request ?? FoundationRequest::createFromGlobals();
2424

‎tests/BacktraceFactoryTest.php

+14-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,12 @@ public function it_correctly_formats_annonymous_functions()
4040
$backtrace = (new BacktraceFactory($e, new Config))->trace();
4141
}
4242

43-
$this->assertEquals('Honeybadger\Tests\{closure}', $backtrace[0]['method']);
43+
// if php version is 8.4.0 or higher, then we need to check for a more specific closure name
44+
if (version_compare(PHP_VERSION, '8.4.0', '>=')) {
45+
$this->assertEquals('{closure:Honeybadger\Tests\BacktraceFactoryTest::it_correctly_formats_annonymous_functions():33}', $backtrace[0]['method']);
46+
} else {
47+
$this->assertEquals('Honeybadger\Tests\{closure}', $backtrace[0]['method']);
48+
}
4449
$this->assertEquals(['bar'], $backtrace[0]['args']);
4550
}
4651

@@ -62,7 +67,7 @@ function throwTestException()
6267
}
6368

6469
/** @test */
65-
public function bactraces_send_class()
70+
public function backtraces_send_class()
6671
{
6772
try {
6873
throw new Exception('test');
@@ -74,7 +79,7 @@ public function bactraces_send_class()
7479
}
7580

7681
/** @test */
77-
public function bactraces_send_type()
82+
public function backtraces_send_type()
7883
{
7984
try {
8085
throw new Exception('test');
@@ -153,7 +158,12 @@ public function args_with_object_should_be_literals()
153158
$backtrace = (new BacktraceFactory($e, new Config))->trace();
154159
}
155160

156-
$this->assertEquals('Honeybadger\Tests\{closure}', $backtrace[0]['method']);
161+
// if php version is 8.4.0 or higher, then we need to check for a more specific closure name
162+
if (version_compare(PHP_VERSION, '8.4.0', '>=')) {
163+
$this->assertEquals('{closure:Honeybadger\Tests\BacktraceFactoryTest::args_with_object_should_be_literals():151}', $backtrace[0]['method']);
164+
} else {
165+
$this->assertEquals('Honeybadger\Tests\{closure}', $backtrace[0]['method']);
166+
}
157167
$this->assertEquals(['bar', '[LITERAL]Object('.TestClass::class.')'], $backtrace[0]['args']);
158168
}
159169
}

0 commit comments

Comments
 (0)