Merge remote-tracking branch 'm2origin/develop' into pr7

Conflicts:
	composer.lock

Author: Volodymyr klymenko

CHANGELOG.md

@@ -112,7 +112,7 @@
     * Fixed an issue where first store could not be selected on frontend
     * Fixed an issue with performance toolkit category creation
     * Fixed an issue when columns 'Interval', 'Price Rule' had incorrect values in Coupon Usage report
-    * Fixed an issue where fatal error occured on Abandoned Carts report grid
+    * Fixed an issue where fatal error occurred on Abandoned Carts report grid
     * Fixed an issue where it was not possible to add product to shopping cart if Use Secure URLs in Frontend = Yes
     * Fixed an issue where email was not required during Guest Checkout 
     * Fixed broken ability to skip reindex in `bin/magento setup:performance:generate-fixtures` command
@@ -2699,7 +2699,7 @@
   * Fixed an issue with status and visibility settings of a related product on the backend
   * Fixed an issue with unused DB indexes, which used resources, but did not contribute to higher performance
   * Fixed an issue where it was possible to create a downloadable product without specifying a link or a file
-  * Fixed an issue where a fatal error occured when opening a fixed bundle product with custom options page on the frontend
+  * Fixed an issue where a fatal error occurred when opening a fixed bundle product with custom options page on the frontend
   * Fixed an issue where the was a wrong config key for backend cataloginventory
 * Processed GitHub requests:
   * [#548] (https://github.com/magento/magento2/issues/548) -- Console installer doesn't checks filesystem permissions

app/code/Magento/Backend/App/ConfigInterface.php

@@ -17,6 +17,7 @@ interface ConfigInterface
      *
      * @param string $path
      * @return mixed
+     * @api
      */
     public function getValue($path);
 
@@ -26,6 +27,7 @@ public function getValue($path);
      * @param string $path
      * @param mixed $value
      * @return void
+     * @api
      */
     public function setValue($path, $value);
 
@@ -34,6 +36,7 @@ public function setValue($path, $value);
      *
      * @param string $path
      * @return bool
+     * @api
      */
     public function isSetFlag($path);
 }

app/code/Magento/Backend/Block/Widget/Button/ContextInterface.php

@@ -13,6 +13,7 @@ interface ContextInterface
      *
      * @param \Magento\Backend\Block\Widget\Button\Item $item
      * @return bool
+     * @api
      */
     public function canRender(\Magento\Backend\Block\Widget\Button\Item $item);
 }

app/code/Magento/Backend/Block/Widget/Button/ToolbarInterface.php

@@ -14,6 +14,7 @@ interface ToolbarInterface
      * @param \Magento\Framework\View\Element\AbstractBlock $context
      * @param \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
      * @return void
+     * @api
      */
     public function pushButtons(
         \Magento\Framework\View\Element\AbstractBlock $context,

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/FilterInterface.php

@@ -16,17 +16,20 @@ interface FilterInterface
 {
     /**
      * @return Column
+     * @api
      */
     public function getColumn();
 
     /**
      * @param Column $column
      * @return AbstractFilter
+     * @api
      */
     public function setColumn($column);
 
     /**
      * @return string
+     * @api
      */
     public function getHtml();
 }

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/RendererInterface.php

@@ -20,6 +20,7 @@ interface RendererInterface
      * @param Column $column
      * @return void
      * @abstract
+     * @api
      */
     public function setColumn($column);
 
@@ -28,6 +29,7 @@ public function setColumn($column);
      *
      * @abstract
      * @return void
+     * @api
      */
     public function getColumn();
 
@@ -36,6 +38,7 @@ public function getColumn();
      *
      * @param \Magento\Framework\Object $row
      * @return string
+     * @api
      */
     public function render(\Magento\Framework\Object $row);
 }

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

@@ -11,13 +11,15 @@ interface ExportInterface
      * Retrieve grid export types
      *
      * @return array|bool
+     * @api
      */
     public function getExportTypes();
 
     /**
      * Retrieve grid id
      *
      * @return string
+     * @api
      */
     public function getId();
 
@@ -43,20 +45,23 @@ public function addExportType($url, $label);
      * Return array with keys type and value
      *
      * @return array
+     * @api
      */
     public function getCsvFile();
 
     /**
      * Retrieve Grid data as CSV
      *
      * @return string
+     * @api
      */
     public function getCsv();
 
     /**
      * Retrieve data in xml
      *
      * @return string
+     * @api
      */
     public function getXml();
 
@@ -67,13 +72,15 @@ public function getXml();
      *
      * @param string $sheetName
      * @return array
+     * @api
      */
     public function getExcelFile($sheetName = '');
 
     /**
      * Retrieve grid data as MS Excel 2003 XML Document
      *
      * @return string
+     * @api
      */
     public function getExcel();
 }

app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item/Additional/AdditionalInterface.php

@@ -15,6 +15,7 @@ interface AdditionalInterface
     /**
      * @param array $configuration
      * @return $this
+     * @api
      */
     public function createFromConfiguration(array $configuration);
 }

app/code/Magento/Backend/Block/Widget/Tab/TabInterface.php

