Correct $uri when ['prefix' => ''] and ['prefix' => '/'].

jumilla · jumilla · commit ae73cf1e0e84 · 2015-06-10T07:35:38.000+09:00
diff --git a/src/Application.php b/src/Application.php
@@ -911,16 +911,16 @@ public function addRoute($method, $uri, $action)
     {
         $action = $this->parseAction($action);
 
-        $uri = $uri === '/' ? $uri : '/'.trim($uri, '/');
-
         if (isset($this->groupAttributes)) {
             if (isset($this->groupAttributes['prefix'])) {
-                $uri = rtrim('/'.trim($this->groupAttributes['prefix'], '/').$uri, '/');
+                $uri = trim($this->groupAttributes['prefix'], '/').'/'.trim($uri, '/');
             }
 
             $action = $this->mergeGroupAttributes($action);
         }
 
+        $uri = '/'.trim($uri, '/');
+
         if (isset($action['as'])) {
             $this->namedRoutes[$action['as']] = $uri;
         }

Original file line number	Diff line number	Diff line change
`@@ -911,16 +911,16 @@ public function addRoute($method, $uri, $action)`
`911`	`911`	`{`
`912`	`912`	`$action = $this->parseAction($action);`
`913`	`913`
`914`		`- $uri = $uri === '/' ? $uri : '/'.trim($uri, '/');`
`915`		`-`
`916`	`914`	`if (isset($this->groupAttributes)) {`
`917`	`915`	`if (isset($this->groupAttributes['prefix'])) {`
`918`		`- $uri = rtrim('/'.trim($this->groupAttributes['prefix'], '/').$uri, '/');`
	`916`	`+ $uri = trim($this->groupAttributes['prefix'], '/').'/'.trim($uri, '/');`
`919`	`917`	`}`
`920`	`918`
`921`	`919`	`$action = $this->mergeGroupAttributes($action);`
`922`	`920`	`}`
`923`	`921`
	`922`	`+ $uri = '/'.trim($uri, '/');`
	`923`	`+`
`924`	`924`	`if (isset($action['as'])) {`
`925`	`925`	`$this->namedRoutes[$action['as']] = $uri;`
`926`	`926`	`}`