Skip to content
This repository was archived by the owner on Dec 9, 2023. It is now read-only.

Commit 2a1b327

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [Yaml] fix exception contexts People - person singularization [Yaml] properly handle unindented collections [Serializer] Add test for ignored attributes during denormalization chomp newlines only at the end of YAML documents Fixed server status command when port has been omitted Update UPGRADE FROM 2.x to 3.0 Catch \Throwable Use levenshtein level for better Bundle matching [WebProfilerBundle] Fix CORS ajax security issues
2 parents d8009e5 + dfaa39d commit 2a1b327

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

DebugClassLoader.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,10 @@ public function loadClass($class)
175175
} catch (\Exception $e) {
176176
ErrorHandler::unstackErrors();
177177

178+
throw $e;
179+
} catch (\Throwable $e) {
180+
ErrorHandler::unstackErrors();
181+
178182
throw $e;
179183
}
180184

ErrorHandler.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,10 @@ public function handleError($type, $message, $file, $line, array $context, array
517517
} catch (\Exception $e) {
518518
$this->isRecursive = false;
519519

520+
throw $e;
521+
} catch (\Throwable $e) {
522+
$this->isRecursive = false;
523+
520524
throw $e;
521525
}
522526
}
@@ -625,6 +629,8 @@ public static function handleFatalError(array $error = null)
625629
}
626630
} catch (\Exception $exception) {
627631
// Handled below
632+
} catch (\Throwable $exception) {
633+
// Handled below
628634
}
629635

630636
if ($error && $error['type'] &= E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR) {

0 commit comments

Comments
 (0)