Update type hints and method signature in Item and Menu classes

salahhusa9 · Jun 27, 2024 · 64ef979 · 64ef979
1 parent ad0a79e
commit 64ef979
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Item.php b/src/Item.php
@@ -57,7 +57,7 @@ class Item
     public $submenu = [];
 
     /**
-     * @var string array
+     * @var string|array
      */
     public $gateName = null;
 
@@ -133,7 +133,7 @@ public function badge(string $badgeClass, string|Closure $badgeName)
         return $this;
     }
 
-    public function gate(string $gateName)
+    public function gate(...$gateName)
     {
         $this->gateName = $gateName;
 
@@ -237,7 +237,7 @@ public function hasActiveSubmenu($menu = null)
      */
     public function isActive()
     {
-        if (request()->routeIs($this->routeName) or request()->url() == $this->url) {
+        if (request()->routeIs($this->routeName) or request()->fullUrl() == $this->url) {
             return true;
         } else { // check child routes
             return $this->hasActiveSubmenu(

diff --git a/src/Menu.php b/src/Menu.php
@@ -138,7 +138,7 @@ public function addItem(
      * @param  array  $options
      * @return \Salahhusa9\Menu\Menu
      */
-    public function addSubmenu($name, $callback, $options = [])
+    public function addSubmenu($name, $callback)
     {
         $item = new Item();
         $item->new(