ENGCOM-2996: Replace sort callbacks to spaceship operator #18102

Author: Stanislav Idolov

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

@@ -127,12 +127,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

@@ -62,10 +62,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/Deploy/Model/DeploymentConfig/ImporterPool.php

@@ -187,14 +187,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

@@ -303,11 +303,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

@@ -641,11 +641,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;

dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php

@@ -32,11 +32,7 @@ protected function sortDownloadableArray(array $fields)
         usort(
             $fields,
             function ($row1, $row2) {
-                if ($row1['sort_order'] == $row2['sort_order']) {
-                    return 0;
-                }
-
-                return ($row1['sort_order'] < $row2['sort_order']) ? -1 : 1;
+                return $row1['sort_order'] <=> $row2['sort_order'];
             }
         );
 

lib/internal/Magento/Framework/Communication/Config/CompositeReader.php

@@ -27,12 +27,10 @@ public function __construct(array $readers)
         usort(
             $readers,
             function ($firstItem, $secondItem) {
-                if (!isset($firstItem['sortOrder']) || !isset($secondItem['sortOrder'])
-                    || $firstItem['sortOrder'] == $secondItem['sortOrder']
-                ) {
+                if (!isset($firstItem['sortOrder']) || !isset($secondItem['sortOrder'])) {
                     return 0;
                 }
-                return $firstItem['sortOrder'] < $secondItem['sortOrder'] ? -1 : 1;
+                return $firstItem['sortOrder'] <=> $secondItem['sortOrder'];
             }
         );
         $this->readers = [];