Merge remote-tracking branch 'remotes/github/2.3-develop' into MAGETWO-65232

Author: VeronikaYarats

app/code/Magento/AsynchronousOperations/Model/MassConsumer.php

@@ -9,6 +9,7 @@
 namespace Magento\AsynchronousOperations\Model;
 
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Registry;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\MessageQueue\MessageLockException;
 use Magento\Framework\MessageQueue\ConnectionLostException;
@@ -58,6 +59,11 @@ class MassConsumer implements ConsumerInterface
      */
     private $operationProcessor;
 
+    /**
+     * @var Registry
+     */
+    private $registry;
+
     /**
      * Initialize dependencies.
      *
@@ -67,14 +73,16 @@ class MassConsumer implements ConsumerInterface
      * @param ConsumerConfigurationInterface $configuration
      * @param OperationProcessorFactory $operationProcessorFactory
      * @param LoggerInterface $logger
+     * @param Registry $registry
      */
     public function __construct(
         CallbackInvoker $invoker,
         ResourceConnection $resource,
         MessageController $messageController,
         ConsumerConfigurationInterface $configuration,
         OperationProcessorFactory $operationProcessorFactory,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        Registry $registry = null
     ) {
         $this->invoker = $invoker;
         $this->resource = $resource;
@@ -84,20 +92,26 @@ public function __construct(
             'configuration' => $configuration
         ]);
         $this->logger = $logger;
+        $this->registry = $registry ?? \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(Registry::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process($maxNumberOfMessages = null)
     {
+        $this->registry->register('isSecureArea', true, true);
+
         $queue = $this->configuration->getQueue();
 
         if (!isset($maxNumberOfMessages)) {
             $queue->subscribe($this->getTransactionCallback($queue));
         } else {
             $this->invoker->invoke($queue, $maxNumberOfMessages, $this->getTransactionCallback($queue));
         }
+
+        $this->registry->unregister('isSecureArea');
     }
 
     /**

app/code/Magento/AuthorizenetAcceptjs/etc/payment.xml

@@ -9,7 +9,7 @@
          xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
     <methods>
         <method name="authorizenet_acceptjs">
-            <allow_multiple_address>1</allow_multiple_address>
+            <allow_multiple_address>0</allow_multiple_address>
         </method>
     </methods>
 </payment>

app/code/Magento/AuthorizenetAcceptjs/view/base/requirejs-config.js

@@ -4,16 +4,10 @@
  */
 
 var config = {
-    shim: {
-        acceptjs: {
-            exports: 'Accept'
-        },
-        acceptjssandbox: {
-            exports: 'Accept'
+    map: {
+        '*': {
+            acceptjssandbox: 'https://jstest.authorize.net/v1/Accept.js',
+            acceptjs: 'https://js.authorize.net/v1/Accept.js'
         }
-    },
-    paths: {
-        acceptjssandbox: 'https://jstest.authorize.net/v1/Accept',
-        acceptjs: 'https://js.authorize.net/v1/Accept'
     }
 };

app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-factory.js

@@ -16,7 +16,7 @@ define([
             dependency = 'acceptjssandbox';
         }
 
-        require([dependency], function (accept) {
+        require([dependency], function () {
                 var $body = $('body');
 
                 /*
@@ -26,7 +26,16 @@ define([
                  * Dynamically-loading-Accept-js-E-WC-03-Accept-js-is-not-loaded/td-p/63283
                  */
                 $body.on('handshake.acceptjs', function () {
-                    deferred.resolve(accept);
+                    /*
+                     * Accept.js doesn't return the library when loading
+                     * and requirejs "shim" can't be used because it only works with the "paths" config option
+                     * and we can't use "paths" because require will try to load ".min.js" in production
+                     * and that doesn't work because it doesn't exist
+                     * and we can't add a query string to force a URL because accept.js will reject it
+                     * and we can't include it locally because they check in the script before loading more scripts
+                     * So, we use the global version as "shim" would
+                     */
+                    deferred.resolve(window.Accept);
                     $body.off('handshake.acceptjs');
                 });
             },

app/code/Magento/Backend/Block/Template/Context.php

@@ -17,7 +17,9 @@
  * the classes they were introduced for.
  *
  * @api
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class Context extends \Magento\Framework\View\Element\Template\Context
@@ -173,6 +175,8 @@ public function getAuthorization()
     }
 
     /**
+     * Get backend session instance.
+     *
      * @return \Magento\Backend\Model\Session
      */
     public function getBackendSession()
@@ -181,6 +185,8 @@ public function getBackendSession()
     }
 
     /**
+     * Get math random instance.
+     *
      * @return \Magento\Framework\Math\Random
      */
     public function getMathRandom()
@@ -189,6 +195,8 @@ public function getMathRandom()
     }
 
     /**
+     * Get form key instance.
+     *
      * @return \Magento\Framework\Data\Form\FormKey
      */
     public function getFormKey()
@@ -197,7 +205,9 @@ public function getFormKey()
     }
 
     /**
-     * @return \Magento\Framework\Data\Form\FormKey
+     * Get name builder instance.
+     *
+     * @return \Magento\Framework\Code\NameBuilder
      */
     public function getNameBuilder()
     {

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

@@ -28,6 +28,8 @@ abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock imp
     protected $_column;
 
     /**
+     * Set column for renderer.
+     *
      * @param Column $column
      * @return $this
      */
@@ -38,6 +40,8 @@ public function setColumn($column)
     }
 
     /**
+     * Returns row associated with the renderer.
+     *
      * @return Column
      */
     public function getColumn()
@@ -48,7 +52,7 @@ public function getColumn()
     /**
      * Renders grid column
      *
-     * @param   Object $row
+     * @param DataObject $row
      * @return  string
      */
     public function render(DataObject $row)
@@ -66,7 +70,7 @@ public function render(DataObject $row)
     /**
      * Render column for export
      *
-     * @param Object $row
+     * @param DataObject $row
      * @return string
      */
     public function renderExport(DataObject $row)
@@ -75,7 +79,9 @@ public function renderExport(DataObject $row)
     }
 
     /**
-     * @param Object $row
+     * Returns value of the row.
+     *
+     * @param DataObject $row
      * @return mixed
      */
     protected function _getValue(DataObject $row)
@@ -92,7 +98,9 @@ protected function _getValue(DataObject $row)
     }
 
     /**
-     * @param Object $row
+     * Get pre-rendered input element.
+     *
+     * @param DataObject $row
      * @return string
      */
     public function _getInputValueElement(DataObject $row)
@@ -108,7 +116,9 @@ public function _getInputValueElement(DataObject $row)
     }
 
     /**
-     * @param Object $row
+     * Get input value by row.
+     *
+     * @param DataObject $row
      * @return mixed
      */
     protected function _getInputValue(DataObject $row)
