Merge branch 'issue-7726' into master.

Fix RouteBuilder::resources() with dasherize option.

src/Routing/RouteBuilder.php

@@ -344,7 +344,7 @@ class RouteBuilder
         }
 
         if (is_callable($callback)) {
-            $idName = Inflector::singularize($urlName) . '_id';
+            $idName = Inflector::singularize(str_replace('-', '_', $urlName)) . '_id';
             $path = '/' . $urlName . '/:' . $idName;
             $this->scope($path, [], $callback);
         }

tests/TestCase/Routing/RouteBuilderTest.php

@@ -388,6 +388,26 @@ class RouteBuilderTest extends TestCase
     }
 
     /**
+     * Test connecting nested resources with the inflection option
+     *
+     * @return void
+     */
+    public function testResourcesNestedInflection()
+    {
+        $routes = new RouteBuilder($this->collection, '/api');
+        $routes->resources('NetworkObjects', ['inflect' => 'dasherize'], function($routes) {
+            $routes->resources('Attributes');
+        });
+
+        $all = $this->collection->routes();
+        $this->assertCount(10, $all);
+
+        $this->assertEquals('/api/network-objects', $all[0]->template);
+        $this->assertEquals('/api/network-objects/:id', $all[2]->template);
+        $this->assertEquals('/api/network-objects/:network_object_id/attributes', $all[5]->template);
+    }
+
+    /**
      * Test connecting resources with additional mappings
      *
      * @return void