FrameworkBundle: catch Throwable

fprochazka · fprochazka · commit efcd9f8e955e · 2016-05-12T19:32:44.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
@@ -148,6 +148,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             } catch (\Exception $e) {
                 $exitCode = 1;
                 $rows[] = array(sprintf('<fg=red;options=bold>%s</>', '\\' === DIRECTORY_SEPARATOR ? 'ERROR' : "\xE2\x9C\x98" /* HEAVY BALLOT X (U+2718) */), $message, $e->getMessage());
+            } catch (\Throwable $e) {
+                $exitCode = 1;
+                $rows[] = array(sprintf('<fg=red;options=bold>%s</>', '\\' === DIRECTORY_SEPARATOR ? 'ERROR' : "\xE2\x9C\x98" /* HEAVY BALLOT X (U+2718) */), $message, $e->getMessage());
             }
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
@@ -97,6 +97,8 @@ public function load($resource, $type = null)
                     $controller = $this->parser->parse($controller);
                 } catch (\Exception $e) {
                     // unable to optimize unknown notation
+                } catch (\Throwable $e) {
+                    // unable to optimize unknown notation
                 }
 
                 $route->setDefault('_controller', $controller);

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,9 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`148`	`148`	`} catch (\Exception $e) {`
`149`	`149`	`$exitCode = 1;`
`150`	`150`	`$rows[] = array(sprintf('<fg=red;options=bold>%s</>', '\\' === DIRECTORY_SEPARATOR ? 'ERROR' : "\xE2\x9C\x98" /* HEAVY BALLOT X (U+2718) */), $message, $e->getMessage());`
	`151`	`+ } catch (\Throwable $e) {`
	`152`	`+ $exitCode = 1;`
	`153`	`+ $rows[] = array(sprintf('<fg=red;options=bold>%s</>', '\\' === DIRECTORY_SEPARATOR ? 'ERROR' : "\xE2\x9C\x98" /* HEAVY BALLOT X (U+2718) */), $message, $e->getMessage());`
`151`	`154`	`}`
`152`	`155`	`}`
`153`	`156`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,8 @@ public function load($resource, $type = null)`
`97`	`97`	`$controller = $this->parser->parse($controller);`
`98`	`98`	`} catch (\Exception $e) {`
`99`	`99`	`// unable to optimize unknown notation`
	`100`	`+ } catch (\Throwable $e) {`
	`101`	`+ // unable to optimize unknown notation`
`100`	`102`	`}`
`101`	`103`
`102`	`104`	`$route->setDefault('_controller', $controller);`