Merge remote-tracking branch 'mainline/develop' into develop

Author: Bogdan Padalko

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php

@@ -22,7 +22,7 @@ public function execute()
                     $notificationId
                 );
                 $this->messageManager->addSuccess(__('The message has been marked as Read.'));
-            } catch (\Magento\Framework\Model\Exception $e) {
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addException(

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php

@@ -27,7 +27,7 @@ public function execute()
                 $this->messageManager->addSuccess(
                     __('A total of %1 record(s) have been marked as Read.', count($ids))
                 );
-            } catch (\Magento\Framework\Model\Exception $e) {
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addException(

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

@@ -25,7 +25,7 @@ public function execute()
                     }
                 }
                 $this->messageManager->addSuccess(__('Total of %1 record(s) have been removed.', count($ids)));
-            } catch (\Magento\Framework\Model\Exception $e) {
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php

@@ -24,7 +24,7 @@ public function execute()
             try {
                 $model->setIsRemove(1)->save();
                 $this->messageManager->addSuccess(__('The message has been removed.'));
-            } catch (\Magento\Framework\Model\Exception $e) {
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));

app/code/Magento/AdminNotification/Model/Inbox.php

@@ -107,13 +107,13 @@ public function parse(array $data)
      * @param string|string[] $description
      * @param string $url
      * @param bool $isInternal
-     * @throws \Magento\Framework\Model\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @return $this
      */
     public function add($severity, $title, $description, $url = '', $isInternal = true)
     {
         if (!$this->getSeverities($severity)) {
-            throw new \Magento\Framework\Model\Exception(__('Wrong message type'));
+            throw new \Magento\Framework\Exception\LocalizedException(__('Wrong message type'));
         }
         if (is_array($description)) {
             $description = '<ul><li>' . implode('</li><li>', $description) . '</li></ul>';

app/code/Magento/AdminNotification/Model/NotificationService.php

@@ -30,14 +30,14 @@ public function __construct(\Magento\AdminNotification\Model\InboxFactory $notif
      *
      * @param int $notificationId
      * @return void
-     * @throws \Magento\Framework\Model\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function markAsRead($notificationId)
     {
         $notification = $this->_notificationFactory->create();
         $notification->load($notificationId);
         if (!$notification->getId()) {
-            throw new \Magento\Framework\Model\Exception('Wrong notification ID specified.');
+            throw new \Magento\Framework\Exception\LocalizedException(__('Wrong notification ID specified.'));
         }
         $notification->setIsRead(1);
         $notification->save();

app/code/Magento/Authorization/Model/Acl/AclRetriever.php

@@ -83,7 +83,7 @@ public function getAllowedResourcesByUser($userType, $userId)
         } catch (\Exception $e) {
             $this->logger->critical($e);
             throw new LocalizedException(
-                'Error happened while getting a list of allowed resources. Check exception log for details.'
+                __('Error happened while getting a list of allowed resources. Check exception log for details.')
             );
         }
         return $allowedResources;

app/code/Magento/Authorization/Model/Resource/Rules.php

@@ -73,7 +73,7 @@ protected function _construct()
      *
      * @param \Magento\Authorization\Model\Rules $rule
      * @return void
-     * @throws \Magento\Framework\Model\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function saveRel(\Magento\Authorization\Model\Rules $rule)
     {
@@ -115,7 +115,7 @@ public function saveRel(\Magento\Authorization\Model\Rules $rule)
 
             $adapter->commit();
             $this->_aclCache->clean();
-        } catch (\Magento\Framework\Model\Exception $e) {
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $adapter->rollBack();
             throw $e;
         } catch (\Exception $e) {

app/code/Magento/Backend/App/Action/Plugin/Authentication.php

@@ -1,11 +1,12 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Backend\App\Action\Plugin;
 
+use Magento\Framework\Exception\AuthenticationException;
+
 class Authentication
 {
     /**
@@ -167,7 +168,7 @@ protected function _performLogin(\Magento\Framework\App\RequestInterface $reques
 
         try {
             $this->_auth->login($username, $password);
-        } catch (\Magento\Backend\Model\Auth\Exception $e) {
+        } catch (AuthenticationException $e) {
             if (!$request->getParam('messageSent')) {
                 $this->messageManager->addError($e->getMessage());
                 $request->setParam('messageSent', true);

app/code/Magento/Backend/Block/Widget/Grid.php

@@ -217,13 +217,15 @@ public function getColumnSet()
     /**
      * Retrieve export block
      *
-     * @throws \Magento\Framework\Model\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\View\Element\AbstractBlock|bool
      */
     public function getExportBlock()
     {
         if (!$this->getChildBlock('grid.export')) {
-            throw new \Magento\Framework\Model\Exception('Export block for grid ' . $this->getNameInLayout() . ' is not defined');
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Export block for grid %1 is not defined', $this->getNameInLayout())
+            );
         }
         return $this->getChildBlock('grid.export');
     }