Skip to content

Commit 60486ee

Browse files
cleptricLitarnus
cleptric
and
Litarnus
authored
meta: Run CI on PHP 8.5 (#1927)
Co-authored-by: Martin Linzmayer <martin.linzmayer@sentry.io>
1 parent 13d3536 commit 60486ee

11 files changed

Lines changed: 374 additions & 0 deletions

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
- { version: '8.2', phpunit: '^9.6.21' }
3636
- { version: '8.3', phpunit: '^9.6.21' }
3737
- { version: '8.4', phpunit: '^9.6.21' }
38+
- { version: '8.5', phpunit: '^9.6.25' }
3839
dependencies:
3940
- lowest
4041
- highest

tests/phpt-oom/out_of_memory_fatal_error_increases_memory_limit.phpt renamed to tests/phpt-oom/php84/out_of_memory_fatal_error_increases_memory_limit.phpt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
--TEST--
22
Test that when handling a out of memory error the memory limit is increased with 5 MiB and the event is serialized and ready to be sent
3+
--SKIPIF--
4+
<?php
5+
if (PHP_VERSION_ID >= 80400) {
6+
die('skip - only works for PHP 8.4 and below');
7+
}
38
--INI--
49
memory_limit=67108864
510
--FILE--

‎tests/phpt-oom/php85/out_of_memory_fatal_error_increases_memory_limit.phpt‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
--TEST--
2+
Test that when handling a out of memory error the memory limit is increased with 5 MiB and the event is serialized and ready to be sent
3+
--SKIPIF--
4+
<?php
5+
if (PHP_VERSION_ID < 80500) {
6+
die('skip - only works for PHP 8.5 and above');
7+
}
8+
--INI--
9+
memory_limit=67108864
10+
--FILE--
11+
<?php
12+
13+
declare(strict_types=1);
14+
15+
namespace Sentry\Tests;
16+
17+
use Sentry\ClientBuilder;
18+
use Sentry\Event;
19+
use Sentry\Options;
20+
use Sentry\SentrySdk;
21+
use Sentry\Serializer\PayloadSerializer;
22+
use Sentry\Serializer\PayloadSerializerInterface;
23+
use Sentry\Transport\Result;
24+
use Sentry\Transport\ResultStatus;
25+
use Sentry\Transport\TransportInterface;
26+
27+
$vendor = __DIR__;
28+
29+
while (!file_exists($vendor . '/vendor')) {
30+
$vendor = \dirname($vendor);
31+
}
32+
33+
require $vendor . '/vendor/autoload.php';
34+
35+
$options = new Options([
36+
'dsn' => 'http://public@example.com/sentry/1',
37+
]);
38+
39+
$transport = new class(new PayloadSerializer($options)) implements TransportInterface {
40+
private $payloadSerializer;
41+
42+
public function __construct(PayloadSerializerInterface $payloadSerializer)
43+
{
44+
$this->payloadSerializer = $payloadSerializer;
45+
}
46+
47+
public function send(Event $event): Result
48+
{
49+
$serialized = $this->payloadSerializer->serialize($event);
50+
51+
echo 'Transport called' . \PHP_EOL;
52+
53+
return new Result(ResultStatus::success());
54+
}
55+
56+
public function close(?int $timeout = null): Result
57+
{
58+
return new Result(ResultStatus::success());
59+
}
60+
};
61+
62+
$options->setTransport($transport);
63+
64+
$client = (new ClientBuilder($options))->getClient();
65+
66+
SentrySdk::init()->bindClient($client);
67+
68+
echo 'Before OOM memory limit: ' . \ini_get('memory_limit');
69+
70+
register_shutdown_function(function () {
71+
echo 'After OOM memory limit: ' . \ini_get('memory_limit');
72+
});
73+
74+
$array = [];
75+
for ($i = 0; $i < 100000000; ++$i) {
76+
$array[] = 'sentry';
77+
}
78+
--EXPECTF--
79+
Before OOM memory limit: 67108864
80+
Fatal error: Allowed memory size of %d bytes exhausted (tried to allocate %d bytes) in %s on line %d
81+
Stack trace:
82+
%A
83+
Transport called
84+
After OOM memory limit: 72351744

tests/phpt/error_handler_captures_fatal_error.phpt renamed to tests/phpt/php84/error_handler_captures_fatal_error.phpt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
--TEST--
22
Test catching fatal errors
3+
--SKIPIF--
4+
<?php
5+
if (PHP_VERSION_ID >= 80500) {
6+
die('skip - only works for PHP 8.4 and below');
7+
}
38
--FILE--
49
<?php
510

tests/phpt/error_handler_captures_out_of_memory_fatal_error.phpt renamed to tests/phpt/php84/error_handler_captures_out_of_memory_fatal_error.phpt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
--TEST--
22
Test catching out of memory fatal error without increasing memory limit
3+
--SKIPIF--
4+
<?php
5+
if (PHP_VERSION_ID >= 80500) {
6+
die('skip - only works for PHP 8.4 and below');
7+
}
38
--INI--
49
memory_limit=67108864
510
--FILE--

tests/phpt/fatal_error_integration_captures_fatal_error.phpt renamed to tests/phpt/php84/fatal_error_integration_captures_fatal_error.phpt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
--TEST--
22
Test that the FatalErrorListenerIntegration integration captures only the errors allowed by the error_types option
3+
--SKIPIF--
4+
<?php
5+
if (PHP_VERSION_ID >= 80500) {
6+
die('skip - only works for PHP 8.4 and below');
7+
}
38
--FILE--
49
<?php
510

tests/phpt/fatal_error_integration_respects_error_types_option.phpt renamed to tests/phpt/php84/fatal_error_integration_respects_error_types_option.phpt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
--TEST--
22
Test that the FatalErrorListenerIntegration integration captures only the errors allowed by the error_types option
3+
--SKIPIF--
4+
<?php
5+
if (PHP_VERSION_ID >= 80500) {
6+
die('skip - only works for PHP 8.4 and below');
7+
}
38
--FILE--
49
<?php
510

‎tests/phpt/php85/error_handler_captures_fatal_error.phpt‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
--TEST--
2+
Test catching fatal errors
3+
--SKIPIF--
4+
<?php
5+
if (PHP_VERSION_ID < 80500) {
6+
die('skip - only works for PHP 8.5 and above');
7+
}
8+
--FILE--
9+
<?php
10+
11+
declare(strict_types=1);
12+
13+
namespace Sentry\Tests;
14+
15+
use Sentry\ClientBuilder;
16+
use Sentry\ErrorHandler;
17+
use Sentry\Event;
18+
use Sentry\Options;
19+
use Sentry\SentrySdk;
20+
use Sentry\Transport\Result;
21+
use Sentry\Transport\ResultStatus;
22+
use Sentry\Transport\TransportInterface;
23+
24+
$vendor = __DIR__;
25+
26+
while (!file_exists($vendor . '/vendor')) {
27+
$vendor = dirname($vendor);
28+
}
29+
30+
require $vendor . '/vendor/autoload.php';
31+
32+
$transport = new class implements TransportInterface {
33+
public function send(Event $event): Result
34+
{
35+
echo 'Transport called' . PHP_EOL;
36+
37+
return new Result(ResultStatus::success());
38+
}
39+
40+
public function close(?int $timeout = null): Result
41+
{
42+
return new Result(ResultStatus::success());
43+
}
44+
};
45+
46+
$options = [
47+
'dsn' => 'http://public@example.com/sentry/1',
48+
];
49+
50+
$client = ClientBuilder::create($options)
51+
->setTransport($transport)
52+
->getClient();
53+
54+
SentrySdk::getCurrentHub()->bindClient($client);
55+
56+
$errorHandler = ErrorHandler::registerOnceErrorHandler();
57+
$errorHandler->addErrorHandlerListener(static function (): void {
58+
echo 'Error listener called (it should not have been)' . PHP_EOL;
59+
});
60+
61+
$errorHandler = ErrorHandler::registerOnceFatalErrorHandler();
62+
$errorHandler->addFatalErrorHandlerListener(static function (): void {
63+
echo 'Fatal error listener called' . PHP_EOL;
64+
});
65+
66+
$errorHandler = ErrorHandler::registerOnceExceptionHandler();
67+
$errorHandler->addExceptionHandlerListener(static function (): void {
68+
echo 'Exception listener called (it should not have been)' . PHP_EOL;
69+
});
70+
71+
final class TestClass implements \JsonSerializable
72+
{
73+
}
74+
?>
75+
--EXPECTF--
76+
Fatal error: Class Sentry\Tests\TestClass contains 1 abstract method and must therefore be declared abstract or implement the remaining method (JsonSerializable::jsonSerialize) in %s on line %d
77+
Stack trace:
78+
%A
79+
Transport called
80+
Fatal error listener called

‎tests/phpt/php85/error_handler_captures_out_of_memory_fatal_error.phpt‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
--TEST--
2+
Test catching out of memory fatal error without increasing memory limit
3+
--SKIPIF--
4+
<?php
5+
if (PHP_VERSION_ID < 80500) {
6+
die('skip - only works for PHP 8.5 and above');
7+
}
8+
--INI--
9+
memory_limit=67108864
10+
--FILE--
11+
<?php
12+
13+
declare(strict_types=1);
14+
15+
namespace Sentry\Tests;
16+
17+
use Sentry\ErrorHandler;
18+
19+
$vendor = __DIR__;
20+
21+
while (!file_exists($vendor . '/vendor')) {
22+
$vendor = dirname($vendor);
23+
}
24+
25+
require $vendor . '/vendor/autoload.php';
26+
27+
$errorHandler = ErrorHandler::registerOnceFatalErrorHandler();
28+
$errorHandler->addFatalErrorHandlerListener(static function (): void {
29+
echo 'Fatal error listener called' . PHP_EOL;
30+
31+
echo 'After OOM memory limit: ' . ini_get('memory_limit');
32+
});
33+
34+
$errorHandler->setMemoryLimitIncreaseOnOutOfMemoryErrorInBytes(null);
35+
36+
echo 'Before OOM memory limit: ' . ini_get('memory_limit');
37+
38+
$foo = str_repeat('x', 1024 * 1024 * 1024);
39+
?>
40+
--EXPECTF--
41+
Before OOM memory limit: 67108864
42+
Fatal error: Allowed memory size of %d bytes exhausted (tried to allocate %d bytes) in %s on line %d
43+
Stack trace:
44+
%A
45+
Fatal error listener called
46+
After OOM memory limit: 67108864

‎tests/phpt/php85/fatal_error_integration_captures_fatal_error.phpt‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
--TEST--
2+
Test that the FatalErrorListenerIntegration integration captures only the errors allowed by the error_types option
3+
--SKIPIF--
4+
<?php
5+
if (PHP_VERSION_ID < 80500) {
6+
die('skip - only works for PHP 8.5 and above');
7+
}
8+
--FILE--
9+
<?php
10+
11+
declare(strict_types=1);
12+
13+
namespace Sentry\Tests;
14+
15+
use GuzzleHttp\Promise\FulfilledPromise;
16+
use GuzzleHttp\Promise\PromiseInterface;
17+
use Sentry\ClientBuilder;
18+
use Sentry\Event;
19+
use Sentry\Integration\FatalErrorListenerIntegration;
20+
use Sentry\Options;
21+
use Sentry\SentrySdk;
22+
use Sentry\Transport\Result;
23+
use Sentry\Transport\ResultStatus;
24+
use Sentry\Transport\TransportInterface;
25+
26+
$vendor = __DIR__;
27+
28+
while (!file_exists($vendor . '/vendor')) {
29+
$vendor = dirname($vendor);
30+
}
31+
32+
require $vendor . '/vendor/autoload.php';
33+
34+
$transport = new class implements TransportInterface {
35+
public function send(Event $event): Result
36+
{
37+
echo 'Transport called' . PHP_EOL;
38+
39+
return new Result(ResultStatus::success());
40+
}
41+
42+
public function close(?int $timeout = null): Result
43+
{
44+
return new Result(ResultStatus::success());
45+
}
46+
};
47+
48+
$options = new Options([
49+
'default_integrations' => false,
50+
'integrations' => [
51+
new FatalErrorListenerIntegration(),
52+
],
53+
]);
54+
55+
$client = (new ClientBuilder($options))
56+
->setTransport($transport)
57+
->getClient();
58+
59+
SentrySdk::getCurrentHub()->bindClient($client);
60+
61+
final class TestClass implements \JsonSerializable
62+
{
63+
}
64+
?>
65+
--EXPECTF--
66+
Fatal error: Class Sentry\Tests\TestClass contains 1 abstract method and must therefore be declared abstract or implement the remaining method (JsonSerializable::jsonSerialize) in %s on line %d
67+
Stack trace:
68+
%A
69+
Transport called

0 commit comments

Comments
 (0)