Merge remote-tracking branch 'mainline/2.3-develop' into MC-18450

Author: cpartica

app/code/Magento/Authorizenet/README.md

@@ -1 +1,42 @@
+# Magento_Authorizenet module
+
 The Magento_Authorizenet module implements the integration with the Authorize.Net payment gateway and makes the latter available as a payment method in Magento.
+
+## Extensibility
+
+Extension developers can interact with the Magento_Authorizenet module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_Authorizenet module.
+
+### Events
+
+This module dispatches the following events:
+
+ - `checkout_directpost_placeOrder` event in the `\Magento\Authorizenet\Controller\Directpost\Payment\Place::placeCheckoutOrder()` method. Parameters:
+   - `result` is a data object (`\Magento\Framework\DataObject` class).
+   - `action` is a controller object (`\Magento\Authorizenet\Controller\Directpost\Payment\Place`).
+ 
+ - `order_cancel_after` event in the `\Magento\Authorizenet\Model\Directpost::declineOrder()` method. Parameters:
+   - `order` is an order object (`\Magento\Sales\Model\Order` class).
+   
+
+This module observes the following events:
+
+ - `checkout_submit_all_after` event in the `Magento\Authorizenet\Observer\SaveOrderAfterSubmitObserver` file.
+ - `checkout_directpost_placeOrder` event in the `Magento\Authorizenet\Observer\AddFieldsToResponseObserver` file.
+
+For information about events in Magento 2, see [Events and observers](http://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events).
+
+### Layouts
+
+This module introduces the following layouts and layout handles in the `view/adminhtml/layout` directory:
+
+- `adminhtml_authorizenet_directpost_payment_redirect`
+
+This module introduces the following layouts and layout handles in the `view/frontend/layout` directory:
+
+- `authorizenet_directpost_payment_backendresponse`
+- `authorizenet_directpost_payment_redirect`
+- `authorizenet_directpost_payment_response`
+
+For more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).

app/code/Magento/Catalog/Model/Product.php

