ENGCOM-2925: Replace sort callbacks to spaceship operator #17938

Author: Stanislav Idolov

lib/internal/Magento/Framework/App/RouterList.php

@@ -119,14 +119,6 @@ public function rewind()
      */
     protected function compareRoutersSortOrder($routerDataFirst, $routerDataSecond)
     {
-        if ((int)$routerDataFirst['sortOrder'] == (int)$routerDataSecond['sortOrder']) {
-            return 0;
-        }
-
-        if ((int)$routerDataFirst['sortOrder'] < (int)$routerDataSecond['sortOrder']) {
-            return -1;
-        } else {
-            return 1;
-        }
+        return (int)$routerDataFirst['sortOrder'] <=> (int)$routerDataSecond['sortOrder'];
     }
 }

lib/internal/Magento/Framework/Config/Reader.php

@@ -63,10 +63,7 @@ function ($item) {
         uasort(
             $array,
             function ($firstItem, $nexItem) {
-                if ((int)$firstItem['sortOrder'] == (int)$nexItem['sortOrder']) {
-                    return 0;
-                }
-                return (int)$firstItem['sortOrder'] < (int)$nexItem['sortOrder'] ? -1 : 1;
+                return (int)$firstItem['sortOrder'] <=> (int)$nexItem['sortOrder'];
             }
         );
 

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

@@ -71,15 +71,10 @@ function ($firstItem, $secondItem) {
                 if (isset($firstItem['sortOrder'])) {
                     $firstValue = intval($firstItem['sortOrder']);
                 }
-
                 if (isset($secondItem['sortOrder'])) {
                     $secondValue = intval($secondItem['sortOrder']);
                 }
-
-                if ($firstValue == $secondValue) {
-                    return 0;
-                }
-                return $firstValue < $secondValue ? -1 : 1;
+                return $firstValue <=> $secondValue;
             }
         );
         return $readers;

lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php

@@ -70,15 +70,10 @@ function ($firstItem, $secondItem) {
                 if (isset($firstItem['sortOrder'])) {
                     $firstValue = intval($firstItem['sortOrder']);
                 }
-
                 if (isset($secondItem['sortOrder'])) {
                     $secondValue = intval($secondItem['sortOrder']);
                 }
-
-                if ($firstValue == $secondValue) {
-                    return 0;
-                }
-                return $firstValue < $secondValue ? -1 : 1;
+                return $firstValue <=> $secondValue;
             }
         );
         return $converters;

lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php

@@ -35,15 +35,7 @@ function ($component) {
         uasort(
             $declaredComponents,
             function ($firstComponent, $secondComponent) {
-                $firstComponentSortOrder = (int)$firstComponent['sortOrder'];
-                $secondComponentSortOrder = (int)$secondComponent['sortOrder'];
-                if ($firstComponentSortOrder == $secondComponentSortOrder) {
-                    return 0;
-                } elseif ($firstComponentSortOrder < $secondComponentSortOrder) {
-                    return -1;
-                } else {
-                    return 1;
-                }
+                return (int)$firstComponent['sortOrder'] <=> (int)$secondComponent['sortOrder'];
             }
         );
         $declaredComponents = array_values($declaredComponents);