Merge remote-tracking branch 'origin/MC-33069' into 2.4-develop-php74-pr41

zakdma · zakdma · commit 796f90b05b08 · 2020-05-06T18:43:45.000+03:00
diff --git a/lib/internal/Magento/Framework/Phrase.php b/lib/internal/Magento/Framework/Phrase.php
@@ -101,9 +101,7 @@ public function render()
     {
         try {
             return self::getRenderer()->render([$this->text], $this->getArguments());
-        } catch (\Error $e) {
-            return $this->getText();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return $this->getText();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,7 @@ public function render()`
`101`	`101`	`{`
`102`	`102`	`try {`
`103`	`103`	`return self::getRenderer()->render([$this->text], $this->getArguments());`
`104`		`- } catch (\Error $e) {`
`105`		`- return $this->getText();`
`106`		`- } catch (\Exception $e) {`
	`104`	`+ } catch (\Throwable $e) {`
`107`	`105`	`return $this->getText();`
`108`	`106`	`}`
`109`	`107`	`}`