🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #17291: fix: remove unused ID (by @DanielRuf)
 - #17191: [Backport 2.2]Filter test result collection with the cron job code defined in the c� (by @gelanivishal)
 - #16788: Replace sort callbacks to spaceship operator (by @lbajsarowicz)
 - #17275: fix #17193 Error with translation of confirmation modal buttons (by @Karlasa)
 - #17103: Code cleanup of lib files (by @mage2pratik)


Fixed GitHub Issues:
 - #16243: Integration test ProcessCronQueueObserverTest.php succeeds regardless of magento config fixture (reported by @evktalo) has been fixed in #17191 by @gelanivishal in 2.2-develop branch
   Related commits:
     1. ce5ac6e

 - #17193: Error with translation of confirmation modal buttons (reported by @delyriand) has been fixed in #17275 by @Karlasa in 2.2-develop branch
   Related commits:
     1. 5cfde8a

Author: Stanislav Idolov

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

@@ -291,13 +291,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/template/billing-address/form.html

@@ -9,9 +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

@@ -602,13 +602,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'];
                 }
             );
         }

app/code/Magento/Ui/view/base/web/js/modal/confirm.js

@@ -9,10 +9,10 @@
 define([
     'jquery',
     'underscore',
+    'mage/translate',
     'jquery/ui',
-    'Magento_Ui/js/modal/modal',
-    'mage/translate'
-], function ($, _) {
+    'Magento_Ui/js/modal/modal'
+], function ($, _, $t) {
     'use strict';
 
     $.widget('mage.confirm', $.mage.modal, {
@@ -38,7 +38,7 @@ define([
                 cancel: function () {}
             },
             buttons: [{
-                text: $.mage.__('Cancel'),
+                text: $t('Cancel'),
                 class: 'action-secondary action-dismiss',
 
                 /**
@@ -48,7 +48,7 @@ define([
                     this.closeModal(event);
                 }
             }, {
-                text: $.mage.__('OK'),
+                text: $t('OK'),
                 class: 'action-primary action-accept',
 
                 /**

dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php

@@ -27,14 +27,15 @@ protected function setUp()
     }
 
     /**
-     * @magentoConfigFixture current_store crontab/default/jobs/catalog_product_alert/schedule/cron_expr 8 * * * *
+     * @magentoConfigFixture current_store crontab/default/jobs/catalog_product_alert/schedule/cron_expr * * * * *
      */
     public function testDispatchScheduled()
     {
         $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Cron\Model\ResourceModel\Schedule\Collection::class
         );
         $collection->addFieldToFilter('status', \Magento\Cron\Model\Schedule::STATUS_PENDING);
+        $collection->addFieldToFilter('job_code', 'catalog_product_alert');
         $this->assertGreaterThan(0, $collection->count(), 'Cron has failed to schedule tasks for itself for future.');
     }
 

lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php

@@ -74,7 +74,7 @@ public function getCustomAttribute($attributeCode)
      */
     public function getCustomAttributes()
     {
-        return isset($this->_data[self::CUSTOM_ATTRIBUTES]) ? $this->_data[self::CUSTOM_ATTRIBUTES] : [];
+        return $this->_data[self::CUSTOM_ATTRIBUTES] ?? [];
     }
 
     /**
@@ -129,7 +129,7 @@ public function setCustomAttribute($attributeCode, $attributeValue)
      */
     protected function getCustomAttributesCodes()
     {
-        return isset($this->customAttributesCodes) ? $this->customAttributesCodes : [];
+        return $this->customAttributesCodes ?? [];
     }
 
     /**

lib/internal/Magento/Framework/Api/AbstractSimpleObject.php

@@ -34,7 +34,7 @@ public function __construct(array $data = [])
      */
     protected function _get($key)
     {
-        return isset($this->_data[$key]) ? $this->_data[$key] : null;
+        return $this->_data[$key] ?? null;
     }
 
     /**