MAGETWO-34988: Implement exception handling in dispatch() method

Author: vpaladiychuk

lib/internal/Magento/Framework/App/FrontController.php

@@ -14,12 +14,41 @@ class FrontController implements FrontControllerInterface
      */
     protected $_routerList;
 
+    /**
+     * Application state
+     *
+     * @var State
+     */
+    protected $appState;
+
+    /**
+     * Message manager
+     *
+     * @var \Magento\Framework\Message\ManagerInterface
+     */
+    protected $messageManager;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    protected $logger;
+
     /**
      * @param RouterList $routerList
+     * @param State $appState
+     * @param \Magento\Framework\Message\ManagerInterface $messageManager
+     * @param \Psr\Log\LoggerInterface $logger
      */
-    public function __construct(RouterList $routerList)
-    {
+    public function __construct(
+        RouterList $routerList,
+        State $appState,
+        \Magento\Framework\Message\ManagerInterface $messageManager,
+        \Psr\Log\LoggerInterface $logger
+    ) {
         $this->_routerList = $routerList;
+        $this->appState = $appState;
+        $this->messageManager = $messageManager;
+        $this->logger = $logger;
     }
 
     /**
@@ -50,6 +79,16 @@ public function dispatch(RequestInterface $request)
                     $request->setActionName('noroute');
                     $request->setDispatched(false);
                     break;
+                } catch (\Magento\Framework\LocalizedException $e) {
+                    $result = $this->handleException($e, $actionInstance, $e->getMessage());
+                    break;
+                } catch (\Exception $e) {
+                    // @todo Message should be clarified
+                    $message = $this->appState->getMode() == State::MODE_DEVELOPER
+                        ? $e->getMessage()
+                        : (string)__('An error occurred while processing your request');
+                    $result = $this->handleException($e, $actionInstance, $message);
+                    break;
                 }
             }
         }
@@ -59,4 +98,19 @@ public function dispatch(RequestInterface $request)
         }
         return $result;
     }
+
+    /**
+     * Handle exception
+     *
+     * @param \Exception $e
+     * @param \Magento\Framework\App\ActionInterface $actionInstance
+     * @param string $message
+     * @return \Magento\Framework\Controller\Result\Redirect
+     */
+    protected function handleException($e, $actionInstance, $message)
+    {
+        $this->messageManager->addError($message);
+        $this->logger->critical($e->getMessage());
+        return $actionInstance->getDefaultRedirect();
+    }
 }

lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php

@@ -38,7 +38,8 @@ protected function setUp()
 
         $this->router = $this->getMock('Magento\Framework\App\RouterInterface');
         $this->routerList = $this->getMock('Magento\Framework\App\RouterList', [], [], '', false);
-        $this->model = new \Magento\Framework\App\FrontController($this->routerList);
+        $this->model = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
+            ->getObject('Magento\Framework\App\FrontController', ['routerList' => $this->routerList]);
     }
 
     /**