Skip to content

Commit db3230e

Browse files
committed
simplify code
1 parent 33c16b0 commit db3230e

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

src/Illuminate/Routing/Route.php

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ public function bindParameters(Request $request)
551551
);
552552
}
553553

554-
return $this->parameters = $this->fillDefaults($this->replaceDefaults($params));
554+
return $this->parameters = $this->replaceDefaults($params);
555555
}
556556

557557
/**
@@ -612,17 +612,6 @@ protected function replaceDefaults(array $parameters)
612612
$value = isset($value) ? $value : Arr::get($this->defaults, $key);
613613
}
614614

615-
return $parameters;
616-
}
617-
618-
/**
619-
* Fill missing parameters with their defaults.
620-
*
621-
* @param array $parameters
622-
* @return array
623-
*/
624-
protected function fillDefaults(array $parameters)
625-
{
626615
foreach ($this->defaults as $key => $value) {
627616
if (! isset($parameters[$key])) {
628617
$parameters[$key] = $value;

0 commit comments

Comments
 (0)