Skip to content

Commit 2a38b35

Browse files
Merge branch '4.4' into 5.3
* 4.4: [gha] swap the php versions we use in jobs [DoctrineBridge] fix calling get_class on non-object Update PR template [HttpClient] Fix handling error info in MockResponse
2 parents 5d55ecd + 1fa8411 commit 2a38b35

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

ErrorHandler.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,9 @@ public function handleException(\Throwable $exception)
615615
}
616616

617617
$loggedErrors = $this->loggedErrors;
618-
$this->loggedErrors = $exception === $handlerException ? 0 : $this->loggedErrors;
618+
if ($exception === $handlerException) {
619+
$this->loggedErrors &= ~$type;
620+
}
619621

620622
try {
621623
$this->handleException($handlerException);

Tests/phpt/exception_rethrown.phpt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ if (true) {
1616
{
1717
public function log($level, $message, array $context = []): void
1818
{
19-
echo 'LOG: ', $message, "\n";
19+
if (0 !== strpos($message, 'Deprecated: ')) {
20+
echo 'LOG: ', $message, "\n";
21+
}
2022
}
2123
}
2224
}
@@ -34,5 +36,5 @@ Exception {%S
3436
#message: "foo"
3537
#code: 0
3638
#file: "%s"
37-
#line: 25
39+
#line: 27
3840
}

0 commit comments

Comments
 (0)