Skip to content

Commit ddad0be

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 5e4a8ee + 07faec3 commit ddad0be

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

OptionsResolver.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,9 @@ public function offsetGet($option)
861861
} catch (\Exception $e) {
862862
unset($this->calling[$option]);
863863
throw $e;
864+
} catch (\Throwable $e) {
865+
unset($this->calling[$option]);
866+
throw $e;
864867
}
865868
unset($this->calling[$option]);
866869
// END
@@ -963,6 +966,9 @@ public function offsetGet($option)
963966
} catch (\Exception $e) {
964967
unset($this->calling[$option]);
965968
throw $e;
969+
} catch (\Throwable $e) {
970+
unset($this->calling[$option]);
971+
throw $e;
966972
}
967973
unset($this->calling[$option]);
968974
// END

0 commit comments

Comments
 (0)