Merge pull request #736 from Leone/fix_missing-adminSortIndex-key

Check if adminSoertIndex key exists
Smile-SA · Feb 13, 2018 · a1fd0e3 · a1fd0e3
2 parents 6ba08bd + 28b8a48
commit a1fd0e3
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/src/module-elasticsuite-catalog/Model/Layer/Filter/Attribute.php b/src/module-elasticsuite-catalog/Model/Layer/Filter/Attribute.php
@@ -267,11 +267,30 @@ private function addOptionsData(array $items)
                 }
             }
 
-            usort($items, function ($item1, $item2) {
-                return $item1['adminSortIndex'] <= $item2['adminSortIndex'] ? -1 : 1;
-            });
+            $items = $this->sortOptionsData($items);
         }
 
         return $items;
     }
+
+    /**
+     * Sort items by adminSortIndex key.
+     *
+     * @param array $items to be sorted.
+     *
+     * @return array
+     */
+    private function sortOptionsData(array $items)
+    {
+
+        usort($items, function ($item1, $item2) {
+            if (!isset($item1['adminSortIndex']) or !isset($item2['adminSortIndex'])) {
+                return 0;
+            }
+
+            return $item1['adminSortIndex'] <= $item2['adminSortIndex'] ? -1 : 1;
+        });
+
+        return $items;
+    }
 }