Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Accept string as parameter in Route::resource()->parameters() #20531

Merged
merged 1 commit into from
Aug 12, 2017
Merged

Accept string as parameter in Route::resource()->parameters() #20531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Illuminate/Routing/PendingResourceRegistration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
9 changes: 8 additions & 1 deletion tests/Routing/RoutingRouteTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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()
Expand Down