Merge branch '2.3-develop' of https://github.com/magento/magento2ce into EPAM-PR-31

Author: rganin

app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php

@@ -6,7 +6,13 @@
 
 namespace Magento\Backend\Controller\Adminhtml\Dashboard;
 
-class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Reports\Controller\Adminhtml\Report\Statistics;
+
+/**
+ * Refresh Dashboard statistics action.
+ */
+class RefreshStatistics extends Statistics implements HttpPostActionInterface
 {
     /**
      * @param \Magento\Backend\App\Action\Context $context
@@ -25,6 +31,8 @@ public function __construct(
     }
 
     /**
+     * Refresh statistics.
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()

app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php

@@ -431,7 +431,10 @@ protected function _initMessageTemplates()
         );
         $this->_productEntity->addMessageTemplate(
             self::ERROR_INVALID_TYPE,
-            __('Value for \'type\' sub attribute in \'custom_options\' attribute contains incorrect value, acceptable values are: \'dropdown\', \'checkbox\'')
+            __(
+                'Value for \'type\' sub attribute in \'custom_options\' attribute contains incorrect value, acceptable values are: %1',
+                '\''.implode('\', \'', array_keys($this->_specificTypes)).'\''
+            )
         );
         $this->_productEntity->addMessageTemplate(self::ERROR_EMPTY_TITLE, __('Please enter a value for title.'));
         $this->_productEntity->addMessageTemplate(
@@ -629,7 +632,7 @@ public function validateAmbiguousData()
             $this->_addRowsErrors(self::ERROR_AMBIGUOUS_NEW_NAMES, $errorRows);
             return false;
         }
-        if ($this->getBehavior() == \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
+        if ($this->getBehavior() == Import::BEHAVIOR_APPEND) {
             $errorRows = $this->_findOldOptionsWithTheSameTitles();
             if ($errorRows) {
                 $this->_addRowsErrors(self::ERROR_AMBIGUOUS_OLD_NAMES, $errorRows);
@@ -967,11 +970,10 @@ public function validateRow(array $rowData, $rowNumber)
                         return false;
                     }
                 }
-                return true;
             }
         }
 
-        return false;
+        return true;
     }
 
     /**
@@ -1381,7 +1383,7 @@ private function setLastOptionTitle(array &$titles) : void
      */
     private function removeExistingOptions(array $products, array $optionsToRemove): void
     {
-        if ($this->getBehavior() != \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
+        if ($this->getBehavior() != Import::BEHAVIOR_APPEND) {
             $this->_deleteEntities(array_keys($products));
         } elseif (!empty($optionsToRemove)) {
             // Remove options for products with empty "custom_options" row
@@ -2108,7 +2110,7 @@ private function savePreparedCustomOptions(
         array $types
     ): void {
         if ($this->_isReadyForSaving($options, $titles, $types['values'])) {
-            if ($this->getBehavior() == \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
+            if ($this->getBehavior() == Import::BEHAVIOR_APPEND) {
                 $this->_compareOptionsWithExisting($options, $titles, $prices, $types['values']);
                 $this->restoreOriginalOptionTypeIds($types['values'], $types['prices'], $types['titles']);
             }

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php

@@ -702,7 +702,7 @@ public function testValidateRowNoCustomOption()
     {
         $rowData = include __DIR__ . '/_files/row_data_no_custom_option.php';
         $this->_bypassModelMethodGetMultiRowFormat($rowData);
-        $this->assertFalse($this->modelMock->validateRow($rowData, 0));
+        $this->assertTrue($this->modelMock->validateRow($rowData, 0));
     }
 
     /**

app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php

@@ -21,6 +21,7 @@
  *
  * This collection should be refactored to not have dependencies on MySQL-specific implementation.
  *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
@@ -296,7 +297,7 @@ private function getSearchCriteriaBuilder()
     }
 
     /**
-     * Get fielter builder.
+     * Get filter builder.
      *
      * @return FilterBuilder
      */

app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html

@@ -97,7 +97,7 @@
         </div>
     </div>
 
-    <div id="minicart-widgets" class="minicart-widgets">
+    <div id="minicart-widgets" class="minicart-widgets" if="getRegion('promotion').length">
         <each args="getRegion('promotion')" render=""/>
     </div>
 </div>

app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml

@@ -21,7 +21,7 @@ $_height = $block->getImagesHeight();
         data-size="<?= $block->escapeHtmlAttr($file->getSize()) ?>"
         data-mime-type="<?= $block->escapeHtmlAttr($file->getMimeType()) ?>"
     >
-        <p class="nm" style="height:<?= $block->escapeHtmlAttr($_height) ?>px;width:<?= $block->escapeHtmlAttr($_width) ?>px;">
+        <p class="nm" style="height:<?= $block->escapeHtmlAttr($_height) ?>px;">
         <?php if ($block->getFileThumbUrl($file)):?>
             <img src="<?= $block->escapeHtmlAttr($block->getFileThumbUrl($file)) ?>" alt="<?= $block->escapeHtmlAttr($block->getFileName($file)) ?>"/>
         <?php endif; ?>

app/code/Magento/Customer/Block/Adminhtml/Edit/DeleteButton.php

@@ -10,6 +10,7 @@
 
 /**
  * Class DeleteButton
+ *
  * @package Magento\Customer\Block\Adminhtml\Edit
  */
 class DeleteButton extends GenericButton implements ButtonProviderInterface
@@ -36,6 +37,8 @@ public function __construct(
     }
 
     /**
+     * Get button data.
+     *
      * @return array
      */
     public function getButtonData()
@@ -53,12 +56,15 @@ public function getButtonData()
                 ],
                 'on_click' => '',
                 'sort_order' => 20,
+                'aclResource' => 'Magento_Customer::delete',
             ];
         }
         return $data;
     }
 
     /**
+     * Get delete url.
+     *
      * @return string
      */
     public function getDeleteUrl()

app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php

@@ -9,11 +9,14 @@
 
 /**
  * Class InvalidateTokenButton
+ *
  * @package Magento\Customer\Block\Adminhtml\Edit
  */
 class InvalidateTokenButton extends GenericButton implements ButtonProviderInterface
 {
     /**
+     * Get button data.
+     *
      * @return array
      */
     public function getButtonData()
@@ -27,12 +30,15 @@ public function getButtonData()
                 'class' => 'invalidate-token',
                 'on_click' => 'deleteConfirm("' . $deleteConfirmMsg . '", "' . $this->getInvalidateTokenUrl() . '")',
                 'sort_order' => 65,
+                'aclResource' => 'Magento_Customer::invalidate_tokens',
             ];
         }
         return $data;
     }
 
     /**
+     * Get invalidate token url.
+     *
      * @return string
      */
     public function getInvalidateTokenUrl()

app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php

@@ -27,6 +27,7 @@ public function getButtonData()
                 'class' => 'reset reset-password',
                 'on_click' => sprintf("location.href = '%s';", $this->getResetPasswordUrl()),
                 'sort_order' => 60,
+                'aclResource' => 'Magento_Customer::reset_password',
             ];
         }
         return $data;

app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Customer\Controller\Adminhtml\Customer;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
@@ -25,8 +26,15 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
-class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index
+class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Customer::invalidate_tokens';
+
     /**
      * @var CustomerTokenServiceInterface
      */