Catch \Throwable

fprochazka · nicolas-grekas · commit 893cf00a52ed · 2016-05-30T10:14:41.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
@@ -77,6 +77,9 @@ public function load($resource, $type = null)
         } catch (\Exception $e) {
             $this->loading = false;
             throw $e;
+        } catch (\Throwable $e) {
+            $this->loading = false;
+            throw $e;
         }
 
         $this->loading = false;
@@ -85,7 +88,7 @@ public function load($resource, $type = null)
             if ($controller = $route->getDefault('_controller')) {
                 try {
                     $controller = $this->parser->parse($controller);
-                } catch (\Exception $e) {
+                } catch (\InvalidArgumentException $e) {
                     // unable to optimize unknown notation
                 }
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -18,6 +18,7 @@
 use Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\WebProfilerBundle\Profiler\TemplateManager;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
@@ -193,8 +194,8 @@ public function toolbarAction(Request $request, $token)
         $url = null;
         try {
             $url = $this->generator->generate('_profiler', array('token' => $token));
-        } catch (\Exception $e) {
-            // the profiler is not enabled
+        } catch (RouteNotFoundException $e) {
+            // the named route doesn't exist => the profiler is not enabled
         }
 
         return new Response($this->twig->render('@WebProfiler/Profiler/toolbar.html.twig', array(
diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
@@ -108,6 +108,9 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
             } catch (\Exception $e) {
                 unset(self::$loading[$resource]);
                 throw $e;
+            } catch (\Throwable $e) {
+                unset(self::$loading[$resource]);
+                throw $e;
             }
 
             unset(self::$loading[$resource]);
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -320,6 +320,11 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
                     return;
                 }
 
+                throw $e;
+            } catch (\Throwable $e) {
+                unset($this->loading[$id]);
+                unset($this->services[$id]);
+
                 throw $e;
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -461,6 +461,10 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV
                 return;
             }
 
+            throw $e;
+        } catch (\Throwable $e) {
+            unset($this->loading[$id]);
+
             throw $e;
         }
 
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
@@ -64,6 +64,11 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
             $this->container->set('request', null, 'request');
             $this->container->leaveScope('request');
 
+            throw $e;
+        } catch (\Throwable $e) {
+            $this->container->set('request', null, 'request');
+            $this->container->leaveScope('request');
+
             throw $e;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,9 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe`
`108`	`108`	`} catch (\Exception $e) {`
`109`	`109`	`unset(self::$loading[$resource]);`
`110`	`110`	`throw $e;`
	`111`	`+ } catch (\Throwable $e) {`
	`112`	`+ unset(self::$loading[$resource]);`
	`113`	`+ throw $e;`
`111`	`114`	`}`
`112`	`115`
`113`	`116`	`unset(self::$loading[$resource]);`
Original file line number	Diff line number	Diff line change
`@@ -320,6 +320,11 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE`
`320`	`320`	`return;`
`321`	`321`	`}`
`322`	`322`
	`323`	`+ throw $e;`
	`324`	`+ } catch (\Throwable $e) {`
	`325`	`+ unset($this->loading[$id]);`
	`326`	`+ unset($this->services[$id]);`
	`327`	`+`
`323`	`328`	`throw $e;`
`324`	`329`	`}`
`325`	`330`
Original file line number	Diff line number	Diff line change
`@@ -461,6 +461,10 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV`
`461`	`461`	`return;`
`462`	`462`	`}`
`463`	`463`
	`464`	`+ throw $e;`
	`465`	`+ } catch (\Throwable $e) {`
	`466`	`+ unset($this->loading[$id]);`
	`467`	`+`
`464`	`468`	`throw $e;`
`465`	`469`	`}`
`466`	`470`