Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions src/Illuminate/Routing/RouteUrlGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,14 @@ protected function formatParameters(Route $route, $parameters)
unset($parameters[$name]);

continue;
} elseif (! isset($this->defaultParameters[$name]) && ! isset($optionalParameters[$name])) {
// No named parameter or default value for a required parameter, try to match to positional parameter below...
array_push($requiredRouteParametersWithoutDefaultsOrNamedParameters, $name);
} else {
$bindingField = $route->bindingFieldFor($name);
$defaultParameterKey = $bindingField ? "$name:$bindingField" : $name;

if (! isset($this->defaultParameters[$defaultParameterKey]) && ! isset($optionalParameters[$name])) {
// No named parameter or default value for a required parameter, try to match to positional parameter below...
array_push($requiredRouteParametersWithoutDefaultsOrNamedParameters, $name);
}
}

$namedParameters[$name] = '';
Expand Down
18 changes: 18 additions & 0 deletions tests/Routing/RoutingUrlGeneratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1066,6 +1066,24 @@ public function testComplexRouteGenerationWithDefaultsAndBindingFields()
$url->route('tenantSlugPost', ['post' => $keyParam('concretePost')]),
);

// Repeat the two assertions above without the 'tenant' default (without slug)
$url->defaults(['tenant' => null]);

// tenantSlugPost: Tenant (with default) omitted, post passed positionally, with the default value for 'tenant' (without slug) removed
$this->assertSame(
'https://www.foo.com/tenantSlugPost/defaultTenantSlug/concretePost',
$url->route('tenantSlugPost', [$keyParam('concretePost')]),
);

// tenantSlugPost: Tenant (with default) omitted, post passed using key, with the default value for 'tenant' (without slug) removed
$this->assertSame(
'https://www.foo.com/tenantSlugPost/defaultTenantSlug/concretePost',
$url->route('tenantSlugPost', ['post' => $keyParam('concretePost')]),
);

// Revert the default value for the tenant parameter back
$url->defaults(['tenant' => 'defaultTenant']);

/**
* One parameter with a default value, one without a default value.
*
Expand Down