tweak route construction so uri is parsed with prefix and accounts for bindings

Author: taylorotwell

Diff for: src/Illuminate/Routing/Route.php

@@ -144,30 +144,15 @@ class Route
      */
     public function __construct($methods, $uri, $action)
     {
-        $this->uri = $this->parseUri($uri);
+        $this->uri = $uri;
         $this->methods = (array) $methods;
         $this->action = $this->parseAction($action);
 
         if (in_array('GET', $this->methods) && ! in_array('HEAD', $this->methods)) {
             $this->methods[] = 'HEAD';
         }
 
-        if (isset($this->action['prefix'])) {
-            $this->prefix($this->action['prefix']);
-        }
-    }
-
-    /**
-     * Parse the route URI and normalize / store any implicit binding fields.
-     *
-     * @param  string  $uri
-     * @return string
-     */
-    protected function parseUri($uri)
-    {
-        return tap(RouteUri::parse($uri), function ($uri) {
-            $this->bindingFields = $uri->bindingFields;
-        })->uri;
+        $this->prefix($this->action['prefix'] ?? '');
     }
 
     /**
@@ -703,9 +688,7 @@ public function prefix($prefix)
     {
         $uri = rtrim($prefix, '/').'/'.ltrim($this->uri, '/');
 
-        $this->uri = trim($uri, '/');
-
-        return $this;
+        return $this->setUri(trim($uri, '/'));
     }
 
     /**
@@ -726,11 +709,26 @@ public function uri()
      */
     public function setUri($uri)
     {
-        $this->uri = $uri;
+        $this->uri = $this->parseUri($uri);
 
         return $this;
     }
 
+    /**
+     * Parse the route URI and normalize / store any implicit binding fields.
+     *
+     * @param  string  $uri
+     * @return string
+     */
+    protected function parseUri($uri)
+    {
+        $this->bindingFields = [];
+
+        return tap(RouteUri::parse($uri), function ($uri) {
+            $this->bindingFields = $uri->bindingFields;
+        })->uri;
+    }
+
     /**
      * Get the name of the route instance.
      *

Diff for: tests/Routing/RoutingRouteTest.php

@@ -790,6 +790,15 @@ public function testWherePatternsProperlyFilter()
         $this->assertFalse($route->matches($request));
     }
 
+    public function testRoutePrefixParameterParsing()
+    {
+        $route = new Route('GET', '/foo', ['prefix' => 'profiles/{user:username}/portfolios', 'uses' => function () {
+            //
+        }]);
+
+        $this->assertEquals('profiles/{user}/portfolios/foo', $route->uri());
+    }
+
     public function testDotDoesNotMatchEverything()
     {
         $route = new Route('GET', 'images/{id}.{ext}', function () {