Config: catch Throwable

fprochazka · fprochazka · commit 489f8ac742ea · 2016-05-12T19:32:43.000+02:00
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -311,6 +311,8 @@ final public function finalize($value)
                 throw $e;
             } catch (\Exception $e) {
                 throw new InvalidConfigurationException(sprintf('Invalid configuration for path "%s": %s', $this->getPath(), $e->getMessage()), $e->getCode(), $e);
+            } catch (\Throwable $e) {
+                throw new InvalidConfigurationException(sprintf('Invalid configuration for path "%s": %s', $this->getPath(), $e->getMessage()), $e->getCode(), $e);
             }
         }
 
diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
@@ -130,6 +130,10 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
                     throw $e;
                 }
 
+                throw new FileLoaderLoadException($resource, $sourceResource, null, $e);
+            }
+        } catch (\Throwable $e) {
+            if (!$ignoreErrors) {
                 throw new FileLoaderLoadException($resource, $sourceResource, null, $e);
             }
         }
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -78,6 +78,8 @@ public static function loadFile($file, $schemaOrCallable = null)
                     $valid = call_user_func($schemaOrCallable, $dom, $internalErrors);
                 } catch (\Exception $e) {
                     $valid = false;
+                } catch (\Throwable $e) {
+                    $valid = false;
                 }
             } elseif (!is_array($schemaOrCallable) && is_file((string) $schemaOrCallable)) {
                 $schemaSource = file_get_contents((string) $schemaOrCallable);

Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,8 @@ final public function finalize($value)`
`311`	`311`	`throw $e;`
`312`	`312`	`} catch (\Exception $e) {`
`313`	`313`	`throw new InvalidConfigurationException(sprintf('Invalid configuration for path "%s": %s', $this->getPath(), $e->getMessage()), $e->getCode(), $e);`
	`314`	`+ } catch (\Throwable $e) {`
	`315`	`+ throw new InvalidConfigurationException(sprintf('Invalid configuration for path "%s": %s', $this->getPath(), $e->getMessage()), $e->getCode(), $e);`
`314`	`316`	`}`
`315`	`317`	`}`
`316`	`318`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,10 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe`
`130`	`130`	`throw $e;`
`131`	`131`	`}`
`132`	`132`
	`133`	`+ throw new FileLoaderLoadException($resource, $sourceResource, null, $e);`
	`134`	`+ }`
	`135`	`+ } catch (\Throwable $e) {`
	`136`	`+ if (!$ignoreErrors) {`
`133`	`137`	`throw new FileLoaderLoadException($resource, $sourceResource, null, $e);`
`134`	`138`	`}`
`135`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,8 @@ public static function loadFile($file, $schemaOrCallable = null)`
`78`	`78`	`$valid = call_user_func($schemaOrCallable, $dom, $internalErrors);`
`79`	`79`	`} catch (\Exception $e) {`
`80`	`80`	`$valid = false;`
	`81`	`+ } catch (\Throwable $e) {`
	`82`	`+ $valid = false;`
`81`	`83`	`}`
`82`	`84`	`} elseif (!is_array($schemaOrCallable) && is_file((string) $schemaOrCallable)) {`
`83`	`85`	`$schemaSource = file_get_contents((string) $schemaOrCallable);`