fix bug when bina route name

Author: xujiajun

src/Route.php

@@ -1,6 +1,11 @@
 <?php
 namespace TastRouter;
 
+/**
+ * Class Route
+ * @package TastRouter
+ * @author xujiajun [github.com/xujiajun]
+ */
 class Route
 {
     private $url;

src/RouteCollection.php

@@ -2,6 +2,10 @@
 
 namespace TastRouter;
 
+/**
+ * Class RouteCollection
+ * @package TastRouter
+ */
 class RouteCollection extends \SplObjectStorage
 {
     /**

src/Router.php

@@ -1,11 +1,10 @@
 <?php
 namespace TastRouter;
 
-
 /**
  * Class Router
  * @package TastRouter
- * @author xujiajun
+ * @author xujiajun [github.com/xujiajun]
  */
 class Router
 {
@@ -28,6 +27,19 @@ public function __construct(RouteCollection $routeCollection)
         $this->routes = $routeCollection;
     }
 
+    /**
+     * @return array|RouteCollection
+     */
+    public function getRoutes()
+    {
+        return $this->routes;
+    }
+
+    public function setRoutes(RouteCollection $routes)
+    {
+        $this->routes = $routes;
+    }
+
     /**
      * @return mixed
      */
@@ -44,6 +56,7 @@ public function matchCurrentRequest()
         if (($pos = strpos($requestUrl, '?')) !== false) {
             $requestUrl = substr($requestUrl, 0, $pos);
         }
+
         return $this->match($requestUrl, $requestMethod);
     }
 
@@ -57,6 +70,8 @@ public function match($requestUrl, $requestMethod = 'GET')
     {
         $isRegexp = false;
 
+        $this->_bind();
+
         foreach ($this->routes->all() as $route) {
 
             if (strpos($requestUrl, $route->getNamekey(), 0)) {
@@ -68,11 +83,6 @@ public function match($requestUrl, $requestMethod = 'GET')
             }
 
             $url = $route->getUrl();
-            //bind name
-            $name = $route->getName();
-            if (!empty($name)) {
-                $this->namedroute[$name] = $route;
-            }
 
             if (in_array($requestUrl, (array)$url)) {
                 $route->dispatch();
@@ -88,7 +98,6 @@ public function match($requestUrl, $requestMethod = 'GET')
             $route->dispatch();
             return $route;
         }
-
         return null;
     }
 
@@ -107,14 +116,12 @@ public function generate($routeName, array $parameters = [])
         $url = $this->namedroute[$routeName]->getUrl();
         preg_match_all('/\/{\w+}\/?/', $url, $matches);
         $matches = $matches[0];
-
         if (!empty($matches)) {
             $matches[count($matches) - 1] .= '/';
             return preg_replace($matches, array_reverse($parameters), $url);
         }
 
         return $url;
-
     }
 
     /**
@@ -142,6 +149,17 @@ public static function parseConfig(array $config)
         return new Router($collection);
     }
 
+    //bind name
+    private function _bind()
+    {
+        foreach ($this->routes->all() as $route) {
+            $name = $route->getName();
+            if (!empty($name)) {
+                $this->namedroute[$name] = $route;
+            }
+        }
+    }
+
     /**
      * @param $url
      * @param $requestUrl