Merge pull request #16352 from shadoWalker89/resource_basename

[5.3] A resource can define the route basename
laravel · Nov 15, 2016 · 6c90b2d · 6c90b2d
2 parents ef11bd7 + 2742119
commit 6c90b2d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/Illuminate/Routing/ResourceRegistrar.php b/src/Illuminate/Routing/ResourceRegistrar.php
@@ -209,8 +209,12 @@ protected function getResourceAction($resource, $controller, $method, $options)
      */
     protected function getResourceName($resource, $method, $options)
     {
-        if (isset($options['names'][$method])) {
-            return $options['names'][$method];
+        if (isset($options['names'])) {
+            if (is_string($options['names'])) {
+                $resource = $options['names'];
+            } elseif (isset($options['names'][$method])) {
+                return $options['names'][$method];
+            }
         }
 
         // If a global prefix has been assigned to all names for this resource, we will

diff --git a/tests/Routing/RoutingRouteTest.php b/tests/Routing/RoutingRouteTest.php
@@ -1008,6 +1008,17 @@ public function testResourceRouteNaming()
 
         $this->assertTrue($router->getRoutes()->hasNamedRoute('foo'));
         $this->assertTrue($router->getRoutes()->hasNamedRoute('bar'));
+
+        $router = $this->getRouter();
+        $router->resource('foo', 'FooController', ['names' => 'bar']);
+
+        $this->assertTrue($router->getRoutes()->hasNamedRoute('bar.index'));
+        $this->assertTrue($router->getRoutes()->hasNamedRoute('bar.show'));
+        $this->assertTrue($router->getRoutes()->hasNamedRoute('bar.create'));
+        $this->assertTrue($router->getRoutes()->hasNamedRoute('bar.store'));
+        $this->assertTrue($router->getRoutes()->hasNamedRoute('bar.edit'));
+        $this->assertTrue($router->getRoutes()->hasNamedRoute('bar.update'));
+        $this->assertTrue($router->getRoutes()->hasNamedRoute('bar.destroy'));
     }
 
     public function testRouterFiresRoutedEvent()