From 103526b40f6cfc46ad2f627e4e19c8f02cc08276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Proch=C3=A1zka?= <filip@prochazka.su>
Date: Thu, 12 May 2016 17:11:08 +0200
Subject: [PATCH] Catch \Throwable

---
 src/Symfony/Component/Debug/DebugClassLoader.php          | 4 ++++
 src/Symfony/Component/Debug/ErrorHandler.php              | 6 ++++++
 src/Symfony/Component/OptionsResolver/OptionsResolver.php | 6 ++++++
 src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php | 2 ++
 4 files changed, 18 insertions(+)

diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
index 36afa369301b2..603c814b569ea 100644
--- a/src/Symfony/Component/Debug/DebugClassLoader.php
+++ b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -175,6 +175,10 @@ public function loadClass($class)
         } catch (\Exception $e) {
             ErrorHandler::unstackErrors();
 
+            throw $e;
+        } catch (\Throwable $e) {
+            ErrorHandler::unstackErrors();
+
             throw $e;
         }
 
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
index 33779af3251e7..9c30ffea4461a 100644
--- a/src/Symfony/Component/Debug/ErrorHandler.php
+++ b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -447,6 +447,10 @@ public function handleError($type, $message, $file, $line, array $context, array
             } catch (\Exception $e) {
                 $this->isRecursive = false;
 
+                throw $e;
+            } catch (\Throwable $e) {
+                $this->isRecursive = false;
+
                 throw $e;
             }
         }
@@ -555,6 +559,8 @@ public static function handleFatalError(array $error = null)
             }
         } catch (\Exception $exception) {
             // Handled below
+        } catch (\Throwable $exception) {
+            // Handled below
         }
 
         if ($error && $error['type'] &= E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR) {
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
index e0578af71781d..bc763202f228a 100644
--- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -861,6 +861,9 @@ public function offsetGet($option)
             } catch (\Exception $e) {
                 unset($this->calling[$option]);
                 throw $e;
+            } catch (\Throwable $e) {
+                unset($this->calling[$option]);
+                throw $e;
             }
             unset($this->calling[$option]);
             // END
@@ -963,6 +966,9 @@ public function offsetGet($option)
             } catch (\Exception $e) {
                 unset($this->calling[$option]);
                 throw $e;
+            } catch (\Throwable $e) {
+                unset($this->calling[$option]);
+                throw $e;
             }
             unset($this->calling[$option]);
             // END
diff --git a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
index cc4b2ef498974..1035bd70c292f 100644
--- a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
@@ -141,6 +141,8 @@ public function dump(Data $data, $output = null)
             $this->dumpLine(-1);
         } catch (\Exception $exception) {
             // Re-thrown below
+        } catch (\Throwable $exception) {
+            // Re-thrown below
         }
         if ($output) {
             $this->setOutput($prevOutput);