@@ -832,12 +832,14 @@ public function getStoreIds()
         if (!$this->hasStoreIds()) {
             $storeIds = [];
             if ($websiteIds = $this->getWebsiteIds()) {
-                if ($this->_storeManager->isSingleStoreMode()) {
+                if (!$this->isObjectNew() && $this->_storeManager->isSingleStoreMode()) {
                     $websiteIds = array_keys($websiteIds);
                 }
                 foreach ($websiteIds as $websiteId) {
                     $websiteStores = $this->_storeManager->getWebsite($websiteId)->getStoreIds();
-                    $storeIds = array_merge($storeIds, $websiteStores);
+                    foreach ($websiteStores as $websiteStore) {
+                        $storeIds []= $websiteStore;
+                    }
                 }
             }
             $this->setStoreIds($storeIds);
@@ -920,9 +922,9 @@ public function beforeSave()
         //Validate changing of design.
         $userType = $this->getUserContext()->getUserType();
         if ((
-                $userType === UserContextInterface::USER_TYPE_ADMIN
+            $userType === UserContextInterface::USER_TYPE_ADMIN
                 || $userType === UserContextInterface::USER_TYPE_INTEGRATION
-            )
+        )
             && !$this->getAuthorization()->isAllowed('Magento_Catalog::edit_product_design')
         ) {
             $this->setData('custom_design', $this->getOrigData('custom_design'));

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Product Test
@@ -207,6 +208,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     private $eavConfig;
 
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -303,13 +309,13 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $storeManager->expects($this->any())
+        $this->storeManager->expects($this->any())
             ->method('getStore')
             ->will($this->returnValue($this->store));
-        $storeManager->expects($this->any())
+        $this->storeManager->expects($this->any())
             ->method('getWebsite')
             ->will($this->returnValue($this->website));
         $this->indexerRegistryMock = $this->createPartialMock(
@@ -394,7 +400,7 @@ protected function setUp()
                 'extensionFactory' => $this->extensionAttributesFactory,
                 'productPriceIndexerProcessor' => $this->productPriceProcessor,
                 'catalogProductOptionFactory' => $optionFactory,
-                'storeManager' => $storeManager,
+                'storeManager' => $this->storeManager,
                 'resource' => $this->resource,
                 'registry' => $this->registry,
                 'moduleManager' => $this->moduleManager,
@@ -450,6 +456,48 @@ public function testGetStoreIds()
         $this->assertEquals($expectedStoreIds, $this->model->getStoreIds());
     }
 
+    /**
+     * @dataProvider getSingleStoreIds
+     * @param bool $isObjectNew
+     */
+    public function testGetStoreSingleSiteModelIds(
+        bool $isObjectNew
+    ) {
+        $websiteIDs = [0 => 2];
+        $this->model->setWebsiteIds(
+            !$isObjectNew ? $websiteIDs : array_flip($websiteIDs)
+        );
+
+        $this->model->isObjectNew($isObjectNew);
+
+        $this->storeManager->expects(
+            $this->exactly(
+                (int) !$isObjectNew
+            )
+        )
+            ->method('isSingleStoreMode')
+            ->will($this->returnValue(true));
+
+        $this->website->expects(
+            $this->once()
+        )->method('getStoreIds')
+            ->will($this->returnValue($websiteIDs));
+
+        $this->assertEquals($websiteIDs, $this->model->getStoreIds());
+    }
+
+    public function getSingleStoreIds()
+    {
+        return [
+          [
+              false
+          ],
+          [
+              true
+          ],
+        ];
+    }
+
     public function testGetStoreId()
     {
         $this->model->setStoreId(3);
@@ -1221,8 +1269,7 @@ public function testGetMediaGalleryImagesMerging()
     {
         $mediaEntries =
             [
-            'images' =>
-                [
+            'images' => [
                 [
                     'value_id' => 1,
                     'file' => 'imageFile.jpg',

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartWithDisableMiniCartSidebarTest.xml

@@ -109,7 +109,7 @@
             <argument name="total" value="110.00"/>
         </actionGroup>
 
-        <!--Enabled Shopping Cart Sidebar -->
+        <!--Enabled Mini Cart -->
         <magentoCLI stepKey="enableShoppingCartSidebar" command="config:set checkout/sidebar/display 1"/>
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
         <reloadPage stepKey="reloadThePage"/>

app/code/Magento/Checkout/etc/adminhtml/system.xml

@@ -57,9 +57,9 @@
                 </field>
             </group>
             <group id="sidebar" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Shopping Cart Sidebar</label>
+                <label>Mini Cart</label>
                 <field id="display" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                    <label>Display Shopping Cart Sidebar</label>
+                    <label>Display Mini Cart</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="count" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">

app/code/Magento/Checkout/i18n/en_US.csv

@@ -156,8 +156,8 @@ Shipping,Shipping
 "Number of Items to Display Pager","Number of Items to Display Pager"
 "My Cart Link","My Cart Link"
 "Display Cart Summary","Display Cart Summary"
-"Shopping Cart Sidebar","Shopping Cart Sidebar"
-"Display Shopping Cart Sidebar","Display Shopping Cart Sidebar"
+"Mini Cart","Mini Cart"
+"Display Mini Cart","Display Mini Cart"
 "Number of Items to Display Scrollbar","Number of Items to Display Scrollbar"
 "Maximum Number of Items to Display","Maximum Number of Items to Display"
 "Payment Failed Emails","Payment Failed Emails"

app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml

@@ -56,7 +56,7 @@
                 <span><?= $block->escapeHtml(__('Continue Shopping')) ?></span>
             </a>
         <?php endif; ?>
-        <button type="submit"
+        <button type="button"
                 name="update_cart_action"
                 data-cart-empty=""
                 value="empty_cart"

app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js

@@ -14,14 +14,14 @@ define([
         _create: function () {
             var items, i, reload;
 
-            $(this.options.emptyCartButton).on('click', $.proxy(function (event) {
-                if (event.detail === 0) {
-                    return;
-                }
-
+            $(this.options.emptyCartButton).on('click', $.proxy(function () {
                 $(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
                 $(this.options.updateCartActionContainer)
                     .attr('name', 'update_cart_action').attr('value', 'empty_cart');
+
+                if ($(this.options.emptyCartButton).parents('form').length > 0) {
+                    $(this.options.emptyCartButton).parents('form').submit();
+                }
             }, this));
             items = $.find('[data-role="cart-item-qty"]');
 

app/code/Magento/Cron/etc/adminhtml/system.xml

@@ -15,21 +15,27 @@
                     <label>Cron configuration options for group: </label>
                     <field id="schedule_generate_every" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                         <label>Generate Schedules Every</label>
+                        <validate>validate-zero-or-greater validate-digits</validate>
                     </field>
                     <field id="schedule_ahead_for" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                         <label>Schedule Ahead for</label>
+                        <validate>validate-zero-or-greater validate-digits</validate>
                     </field>
                     <field id="schedule_lifetime" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                         <label>Missed if Not Run Within</label>
+                        <validate>validate-zero-or-greater validate-digits</validate>
                     </field>
                     <field id="history_cleanup_every" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                         <label>History Cleanup Every</label>
+                        <validate>validate-zero-or-greater validate-digits</validate>
                     </field>
                     <field id="history_success_lifetime" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                         <label>Success History Lifetime</label>
+                        <validate>validate-zero-or-greater validate-digits</validate>
                     </field>
                     <field id="history_failure_lifetime" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                         <label>Failure History Lifetime</label>
+                        <validate>validate-zero-or-greater validate-digits</validate>
                     </field>
                     <field id="use_separate_process" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                         <label>Use Separate Process</label>