Skip to content

Commit 76a7e7d

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 868abab + 60a2f17 commit 76a7e7d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Routing/DelegatingLoader.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ public function load($resource, $type = null)
7777
} catch (\Exception $e) {
7878
$this->loading = false;
7979
throw $e;
80+
} catch (\Throwable $e) {
81+
$this->loading = false;
82+
throw $e;
8083
}
8184

8285
$this->loading = false;
@@ -85,7 +88,7 @@ public function load($resource, $type = null)
8588
if ($controller = $route->getDefault('_controller')) {
8689
try {
8790
$controller = $this->parser->parse($controller);
88-
} catch (\Exception $e) {
91+
} catch (\InvalidArgumentException $e) {
8992
// unable to optimize unknown notation
9093
}
9194

0 commit comments

Comments
 (0)