diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch \Throwable

Browse Source
This commit is contained in:
Filip Procházka 2016-05-12 17:11:08 +02:00
parent 7e59c71d9a
commit 103526b40f
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Debug/DebugClassLoader.php
View File

@ -175,6 +175,10 @@ class DebugClassLoader
} catch (\Exception $e) {
ErrorHandler::unstackErrors();
throw $e;
} catch (\Throwable $e) {
ErrorHandler::unstackErrors();
throw $e;
}

6
src/Symfony/Component/Debug/ErrorHandler.php
View File

@ -447,6 +447,10 @@ class ErrorHandler
} catch (\Exception $e) {
$this->isRecursive = false;
throw $e;
} catch (\Throwable $e) {
$this->isRecursive = false;
throw $e;
}
}
@ -555,6 +559,8 @@ class ErrorHandler
}
} catch (\Exception $exception) {
// Handled below
} catch (\Throwable $exception) {
// Handled below
}
if ($error && $error['type'] &= E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR) {

6
src/Symfony/Component/OptionsResolver/OptionsResolver.php
View File

@ -861,6 +861,9 @@ class OptionsResolver implements Options, OptionsResolverInterface
} 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 @@ class OptionsResolver implements Options, OptionsResolverInterface
} catch (\Exception $e) {
unset($this->calling[$option]);
throw $e;
} catch (\Throwable $e) {
unset($this->calling[$option]);
throw $e;
}
unset($this->calling[$option]);
// END

2
src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
View File

@ -141,6 +141,8 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
$this->dumpLine(-1);
} catch (\Exception $exception) {
// Re-thrown below
} catch (\Throwable $exception) {
// Re-thrown below
}
if ($output) {
$this->setOutput($prevOutput);