techdivision / import-category

src/Listeners/SortCategoryListener.php

Spacing +6 added lines, -9 removed lines

@@ -164,11 +164,9 @@ 
 
             // sort the main rows by the path, store_view_code and position
             // ATTENTION: we use uasort, because we NEED to preserve the keys
-            uasort($this->mainRows, function ($a, $b) {
+            uasort($this->mainRows, function($a, $b) {
                 return
-                    strcmp($a[ColumnKeys::PATH], $b[ColumnKeys::PATH]) ?:
-                    strcmp($a[ColumnKeys::STORE_VIEW_CODE], $b[ColumnKeys::STORE_VIEW_CODE]) ?:
-                    strcmp($a[ColumnKeys::POSITION], $b[ColumnKeys::POSITION]);
+                    strcmp($a[ColumnKeys::PATH], $b[ColumnKeys::PATH]) ?: strcmp($a[ColumnKeys::STORE_VIEW_CODE], $b[ColumnKeys::STORE_VIEW_CODE]) ?: strcmp($a[ColumnKeys::POSITION], $b[ColumnKeys::POSITION]);
             });
 
             // update the position of the categories and the categories on the same level
@@ -181,10 +179,9 @@ 
             $this->artefacts = array_merge(array_values($this->artefacts), $this->storeViewRows);
 
             // sort the artefacts again, because we want to export them in the expected order
-            usort($this->artefacts, function ($a, $b) {
+            usort($this->artefacts, function($a, $b) {
                 return
-                    strcmp($a[ColumnKeys::PATH], $b[ColumnKeys::PATH]) ?:
-                    strcmp($a[ColumnKeys::STORE_VIEW_CODE], $b[ColumnKeys::STORE_VIEW_CODE]);
+                    strcmp($a[ColumnKeys::PATH], $b[ColumnKeys::PATH]) ?: strcmp($a[ColumnKeys::STORE_VIEW_CODE], $b[ColumnKeys::STORE_VIEW_CODE]);
             });
 
             // replace the artefacts to be exported later
@@ -284,7 +281,7 @@ 
         }
 
         // sor the categories by their position and KEEP the keys
-        uasort($categoriesOnSameLevel, function ($a, $b) {
+        uasort($categoriesOnSameLevel, function($a, $b) {
             // return 0 when the position is equal (should never happen)
             if ($a[MemberNames::POSITION] == $b[MemberNames::POSITION]) {
                 return 0;
@@ -432,7 +429,7 @@ 
         // iterate over the IDs
         foreach ($ids as $id) {
             // load the category with the actual ID
-            $existingCategories = array_filter($this->existingCategories, function ($existingCategory) use ($id) {
+            $existingCategories = array_filter($this->existingCategories, function($existingCategory) use ($id) {
                 return (int) $existingCategory[MemberNames::ENTITY_ID] === (int) $id;
             });