allow string for parameters (#20531)

laravel · Aug 12, 2017 · e44933a · e44933a
1 parent d7552bb
commit e44933a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Illuminate/Routing/PendingResourceRegistration.php b/src/Illuminate/Routing/PendingResourceRegistration.php
@@ -105,10 +105,10 @@ public function name($method, $name)
     /**
      * Override the route parameter names.
      *
-     * @param  array  $parameters
+     * @param  array|string  $parameters
      * @return \Illuminate\Routing\PendingResourceRegistration
      */
-    public function parameters(array $parameters)
+    public function parameters($parameters)
     {
         $this->options['parameters'] = $parameters;
 

diff --git a/tests/Routing/RoutingRouteTest.php b/tests/Routing/RoutingRouteTest.php
@@ -1118,7 +1118,7 @@ public function testResourceRoutingParameters()
 
         $router = $this->getRouter();
         $router->resource('foos', 'FooController', ['parameters' => 'singular']);
-        $router->resource('foos.bars', 'FooController', ['parameters' => 'singular']);
+        $router->resource('foos.bars', 'FooController')->parameters('singular');
         $routes = $router->getRoutes();
         $routes = $routes->getRoutes();
 
@@ -1131,6 +1131,13 @@ public function testResourceRoutingParameters()
         $routes = $routes->getRoutes();
 
         $this->assertEquals('foos/{foo}/bars/{bar}', $routes[3]->uri());
+
+        $router = $this->getRouter();
+        $router->resource('foos.bars', 'FooController')->parameter('foos', 'foo')->parameter('bars', 'bar');
+        $routes = $router->getRoutes();
+        $routes = $routes->getRoutes();
+
+        $this->assertEquals('foos/{foo}/bars/{bar}', $routes[3]->uri());
     }
 
     public function testResourceRouteNaming()