Skip to content

Commit 6150b89

Browse files
committed
Merge branch '7.1' into 7.2
* 7.1: [Console] Fix division by 0 error [ErrorHandler] Fix error message with PHP 8.5 add test covering associated entities referenced by their primary key Add an experimental CI job for PHP 8.5 Fix change log to mentioned thrown exception [HttpClient] Always set CURLOPT_CUSTOMREQUEST to the correct HTTP method in CurlHttpClient evaluate access flags for properties with asymmetric visibility [Mime] Fix wrong PHPDoc in `FormDataPart` constructor
2 parents 672b3dd + 12cada0 commit 6150b89

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Tests/phpt/fatal_with_nested_handlers.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var_dump([
2424
$eHandler[0]->setExceptionHandler('print_r');
2525

2626
if (true) {
27-
class Broken implements \JsonSerializable
27+
class Broken implements \Iterator
2828
{
2929
}
3030
}
@@ -37,14 +37,14 @@ array(1) {
3737
}
3838
object(Symfony\Component\ErrorHandler\Error\FatalError)#%d (%d) {
3939
["message":protected]=>
40-
string(186) "Error: Class Symfony\Component\ErrorHandler\Broken contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (JsonSerializable::jsonSerialize)"
40+
string(209) "Error: Class Symfony\Component\ErrorHandler\Broken contains 5 abstract methods and must therefore be declared abstract or implement the remaining methods (Iterator::current, Iterator::next, Iterator::key, ...)"
4141
%a
4242
["error":"Symfony\Component\ErrorHandler\Error\FatalError":private]=>
4343
array(4) {
4444
["type"]=>
4545
int(1)
4646
["message"]=>
47-
string(179) "Class Symfony\Component\ErrorHandler\Broken contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (JsonSerializable::jsonSerialize)"
47+
string(202) "Class Symfony\Component\ErrorHandler\Broken contains 5 abstract methods and must therefore be declared abstract or implement the remaining methods (Iterator::current, Iterator::next, Iterator::key, ...)"
4848
["file"]=>
4949
string(%d) "%s"
5050
["line"]=>

0 commit comments

Comments
 (0)