MAGETWO-34920: Catch all exceptions inside of Phrase::__toString() method and log messages

Author: Yuri Kovsher

lib/internal/Magento/Framework/Phrase.php

@@ -103,7 +103,11 @@ public function render()
      */
     public function __toString()
     {
-        return $this->render();
+        try {
+            return $this->render();
+        } catch (\Exception $e) {
+            return $this->getText();
+        }
     }
 
     /**

lib/internal/Magento/Framework/Test/Unit/PhraseTest.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Test\Unit;
 
-use \Magento\Framework\Phrase;
+use Magento\Framework\Phrase;
 
 class PhraseTest extends \PHPUnit_Framework_TestCase
 {
@@ -124,4 +124,17 @@ public function testGetArguments()
         $this->assertEquals([], $phrase1->getArguments());
         $this->assertEquals($arguments, $phrase2->getArguments());
     }
+
+    public function testToStringWithExceptionOnRender()
+    {
+        $text = 'raw text';
+        $exception = new \Exception('something went wrong');
+        $phrase = new Phrase($text);
+
+        $this->rendererMock->expects($this->any())
+            ->method('render')
+            ->willThrowException($exception);
+
+        $this->assertEquals($text, (string)$phrase);
+    }
 }