diff --git a/lib/internal/Magento/Framework/App/RouterList.php b/lib/internal/Magento/Framework/App/RouterList.php index ae14f1ad3d2f4..75ea8766c960f 100644 --- a/lib/internal/Magento/Framework/App/RouterList.php +++ b/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']; } } diff --git a/lib/internal/Magento/Framework/Config/Reader.php b/lib/internal/Magento/Framework/Config/Reader.php index c7ec5f3274366..9ace14ad9d8db 100644 --- a/lib/internal/Magento/Framework/Config/Reader.php +++ b/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']; } ); diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/CompositeReader.php b/lib/internal/Magento/Framework/MessageQueue/Config/CompositeReader.php index 370096172865b..10e0a6f601979 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Config/CompositeReader.php +++ b/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; diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php index be375c1ac817d..b8286c33dca0a 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php +++ b/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; diff --git a/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php b/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php index c99170b4112c8..b56b6361b36f1 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Helper/Composite.php +++ b/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);