Merge remote-tracking branch 'tango-ce/MAGETWO-36563' into MAGETWO-37436

Author: Yuri Kovsher

app/code/Magento/Developer/Model/View/Layout/Plugin.php

@@ -10,9 +10,6 @@
     <type name="Magento\Framework\View\TemplateEngineFactory">
         <plugin name="debug_hints" type="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints" sortOrder="10"/>
     </type>
-    <type name="Magento\Framework\View\Layout">
-        <plugin name="exception_handler" type="Magento\Developer\Model\View\Layout\Plugin" sortOrder="10"/>
-    </type>
     <type name="Magento\Framework\View\Result\Page">
         <arguments>
             <argument name="pageConfigRendererFactory" xsi:type="object">Magento\Developer\Model\View\Page\Config\RendererFactory</argument>

app/code/Magento/Developer/etc/di.xml

@@ -14,7 +14,7 @@ class ProductTest extends \Magento\TestFramework\TestCase\AbstractController
     public function testListActionDesign($productId, $expectedDesign)
     {
         $this->getRequest()->setParam('id', $productId);
-        $this->dispatch('review/product/list');
+        $this->dispatch('review/product/listAction');
         $result = $this->getResponse()->getBody();
         $this->assertContains("static/frontend/{$expectedDesign}/en_US/Magento_Theme/favicon.ico", $result);
     }

dev/tests/integration/testsuite/Magento/Review/Controller/ProductTest.php

@@ -10,6 +10,9 @@
 use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
 use Magento\Framework\View\Layout\Element;
 use Magento\Framework\View\Layout\ScheduledStructure;
+use Magento\Framework\App\State as AppState;
+use Psr\Log\LoggerInterface as Logger;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Layout model
@@ -152,6 +155,16 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      */
     protected $readerContext;
 
+    /**
+     * @var \Magento\Framework\App\State
+     */
+    protected $appState;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    protected $logger;
+
     /**
      * @param Layout\ProcessorFactory $processorFactory
      * @param ManagerInterface $eventManager
@@ -163,6 +176,8 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * @param FrontendInterface $cache
      * @param Layout\Reader\ContextFactory $readerContextFactory
      * @param Layout\Generator\ContextFactory $generatorContextFactory
+     * @param \Magento\Framework\App\State $appState
+     * @param \Psr\Log\LoggerInterface $logger
      * @param bool $cacheable
      */
     public function __construct(
@@ -176,6 +191,8 @@ public function __construct(
         FrontendInterface $cache,
         Layout\Reader\ContextFactory $readerContextFactory,
         Layout\Generator\ContextFactory $generatorContextFactory,
+        AppState $appState,
+        Logger $logger,
         $cacheable = true
     ) {
         $this->_elementClass = 'Magento\Framework\View\Layout\Element';
@@ -190,9 +207,10 @@ public function __construct(
         $this->generatorPool = $generatorPool;
         $this->cacheable = $cacheable;
         $this->cache = $cache;
-
         $this->readerContextFactory = $readerContextFactory;
         $this->generatorContextFactory = $generatorContextFactory;
+        $this->appState = $appState;
+        $this->logger = $logger;
     }
 
     /**
@@ -467,15 +485,25 @@ public function renderElement($name, $useCache = true)
      *
      * @param string $name
      * @return string
+     * @throws \Exception
      */
     public function renderNonCachedElement($name)
     {
-        if ($this->isUiComponent($name)) {
-            $result = $this->_renderUiComponent($name);
-        } elseif ($this->isBlock($name)) {
-            $result = $this->_renderBlock($name);
-        } else {
-            $result = $this->_renderContainer($name);
+        $result = '';
+        try {
+            if ($this->isUiComponent($name)) {
+                $result = $this->_renderUiComponent($name);
+            } elseif ($this->isBlock($name)) {
+                $result = $this->_renderBlock($name);
+            } else {
+                $result = $this->_renderContainer($name);
+            }
+        } catch (\Exception $e) {
+            if ($this->appState->getMode() === AppState::MODE_DEVELOPER) {
+                throw $e;
+            }
+            $message = ($e instanceof LocalizedException) ? $e->getLogMessage() : $e->getMessage();
+            $this->logger->critical($message);
         }
         return $result;
     }

lib/internal/Magento/Framework/View/Layout.php

@@ -86,6 +86,16 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
      */
     protected $generatorContextFactoryMock;
 
+    /**
+     * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $appStateMock;
+
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $loggerMock;
+
     protected function setUp()
     {
         $this->structureMock = $this->getMockBuilder('Magento\Framework\View\Layout\Data\Structure')
@@ -136,8 +146,14 @@ protected function setUp()
             ->getMock();
         $this->generatorContextFactoryMock = $this->getMockBuilder(
             'Magento\Framework\View\Layout\Generator\ContextFactory'
-        )->disableOriginalConstructor()
-        ->getMock();
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->appStateMock = $this->getMockBuilder('Magento\Framework\App\State')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->loggerMock = $this->getMockBuilder('Psr\Log\LoggerInterface')
+            ->getMock();
 
         $this->model = new \Magento\Framework\View\Layout(
             $this->processorFactoryMock,
@@ -150,6 +166,8 @@ protected function setUp()
             $this->cacheMock,
             $this->readerContextFactoryMock,
             $this->generatorContextFactoryMock,
+            $this->appStateMock,
+            $this->loggerMock,
             true
         );
     }