Skip to content

Commit 74815b6

Browse files
committed
Merge branch '2.3' into 2.7
* 2.3: updated VERSION for 2.3.42 update CONTRIBUTORS for 2.3.42 updated CHANGELOG for 2.3.42 Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)" Partial revert of previous PR [DependencyInjection] Skip deep reference check for 'service_container' Catch \Throwable [Serializer] Add missing @throws annotations Fix for #18843 force enabling the external XML entity loaders Removed UTC specification with timestamp
2 parents 04b459a + 16a645c commit 74815b6

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

Loader/FileLoader.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
113113
} catch (\Exception $e) {
114114
unset(self::$loading[$resource]);
115115
throw $e;
116+
} catch (\Throwable $e) {
117+
unset(self::$loading[$resource]);
118+
throw $e;
116119
}
117120

118121
unset(self::$loading[$resource]);

0 commit comments

Comments
 (0)