🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - magento/magento2#18142: Replace intval() function by using direct type casting to (int) where no default value is needed (by @mage2pratik)
 - magento/magento2#18136: [2.3] Update labels section in README.md (by @sidolov)
 - magento/magento2#18117: Change sort order for customer group options (by @dmytro-ch)
 - magento/magento2#18102: Replace sort callbacks to spaceship operator (by @mage2pratik)
 - magento-commerce/async-import#15: add support HTTP DELETE method for async bulk request by adding mergi� (by @anvasiliev)


Fixed GitHub Issues:
 - magento/magento2#18101: Wrong sort order for customer groups in customer grid filter (reported by @sreichel) has been fixed in magento/magento2#18117 by @dmytro-ch in 2.3-develop branch
   Related commits:
     1. 568fa46
     2. ed99490

Author: slavvka

README.md

@@ -41,20 +41,8 @@ Magento is thankful for any contribution that can improve our code base, documen
 </a>
 
 <h3>Labels applied by the Magento team</h3>
-
-| Label        | Description           | 
-| ------------- |-------------|
-| ![DOC](http://devdocs.magento.com/common/images/github_DOC.png) | Affects Documentation domain. |
-| ![PROD](http://devdocs.magento.com/common/images/github_PROD.png) | Affects the Product team (mostly feature requests or business logic change). |
-| ![TECH](http://devdocs.magento.com/common/images/github_TECH.png) | Affects Architect Group (mostly to make decisions around technology changes). |
-| ![accept](http://devdocs.magento.com/common/images/github_accept.png) | The pull request has been accepted and will be merged into mainline code. |
-| ![reject](http://devdocs.magento.com/common/images/github_reject.png) | The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. |
-| ![bug report](http://devdocs.magento.com/common/images/github_bug.png) | The Magento Team has confirmed that this issue contains the minimum required information to reproduce. |
-| ![acknowledged](http://devdocs.magento.com/common/images/gitHub_acknowledged.png) | The Magento Team has validated the issue and an internal ticket has been created. |
-| ![in progress](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. |
-| ![needs update](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. |
-
-To learn more about issue gate labels click [here](https://github.com/magento/magento2/wiki/Magento-Issue-Gates)
+We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more. 
+Please review the <a href="https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels">Code Contributions guide</a> for detailed information on labels used in Magento 2 repositories.
 
 <h2>Reporting security issues</h2>
 

app/code/Magento/Backend/Block/Widget/Button/ButtonList.php

@@ -7,6 +7,8 @@
 namespace Magento\Backend\Block\Widget\Button;
 
 /**
+ * Button list widget
+ *
  * @api
  * @since 100.0.2
  */
@@ -127,12 +129,6 @@ public function getItems()
      */
     public function sortButtons(Item $itemA, Item $itemB)
     {
-        $sortOrderA = (int) $itemA->getSortOrder();
-        $sortOrderB = (int) $itemB->getSortOrder();
-
-        if ($sortOrderA == $sortOrderB) {
-            return 0;
-        }
-        return ($sortOrderA < $sortOrderB) ? -1 : 1;
+        return (int)$itemA->getSortOrder() <=> (int)$itemB->getSortOrder();
     }
 }

app/code/Magento/Bundle/Model/Product/Type.php

@@ -1014,10 +1014,8 @@ public function shakeSelections($firstItem, $secondItem)
             $secondItem->getPosition(),
             $secondItem->getSelectionId(),
         ];
-        if ($aPosition == $bPosition) {
-            return 0;
-        }
-        return $aPosition < $bPosition ? -1 : 1;
+
+        return $aPosition <=> $bPosition;
     }
 
     /**

app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php

@@ -10,6 +10,8 @@
 namespace Magento\Config\Model\Config\Structure\Mapper;
 
 /**
+ * Sorting mapper
+ *
  * @api
  * @since 100.0.2
  */
@@ -30,6 +32,8 @@ public function map(array $data)
     }
 
     /**
+     * Process config
+     *
      * @param array $data
      * @return array
      */
@@ -62,10 +66,6 @@ protected function _cmp($elementA, $elementB)
             $sortIndexB = (float)$elementB['sortOrder'];
         }
 
-        if ($sortIndexA == $sortIndexB) {
-            return 0;
-        }
-
-        return $sortIndexA < $sortIndexB ? -1 : 1;
+        return $sortIndexA <=> $sortIndexB;
     }
 }

app/code/Magento/Customer/Model/GroupManagement.php

@@ -8,16 +8,20 @@
 namespace Magento\Customer\Model;
 
 use Magento\Customer\Api\Data\GroupInterface;
+use Magento\Customer\Api\Data\GroupInterfaceFactory;
+use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Collection;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Customer\Api\GroupRepositoryInterface;
-use Magento\Customer\Api\Data\GroupInterfaceFactory;
-use Magento\Customer\Model\GroupFactory;
 
 /**
+ * The class contains methods for getting information about a customer group
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
@@ -65,6 +69,11 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
      */
     protected $filterBuilder;
 
+    /**
+     * @var SortOrderBuilder
+     */
+    private $sortOrderBuilder;
+
     /**
      * @param StoreManagerInterface $storeManager
      * @param ScopeConfigInterface $scopeConfig
@@ -73,6 +82,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
      * @param GroupInterfaceFactory $groupDataFactory
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param FilterBuilder $filterBuilder
+     * @param SortOrderBuilder $sortOrderBuilder
      */
     public function __construct(
         StoreManagerInterface $storeManager,
@@ -81,7 +91,8 @@ public function __construct(
         GroupRepositoryInterface $groupRepository,
         GroupInterfaceFactory $groupDataFactory,
         SearchCriteriaBuilder $searchCriteriaBuilder,
-        FilterBuilder $filterBuilder
+        FilterBuilder $filterBuilder,
+        SortOrderBuilder $sortOrderBuilder = null
     ) {
         $this->storeManager = $storeManager;
         $this->scopeConfig = $scopeConfig;
@@ -90,10 +101,12 @@ public function __construct(
         $this->groupDataFactory = $groupDataFactory;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->filterBuilder = $filterBuilder;
+        $this->sortOrderBuilder = $sortOrderBuilder ?: ObjectManager::getInstance()
+            ->get(SortOrderBuilder::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isReadonly($groupId)
     {
@@ -107,7 +120,7 @@ public function isReadonly($groupId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultGroup($storeId = null)
     {
@@ -133,15 +146,15 @@ public function getDefaultGroup($storeId = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getNotLoggedInGroup()
     {
         return $this->groupRepository->getById(self::NOT_LOGGED_IN_ID);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLoggedInGroups()
     {
@@ -155,15 +168,20 @@ public function getLoggedInGroups()
             ->setConditionType('neq')
             ->setValue(self::CUST_GROUP_ALL)
             ->create();
+        $groupNameSortOrder = $this->sortOrderBuilder
+            ->setField('customer_group_code')
+            ->setDirection(Collection::SORT_ORDER_ASC)
+            ->create();
         $searchCriteria = $this->searchCriteriaBuilder
             ->addFilters($notLoggedInFilter)
             ->addFilters($groupAll)
+            ->addSortOrder($groupNameSortOrder)
             ->create();
         return $this->groupRepository->getList($searchCriteria)->getItems();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAllCustomersGroup()
     {

app/code/Magento/Deploy/Model/DeploymentConfig/ImporterPool.php

@@ -110,6 +110,8 @@ public function __construct(
     }
 
     /**
+     * Retrieves sections names
+     *
      * Retrieves names of sections for configuration files whose data is read from these files for import
      * to appropriate application sources.
      *
@@ -187,14 +189,7 @@ public function getValidator($section)
     private function sort(array $data)
     {
         uasort($data, function (array $a, array $b) {
-            $a['sort_order'] = $this->getSortOrder($a);
-            $b['sort_order'] = $this->getSortOrder($b);
-
-            if ($a['sort_order'] == $b['sort_order']) {
-                return 0;
-            }
-
-            return ($a['sort_order'] < $b['sort_order']) ? -1 : 1;
+            return $this->getSortOrder($a) <=> $this->getSortOrder($b);
         });
 
         return $data;

app/code/Magento/Paypal/Model/Express/Checkout.php

@@ -1056,10 +1056,7 @@ protected function _prepareShippingOptions(Address $address, $mayReturnEmpty = f
      */
     protected static function cmpShippingOptions(DataObject $option1, DataObject $option2)
     {
-        if ($option1->getAmount() == $option2->getAmount()) {
-            return 0;
-        }
-        return ($option1->getAmount() < $option2->getAmount()) ? -1 : 1;
+        return $option1->getAmount() <=> $option2->getAmount();
     }
 
     /**

app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php

@@ -61,6 +61,7 @@ public function getOrder()
 
     /**
      * Compose and get order full history.
+     *
      * Consists of the status history comments as well as of invoices, shipments and creditmemos creations
      *
      * @TODO This method requires refactoring. Need to create separate model for comment history handling
@@ -218,15 +219,15 @@ protected function _prepareHistoryItem($label, $notified, $created, $comment = '
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTabLabel()
     {
         return __('Comments History');
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTabTitle()
     {
@@ -264,15 +265,15 @@ public function getTabUrl()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function canShowTab()
     {
         return true;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isHidden()
     {
@@ -303,11 +304,7 @@ public static function sortHistoryByTimestamp($a, $b)
         $createdAtA = $a['created_at'];
         $createdAtB = $b['created_at'];
 
-        /** @var $createdAtA \DateTime */
-        if ($createdAtA->getTimestamp() == $createdAtB->getTimestamp()) {
-            return 0;
-        }
-        return $createdAtA->getTimestamp() < $createdAtB->getTimestamp() ? -1 : 1;
+        return $createdAtA->getTimestamp() <=> $createdAtB->getTimestamp();
     }
 
     /**

app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php

@@ -158,8 +158,7 @@ public function __construct(
     }
 
     /**
-     * Returns the total width in points of the string using the specified font and
-     * size.
+     * Returns the total width in points of the string using the specified font and size.
      *
      * This is not the most efficient way to perform this calculation. I'm
      * concentrating optimization efforts on the upcoming layout manager class.
@@ -230,7 +229,7 @@ public function getAlignCenter($string, $x, $columnWidth, \Zend_Pdf_Resource_Fon
      * Insert logo to pdf page
      *
      * @param \Zend_Pdf_Page &$page
-     * @param null $store
+     * @param string|null $store
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -285,7 +284,7 @@ protected function insertLogo(&$page, $store = null)
      * Insert address to pdf page
      *
      * @param \Zend_Pdf_Page &$page
-     * @param null $store
+     * @param string|null $store
      * @return void
      */
     protected function insertAddress(&$page, $store = null)
@@ -641,11 +640,7 @@ protected function _sortTotalsList($a, $b)
             return 0;
         }
 
-        if ($a['sort_order'] == $b['sort_order']) {
-            return 0;
-        }
-
-        return $a['sort_order'] > $b['sort_order'] ? 1 : -1;
+        return $a['sort_order'] <=> $b['sort_order'];
     }
 
     /**

app/code/Magento/Ui/DataProvider/Modifier/Pool.php

@@ -88,14 +88,7 @@ public function getModifiersInstances()
     protected function sort(array $data)
     {
         usort($data, function (array $a, array $b) {
-            $a['sortOrder'] = $this->getSortOrder($a);
-            $b['sortOrder'] = $this->getSortOrder($b);
-
-            if ($a['sortOrder'] == $b['sortOrder']) {
-                return 0;
-            }
-
-            return ($a['sortOrder'] < $b['sortOrder']) ? -1 : 1;
+            return $this->getSortOrder($a) <=> $this->getSortOrder($b);
         });
 
         return $data;

app/code/Magento/WebapiAsync/Controller/Rest/Asynchronous/InputParamsResolver.php

@@ -95,6 +95,13 @@ public function resolve()
         $this->requestValidator->validate();
         $webapiResolvedParams = [];
         $inputData = $this->request->getRequestData();
+
+        $httpMethod = $this->request->getHttpMethod();
+        if ($httpMethod == \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE) {
+            $requestBodyParams = $this->request->getBodyParams();
+            $inputData = array_merge($requestBodyParams, $inputData);
+        }
+
         foreach ($inputData as $key => $singleEntityParams) {
             $webapiResolvedParams[$key] = $this->resolveBulkItemParams($singleEntityParams);
         }
@@ -103,6 +110,8 @@ public function resolve()
     }
 
     /**
+     * Returns route.
+     *
      * @return \Magento\Webapi\Controller\Rest\Router\Route
      */
     public function getRoute()
@@ -111,8 +120,7 @@ public function getRoute()
     }
 
     /**
-     * Convert the input array from key-value format to a list of parameters
-     * suitable for the specified class / method.
+     * Convert the input array from key-value format to a list of parameters suitable for the specified class / method.
      *
      * Instead of \Magento\Webapi\Controller\Rest\InputParamsResolver
      * we don't need to merge body params with url params and use only body params