Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ccb9c80

Browse files
taylorotwelltaylorotwell
committed
Merge branch '4.1-patch-1' of https://github.com/awellis13/framework into awellis13-4.1-patch-1
2 parents a286af0 + 9933484 commit ccb9c80

1 file changed

Lines changed: 13 additions & 14 deletions

File tree

‎src/Illuminate/Routing/Router.php‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ class Router implements HttpKernelInterface, RouteFiltererInterface {
115115
*
116116
* @param \Illuminate\Events\Dispatcher $events
117117
* @param \Illuminate\Container\Container $container
118-
* @return void
119118
*/
120119
public function __construct(Dispatcher $events, Container $container = null)
121120
{
@@ -356,12 +355,12 @@ protected function prefixedResource($name, $controller, array $options)
356355
// We need to extract the base resource from the resource name. Nested resources
357356
// are supported in the framework, but we need to know what name to use for a
358357
// place-holder on the route wildcards, which should be the base resources.
359-
$callback = function($me) use ($name, $controller, $options)
358+
$callback = function(Router $me) use ($name, $controller, $options)
360359
{
361360
$me->resource($name, $controller, $options);
362361
};
363362

364-
return $this->group(compact('prefix'), $callback);
363+
$this->group(compact('prefix'), $callback);
365364
}
366365

367366
/**
@@ -508,7 +507,7 @@ public function getResourceWildcard($value)
508507
* @param string $base
509508
* @param string $controller
510509
* @param array $options
511-
* @return void
510+
* @return Route
512511
*/
513512
protected function addResourceIndex($name, $base, $controller, $options)
514513
{
@@ -524,7 +523,7 @@ protected function addResourceIndex($name, $base, $controller, $options)
524523
* @param string $base
525524
* @param string $controller
526525
* @param array $options
527-
* @return void
526+
* @return Route
528527
*/
529528
protected function addResourceCreate($name, $base, $controller, $options)
530529
{
@@ -540,7 +539,7 @@ protected function addResourceCreate($name, $base, $controller, $options)
540539
* @param string $base
541540
* @param string $controller
542541
* @param array $options
543-
* @return void
542+
* @return Route
544543
*/
545544
protected function addResourceStore($name, $base, $controller, $options)
546545
{
@@ -556,7 +555,7 @@ protected function addResourceStore($name, $base, $controller, $options)
556555
* @param string $base
557556
* @param string $controller
558557
* @param array $options
559-
* @return void
558+
* @return Route
560559
*/
561560
protected function addResourceShow($name, $base, $controller, $options)
562561
{
@@ -572,7 +571,7 @@ protected function addResourceShow($name, $base, $controller, $options)
572571
* @param string $base
573572
* @param string $controller
574573
* @param array $options
575-
* @return void
574+
* @return Route
576575
*/
577576
protected function addResourceEdit($name, $base, $controller, $options)
578577
{
@@ -594,7 +593,7 @@ protected function addResourceUpdate($name, $base, $controller, $options)
594593
{
595594
$this->addPutResourceUpdate($name, $base, $controller, $options);
596595

597-
return $this->addPatchResourceUpdate($name, $base, $controller);
596+
$this->addPatchResourceUpdate($name, $base, $controller);
598597
}
599598

600599
/**
@@ -604,7 +603,7 @@ protected function addResourceUpdate($name, $base, $controller, $options)
604603
* @param string $base
605604
* @param string $controller
606605
* @param array $options
607-
* @return void
606+
* @return Route
608607
*/
609608
protected function addPutResourceUpdate($name, $base, $controller, $options)
610609
{
@@ -635,7 +634,7 @@ protected function addPatchResourceUpdate($name, $base, $controller)
635634
* @param string $base
636635
* @param string $controller
637636
* @param array $options
638-
* @return void
637+
* @return Route
639638
*/
640639
protected function addResourceDestroy($name, $base, $controller, $options)
641640
{
@@ -849,7 +848,7 @@ protected function routingToController($action)
849848
* Add a controller based route action to the action array.
850849
*
851850
* @param array|string $action
852-
* @return void
851+
* @return array
853852
*/
854853
protected function getControllerAction($action)
855854
{
@@ -1047,7 +1046,7 @@ public function after($callback)
10471046
* Register a new global filter with the router.
10481047
*
10491048
* @param string $filter
1050-
* @param mxied $callback
1049+
* @param mixed $callback
10511050
* @return void
10521051
*/
10531052
protected function addGlobalFilter($filter, $callback)
@@ -1111,7 +1110,7 @@ public function when($pattern, $name, $methods = null)
11111110
*/
11121111
public function model($key, $class, Closure $callback = null)
11131112
{
1114-
return $this->bind($key, function($value) use ($class, $callback)
1113+
$this->bind($key, function($value) use ($class, $callback)
11151114
{
11161115
if (is_null($value)) return null;
11171116

0 commit comments

Comments
 (0)