fix(item): auto order item when adding

Author: gaetan-hexadog

src/Traits/HasItems.php

@@ -8,45 +8,49 @@
 trait HasItems
 {
     /**
-     * The items collection.
+     * The items collection
      *
      * @var Collection
      */
     protected $items;
 
     /**
-     * Magic method to manipulate items Collection with ease.
+     * Add new item
      *
-     * @param string $method_name
-     * @param array  $args
+     * @param array $attributes
+     *
+     * @return Item
      */
-    public function __call($method_name, $args)
+    public function add(array $attributes = []): Item
     {
-        if (!method_exists($this, $method_name)) {
-            return call_user_func_array([$this->items, $method_name], $args);
+        $item = new Item($attributes, $this);
+
+        if (!array_key_exists('order', $attributes)) {
+            $item->order = count($this->items);
         }
-    }
 
-    /**
-     * Add new item.
-     */
-    public function add(array $attributes = []): Item
-    {
-        $this->items->push($item = new Item($attributes, $this));
+        $this->items->push($item);
 
         return $item;
     }
 
     /**
-     * Add new divider menu item.
+     * Add new divider menu item
+     *
+     * @param array $attributes
+     *
+     * @return Item
      */
     public function divider(array $attributes = []): Item
     {
         return $this->add(compact('attributes'))->asDivider();
     }
 
     /**
-     * Find item by key and value.
+     * Find item by key and value
+     *
+     * @param string $key
+     * @param string $value
      *
      * @return mixed
      */
@@ -58,7 +62,10 @@ public function findBy(string $key, string $value): ?Item
     }
 
     /**
-     * Find item by given title or add it.
+     * Find item by given title or add it
+     *
+     * @param string   $title
+     * @param array    $attributes
      *
      * @return mixed
      */
@@ -72,15 +79,20 @@ public function findByTitleOrAdd(string $title, array $attributes = []): ?Item
     }
 
     /**
-     * Add new header menu item.
+     * Add new header menu item
+     *
+     * @param string $title
+     * @param array  $attributes
+     *
+     * @return Item
      */
     public function header(string $title, array $attributes = []): Item
     {
         return $this->add(compact('title', 'attributes'))->asHeader();
     }
 
     /**
-     * Get items.
+     * Get items
      *
      * @return Collection
      */
@@ -92,20 +104,45 @@ public function items()
     }
 
     /**
-     * Register new menu item using registered route.
+     * Register new menu item using registered route
      *
      * @param mixed $route
+     * @param string $title
+     * @param array  $attributes
+     *
+     * @return Item
      */
     public function route($route, string $title, array $attributes = []): Item
     {
         return $this->add(compact('route', 'title', 'attributes'));
     }
 
     /**
-     * Register new menu item using url.
+     * Register new menu item using url
+     *
+     * @param string $url
+     * @param string $title
+     * @param array  $attributes
+     *
+     * @return Item
      */
     public function url(string $url, string $title, array $attributes = []): Item
     {
         return $this->add(compact('url', 'title', 'attributes'));
     }
+
+    /**
+     * Magic method to manipulate items Collection with ease
+     *
+     * @param string $method_name
+     * @param array $args
+     *
+     * @return void
+     */
+    public function __call($method_name, $args)
+    {
+        if (!method_exists($this, $method_name)) {
+            return call_user_func_array([$this->items, $method_name], $args);
+        }
+    }
 }