ENGCOM-4423: Ensure \__toString()\ catches all error types #21545

magento-engcom-team · magento-engcom-team · commit faa3039f194a · 2019-03-02T10:12:22.000-06:00
- Merge Pull Request #21545 from tylerssn/magento2:patch-1 - Merged commits: 1. af86cc6
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
@@ -115,7 +115,7 @@ public function __toString()
             $this->compiler->compile($templateRootElement, $this->component, $this->component);
             $this->appendLayoutConfiguration();
             $result = $this->compiler->postprocessing($this->template->__toString());
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->logger->critical($e->getMessage());
             $result = $e->getMessage();
         }

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public function __toString()`
`115`	`115`	`$this->compiler->compile($templateRootElement, $this->component, $this->component);`
`116`	`116`	`$this->appendLayoutConfiguration();`
`117`	`117`	`$result = $this->compiler->postprocessing($this->template->__toString());`
`118`		`- } catch (\Exception $e) {`
	`118`	`+ } catch (\Throwable $e) {`
`119`	`119`	`$this->logger->critical($e->getMessage());`
`120`	`120`	`$result = $e->getMessage();`
`121`	`121`	`}`