@@ -17,27 +17,31 @@ interface TabInterface
      * Return Tab label
      *
      * @return string
+     * @api
      */
     public function getTabLabel();
 
     /**
      * Return Tab title
      *
      * @return string
+     * @api
      */
     public function getTabTitle();
 
     /**
      * Can show tab in tabs
      *
      * @return boolean
+     * @api
      */
     public function canShowTab();
 
     /**
      * Tab is hidden
      *
      * @return boolean
+     * @api
      */
     public function isHidden();
 }

app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php

@@ -7,32 +7,29 @@
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Controller\ResultFactory;
 
 class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache
 {
     /**
      * Clean JS/css files cache
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @throws LocalizedException
      */
     public function execute()
     {
-        $this->_objectManager->create('Magento\Catalog\Model\Product\Image')->clearCache();
-        $this->_eventManager->dispatch('clean_catalog_images_cache_after');
-        $this->messageManager->addSuccess(__('The image cache was cleaned.'));
+        try {
+            $this->_objectManager->create('Magento\Catalog\Model\Product\Image')->clearCache();
+            $this->_eventManager->dispatch('clean_catalog_images_cache_after');
+            $this->messageManager->addSuccess(__('The image cache was cleaned.'));
+        } catch (LocalizedException $e) {
+            $this->messageManager->addError($e->getMessage());
+        } catch (\Exception $e) {
+            $this->messageManager->addException($e, __('An error occurred while clearing the image cache.'));
+        }
 
-        return $this->getDefaultResult();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\Backend\Model\View\Result\Redirect
-     */
-    public function getDefaultResult()
-    {
-        $resultRedirect = $this->resultRedirectFactory->create();
+        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         return $resultRedirect->setPath('adminhtml/*');
     }
 }

app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php

@@ -7,32 +7,29 @@
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Controller\ResultFactory;
 
 class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache
 {
     /**
      * Clean JS/css files cache
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @throws LocalizedException
      */
     public function execute()
     {
-        $this->_objectManager->get('Magento\Framework\View\Asset\MergeService')->cleanMergedJsCss();
-        $this->_eventManager->dispatch('clean_media_cache_after');
-        $this->messageManager->addSuccess(__('The JavaScript/CSS cache has been cleaned.'));
+        try {
+            $this->_objectManager->get('Magento\Framework\View\Asset\MergeService')->cleanMergedJsCss();
+            $this->_eventManager->dispatch('clean_media_cache_after');
+            $this->messageManager->addSuccess(__('The JavaScript/CSS cache has been cleaned.'));
+        } catch (LocalizedException $e) {
+            $this->messageManager->addError($e->getMessage());
+        } catch (\Exception $e) {
+            $this->messageManager->addException($e, __('An error occurred while clearing the JavaScript/CSS cache.'));
+        }
 
-        return $this->getDefaultResult();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\Backend\Model\View\Result\Redirect
-     */
-    public function getDefaultResult()
-    {
-        $resultRedirect = $this->resultRedirectFactory->create();
+        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         return $resultRedirect->setPath('adminhtml/*');
     }
 }

app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php

@@ -7,46 +7,43 @@
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Controller\ResultFactory;
 
 class MassDisable extends \Magento\Backend\Controller\Adminhtml\Cache
 {
     /**
      * Mass action for cache disabling
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @throws \Magento\Framework\Exception\LocalizedException|\Exception
      */
     public function execute()
     {
-        $types = $this->getRequest()->getParam('types');
-        $updatedTypes = 0;
-        if (!is_array($types)) {
-            $types = [];
-        }
-        $this->_validateTypes($types);
-        foreach ($types as $code) {
-            if ($this->_cacheState->isEnabled($code)) {
-                $this->_cacheState->setEnabled($code, false);
-                $updatedTypes++;
+        try {
+            $types = $this->getRequest()->getParam('types');
+            $updatedTypes = 0;
+            if (!is_array($types)) {
+                $types = [];
             }
-            $this->_cacheTypeList->cleanType($code);
-        }
-        if ($updatedTypes > 0) {
-            $this->_cacheState->persist();
-            $this->messageManager->addSuccess(__("%1 cache type(s) disabled.", $updatedTypes));
+            $this->_validateTypes($types);
+            foreach ($types as $code) {
+                if ($this->_cacheState->isEnabled($code)) {
+                    $this->_cacheState->setEnabled($code, false);
+                    $updatedTypes++;
+                }
+                $this->_cacheTypeList->cleanType($code);
+            }
+            if ($updatedTypes > 0) {
+                $this->_cacheState->persist();
+                $this->messageManager->addSuccess(__("%1 cache type(s) disabled.", $updatedTypes));
+            }
+        } catch (LocalizedException $e) {
+            $this->messageManager->addError($e->getMessage());
+        } catch (\Exception $e) {
+            $this->messageManager->addException($e, __('An error occurred while disabling cache.'));
         }
 
-        return $this->getDefaultResult();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\Backend\Model\View\Result\Redirect
-     */
-    public function getDefaultResult()
-    {
-        $resultRedirect = $this->resultRedirectFactory->create();
+        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         return $resultRedirect->setPath('adminhtml/*');
     }
 }