🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #17330: [Forwardport] Replace sort callbacks to spaceship operator (by @mage2pratik)
 - #17329: [Forwardport] Code cleanup of lib files (by @mage2pratik)
 - #17334: fix: remove unused ID (by @DanielRuf)
 - #17328: [Forwardport] Allow 3rd party modules to perform actions after totals calculation (by @navarr)
 - #15690: MSI-478: Unskip StockStatusFilterTest (by @kisroman)
 - #16894: [Port 2.3] Fixing annotations for some methods. (by @tiagosampaio)

Author: Stanislav Idolov

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

@@ -292,13 +292,7 @@ public function attributesCompare($attributeOne, $attributeTwo)
         $sortOne = $attributeOne->getGroupSortPath() * 1000 + $attributeOne->getSortPath() * 0.0001;
         $sortTwo = $attributeTwo->getGroupSortPath() * 1000 + $attributeTwo->getSortPath() * 0.0001;
 
-        if ($sortOne > $sortTwo) {
-            return 1;
-        } elseif ($sortOne < $sortTwo) {
-            return -1;
-        }
-
-        return 0;
+        return $sortOne <=> $sortTwo;
     }
 
     /**

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml

@@ -12,7 +12,7 @@
         <element name="isPaymentSection" type="text" selector="//*[@class='opc-progress-bar']/li[contains(@class, '_active') and span[contains(.,'Review &amp; Payments')]]"/>
         <element name="availablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div:nth-child(2)>div.payment-method-title.field.choice"/>
         <element name="notAvailablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div.payment-method._active>div.payment-method-title.field.choice"/>
-        <element name="billingNewAddressForm" type="text" selector=".billing-new-address-form"/>
+        <element name="billingNewAddressForm" type="text" selector="[data-form='billing-new-address']"/>
         <element name="placeOrderDisabled" type="button" selector="#checkout-payment-method-load button.disabled"/>
         <element name="update" type="button" selector=".payment-method-billing-address .action.action-update"/>
         <element name="guestFirstName" type="input" selector=".billing-address-form input[name*='firstname']"/>

app/code/Magento/Checkout/view/frontend/web/js/model/cart/totals-processor/default.js

@@ -38,7 +38,7 @@ define([
             payload.addressInformation['shipping_carrier_code'] = quote.shippingMethod()['carrier_code'];
         }
 
-        storage.post(
+        return storage.post(
             serviceUrl, JSON.stringify(payload), false
         ).done(function (result) {
             var data = {
@@ -96,7 +96,7 @@ define([
             ) {
                 quote.setTotals(cartCache.get('totals'));
             } else {
-                loadFromServer(address);
+                return loadFromServer(address);
             }
         }
     };

app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html

@@ -9,8 +9,7 @@
     <!-- ko template: getTemplate() --><!-- /ko -->
     <!--/ko-->
     <form data-bind="attr: {'data-hasrequired': $t('* Required Fields')}">
-        <fieldset data-bind="attr: { id:'billing-new-address-form-'+index, value:index}"
-                  class="billing-new-address-form fieldset address">
+        <fieldset class="fieldset address" data-form="billing-new-address">
             <!-- ko foreach: getRegion('additional-fieldsets') -->
             <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -591,13 +591,7 @@ public function attributesCompare($firstAttribute, $secondAttribute)
         $firstSort = $firstAttribute->getSortWeight((int) $this->_sortingSetId);
         $secondSort = $secondAttribute->getSortWeight((int) $this->_sortingSetId);
 
-        if ($firstSort > $secondSort) {
-            return 1;
-        } elseif ($firstSort < $secondSort) {
-            return -1;
-        }
-
-        return 0;
+        return $firstSort <=> $secondSort;
     }
 
     /**

app/code/Magento/Quote/Model/Quote/Address.php

@@ -872,13 +872,7 @@ public function getGroupedAllShippingRates()
      */
     protected function _sortRates($firstItem, $secondItem)
     {
-        if ((int)$firstItem[0]->carrier_sort_order < (int)$secondItem[0]->carrier_sort_order) {
-            return -1;
-        } elseif ((int)$firstItem[0]->carrier_sort_order > (int)$secondItem[0]->carrier_sort_order) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return (int) $firstItem[0]->carrier_sort_order <=> (int) $secondItem[0]->carrier_sort_order;
     }
 
     /**

app/code/Magento/Sales/Model/Config/Ordered.php

@@ -167,13 +167,8 @@ function ($a, $b) {
                     if (!isset($a['sort_order']) || !isset($b['sort_order'])) {
                         return 0;
                     }
-                    if ($a['sort_order'] > $b['sort_order']) {
-                        return 1;
-                    } elseif ($a['sort_order'] < $b['sort_order']) {
-                        return -1;
-                    } else {
-                        return 0;
-                    }
+
+                    return $a['sort_order'] <=> $b['sort_order'];
                 }
             );
         }

dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php

@@ -12,45 +12,48 @@
 $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
 );
-$attribute->setData(
-    [
-        'attribute_code' => 'multiselect_attribute',
-        'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
-        'is_global' => 1,
-        'is_user_defined' => 1,
-        'frontend_input' => 'multiselect',
-        'is_unique' => 0,
-        'is_required' => 0,
-        'is_searchable' => 0,
-        'is_visible_in_advanced_search' => 0,
-        'is_comparable' => 0,
-        'is_filterable' => 1,
-        'is_filterable_in_search' => 0,
-        'is_used_for_promo_rules' => 0,
-        'is_html_allowed_on_front' => 1,
-        'is_visible_on_front' => 0,
-        'used_in_product_listing' => 0,
-        'used_for_sort_by' => 0,
-        'frontend_label' => ['Multiselect Attribute'],
-        'backend_type' => 'varchar',
-        'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
-        'option' => [
-            'value' => [
-                'option_1' => ['Option 1'],
-                'option_2' => ['Option 2'],
-                'option_3' => ['Option 3'],
-                'option_4' => ['Option 4 "!@#$%^&*']
+$entityType = $installer->getEntityTypeId('catalog_product');
+if (!$attribute->loadByCode($entityType, 'multiselect_attribute')->getAttributeId()) {
+    $attribute->setData(
+        [
+            'attribute_code' => 'multiselect_attribute',
+            'entity_type_id' => $entityType,
+            'is_global' => 1,
+            'is_user_defined' => 1,
+            'frontend_input' => 'multiselect',
+            'is_unique' => 0,
+            'is_required' => 0,
+            'is_searchable' => 0,
+            'is_visible_in_advanced_search' => 0,
+            'is_comparable' => 0,
+            'is_filterable' => 1,
+            'is_filterable_in_search' => 0,
+            'is_used_for_promo_rules' => 0,
+            'is_html_allowed_on_front' => 1,
+            'is_visible_on_front' => 0,
+            'used_in_product_listing' => 0,
+            'used_for_sort_by' => 0,
+            'frontend_label' => ['Multiselect Attribute'],
+            'backend_type' => 'varchar',
+            'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
+            'option' => [
+                'value' => [
+                    'option_1' => ['Option 1'],
+                    'option_2' => ['Option 2'],
+                    'option_3' => ['Option 3'],
+                    'option_4' => ['Option 4 "!@#$%^&*']
+                ],
+                'order' => [
+                    'option_1' => 1,
+                    'option_2' => 2,
+                    'option_3' => 3,
+                    'option_4' => 4,
+                ],
             ],
-            'order' => [
-                'option_1' => 1,
-                'option_2' => 2,
-                'option_3' => 3,
-                'option_4' => 4,
-            ],
-        ],
-    ]
-);
-$attribute->save();
+        ]
+    );
+    $attribute->save();
 
-/* Assign attribute to attribute set */
-$installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
+}

dev/tests/integration/testsuite/Magento/Catalog/_files/product_out_of_stock_with_multiselect_attribute.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/**
+ * Create multiselect attribute
+ */
+require __DIR__ . '/multiselect_attribute.php';
+
+/** Create product with options out of stock and multiselect attribute */
+
+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
+$installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Setup\CategorySetup::class
+);
+
+/** @var $options \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection */
+$options = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class
+);
+$options->setAttributeFilter($attribute->getId());
+$optionIds = $options->getAllIds();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId($optionIds[1] * 20)
+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+    ->setWebsiteIds([1])
+    ->setName('Out of Stock With Multiselect')
+    ->setSku('simple_ms_out_of_stock')
+    ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setMultiselectAttribute([$optionIds[1], $optionIds[2], $optionIds[3]])
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 0,'is_in_stock' => 0])
+    ->save();

dev/tests/integration/testsuite/Magento/Catalog/_files/product_out_of_stock_with_multiselect_attribute_rollback.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/multiselect_attribute_rollback.php';
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Indexer\IndexerRegistry;
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple_ms_out_of_stock', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(IndexerRegistry::class)
+    ->get(Magento\CatalogInventory\Model\Indexer\Stock\Processor::INDEXER_ID)
+    ->reindexAll();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);