Merge pull request #8 from nurmanhabib/feature/nav-pattern-array

Change default pattern nav is array

Author: nurmanhabib

src/Activators/LinkActivator.php

@@ -25,32 +25,65 @@ public function isActive(Nav $nav)
 
     protected function matchPath(Nav $nav)
     {
-        $pathPattern = trim(parse_url($this->uri, PHP_URL_PATH), '/') . '/';
-        $navPattern = ltrim($nav->getPattern(), '/');
+        $currentPath = parse_url($this->uri, PHP_URL_PATH);
 
-        if (empty($navPattern)) {
-            return false;
+        $match = null;
+
+        foreach ($nav->getPattern() as $navPattern) {
+            if (empty($navPattern)) {
+                continue;
+            }
+
+            $navPath = parse_url($navPattern, PHP_URL_PATH);
+            $match = strpos($currentPath, $navPath) !== false || fnmatch($navPath, $currentPath);
+
+            if ($match) {
+                break;
+            }
         }
 
-        return strpos($pathPattern, $navPattern) !== false || fnmatch($navPattern, $pathPattern);
+        return $match === true;
     }
 
     protected function matchQuery(Nav $nav)
     {
         $expectedQuery = parse_url($this->uri, PHP_URL_QUERY);
-        $navQuery = parse_url($nav->getPattern(), PHP_URL_QUERY);
 
         parse_str($expectedQuery, $expectedQuery);
-        parse_str($navQuery, $navQuery);
 
-        return empty(array_diff($navQuery, $expectedQuery));
+        $match = null;
+
+        foreach ($nav->getPattern() as $navPattern) {
+            $navQuery = parse_url($navPattern, PHP_URL_QUERY);
+
+            parse_str($navQuery, $navQuery);
+
+            $match = empty(array_diff($navQuery, $expectedQuery));
+
+            if ($match) {
+                break;
+            }
+        }
+
+        return $match === true;
     }
 
     protected function matchFragment(Nav $nav)
     {
         $expectedFragment = parse_url($this->uri, PHP_URL_FRAGMENT);
-        $navFragment = parse_url($nav->getPattern(), PHP_URL_FRAGMENT);
 
-        return $expectedFragment === $navFragment;
+        $match = null;
+
+        foreach ($nav->getPattern() as $navPattern) {
+            $navFragment = parse_url($navPattern, PHP_URL_FRAGMENT);
+
+            $match = $expectedFragment === $navFragment;
+
+            if ($match) {
+                break;
+            }
+        }
+
+        return $match === true;
     }
 }

src/Items/Nav.php

@@ -58,7 +58,7 @@ public function getChild();
     public function setChild(NavCollection $child);
 
     /**
-     * @return string
+     * @return array
      */
     public function getPattern();
 

src/Items/NavItem.php

@@ -13,7 +13,7 @@ abstract class NavItem implements Nav
 
     protected $visible = true;
 
-    protected $pattern;
+    protected $patterns = [];
 
     abstract public function getText();
 
@@ -79,18 +79,31 @@ public function add(Nav $item)
 
     public function match($pattern)
     {
-        $this->pattern = $pattern;
+        if (is_array($pattern)) {
+            return $this->matches($pattern);
+        }
+
+        $this->patterns[] = '/' . ltrim($pattern, '/');
+
+        return $this;
+    }
+
+    public function matches(array $patterns = [])
+    {
+        foreach ($patterns as $pattern) {
+            $this->match((string)$pattern);
+        }
 
         return $this;
     }
 
     public function getPattern()
     {
-        if (empty($this->pattern)) {
-            $this->pattern = parse_url($this->getUrl(), PHP_URL_PATH);
+        if (empty($this->patterns)) {
+            $this->match(parse_url($this->getUrl(), PHP_URL_PATH));
         }
 
-        return $this->pattern;
+        return $this->patterns;
     }
 
     public function toJson($options = 0)

src/Items/NavSeparator.php

@@ -56,7 +56,7 @@ public function add(Nav $nav)
 
     public function getPattern()
     {
-        return '';
+        return [];
     }
 
     public function getType()