Merge 9f72b45 into 7671e51

kleijnweb · Mar 7, 2018 · dac8b6c · dac8b6c
2 parents 7671e51 + 9f72b45
commit dac8b6c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Routing/OpenApiRouteLoader.php b/src/Routing/OpenApiRouteLoader.php
@@ -199,9 +199,12 @@ private function createRouteId(string $resource, string $path, string $controlle
     {
         $controllerSegments = explode(':', $controllerKey);
 
-        $operationName = 'action';
         if (count($controllerSegments) === 2) {
             list(, $operationName) = $controllerSegments;
+        } else {
+            $className = basename(str_replace('\\', '/', $controllerKey));
+            // Convert class name to snake_case
+            $operationName = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $className));
         }
 
         $fileName       = pathinfo($resource, PATHINFO_FILENAME);

diff --git a/tests/unit/Routing/OpenApiRouteLoaderTest.php b/tests/unit/Routing/OpenApiRouteLoaderTest.php
@@ -239,7 +239,7 @@ public function canUseOperationIdAsInvokableControllerKey()
 
         $routes = $this->loader->load(self::DOCUMENT_PATH);
 
-        $actual = $routes->get('customname.path.a.action');
+        $actual = $routes->get('customname.path.a.invokable_controller');
         $this->assertNotNull($actual);
         $this->assertSame($expected, $actual->getDefault('_controller'));
     }