@@ -117,6 +127,8 @@ protected function _getInputValue(DataObject $row)
     }
 
     /**
+     * Renders header of the column,
+     *
      * @return string
      */
     public function renderHeader()
@@ -148,6 +160,8 @@ public function renderHeader()
     }
 
     /**
+     * Render HTML properties.
+     *
      * @return string
      */
     public function renderProperty()
@@ -172,6 +186,8 @@ public function renderProperty()
     }
 
     /**
+     * Returns HTML for CSS.
+     *
      * @return string
      */
     public function renderCss()

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

@@ -6,12 +6,17 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Dashboard;
 
-class ProductsViewed extends AjaxBlock
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * Get most viewed products controller.
+ */
+class ProductsViewed extends AjaxBlock implements HttpGetActionInterface
 {
     /**
      * Gets most viewed products list
      *
-     * @return \Magento\Backend\Model\View\Result\Page
+     * @return \Magento\Framework\Controller\Result\Raw
      */
     public function execute()
     {

app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php

@@ -6,7 +6,12 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Design;
 
-class Save extends \Magento\Backend\Controller\Adminhtml\System\Design
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Save design action.
+ */
+class Save extends \Magento\Backend\Controller\Adminhtml\System\Design implements HttpPostActionInterface
 {
     /**
      * Filtering posted data. Converting localized data if needed
@@ -26,6 +31,8 @@ protected function _filterPostData($data)
     }
 
     /**
+     * Save design action.
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
@@ -54,10 +61,10 @@ public function execute()
             } catch (\Exception $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());
                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setDesignData($data);
-                return $resultRedirect->setPath('adminhtml/*/', ['id' => $design->getId()]);
+                return $resultRedirect->setPath('*/*/edit', ['id' => $design->getId()]);
             }
         }
 
-        return $resultRedirect->setPath('adminhtml/*/');
+        return $resultRedirect->setPath('*/*/');
     }
 }

app/code/Magento/Backup/Controller/Adminhtml/Index.php

@@ -6,7 +6,6 @@
 namespace Magento\Backup\Controller\Adminhtml;
 
 use Magento\Backend\App\Action;
-use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Backup\Helper\Data as Helper;
 use Magento\Framework\App\ObjectManager;
 
@@ -18,7 +17,7 @@
  * @since 100.0.2
  * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
-abstract class Index extends Action implements HttpGetActionInterface
+abstract class Index extends Action
 {
     /**
      * Authorization level of a basic admin session

app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php

@@ -1,15 +1,18 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Backup\Controller\Adminhtml\Index;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 
-class Create extends \Magento\Backup\Controller\Adminhtml\Index
+/**
+ * Create backup controller
+ */
+class Create extends \Magento\Backup\Controller\Adminhtml\Index implements HttpPostActionInterface
 {
     /**
      * Create backup action.