Merge pull request #16707 from JosephSilber/route-group-path

[5.4] Allow route groups to be loaded from a file directly

src/Illuminate/Contracts/Routing/Registrar.php

@@ -2,8 +2,6 @@
 
 namespace Illuminate\Contracts\Routing;
 
-use Closure;
-
 interface Registrar
 {
     /**
@@ -83,11 +81,11 @@ public function resource($name, $controller, array $options = []);
     /**
      * Create a route group with shared attributes.
      *
-     * @param  array     $attributes
-     * @param  \Closure  $callback
+     * @param  array  $attributes
+     * @param  \Closure|string  $routes
      * @return void
      */
-    public function group(array $attributes, Closure $callback);
+    public function group(array $attributes, $routes);
 
     /**
      * Substitute the route bindings onto the route.

src/Illuminate/Routing/Router.php

@@ -320,17 +320,23 @@ public function auth()
      * Create a route group with shared attributes.
      *
      * @param  array  $attributes
-     * @param  \Closure  $callback
+     * @param  \Closure|string  $routes
      * @return void
      */
-    public function group(array $attributes, Closure $callback)
+    public function group(array $attributes, $routes)
     {
         $this->updateGroupStack($attributes);
 
-        // Once we have updated the group stack, we will execute the user Closure and
-        // merge in the groups attributes when the route is created. After we have
-        // run the callback, we will pop the attributes off of this group stack.
-        call_user_func($callback, $this);
+        // Once we have updated the group stack, we'll load the provided routes and
+        // merge in the group's attributes when the routes are created. After we
+        // have created the routes, we will pop the attributes off the stack.
+        if ($routes instanceof Closure) {
+            $routes($this);
+        } else {
+            $router = $this;
+
+            require $routes;
+        }
 
         array_pop($this->groupStack);
     }

tests/Routing/RoutingRouteTest.php

@@ -729,6 +729,18 @@ public function testRouteGrouping()
         $this->assertEquals('foo', $routes[0]->getPrefix());
     }
 
+    public function testRouteGroupingFromFile()
+    {
+        $router = $this->getRouter();
+        $router->group(['prefix' => 'api'], __DIR__.'/fixtures/routes.php');
+
+        $route = last($router->getRoutes()->get());
+        $request = Request::create('api/users', 'GET');
+
+        $this->assertTrue($route->matches($request));
+        $this->assertEquals('all-users', $route->bind($request)->run($request));
+    }
+
     public function testRouteGroupingWithAs()
     {
         $router = $this->getRouter();

tests/Routing/fixtures/routes.php

@@ -0,0 +1,5 @@
+<?php
+
+$router->get('users', function () {
+    return 'all-users';
+});