Merge pull request #941 from FriendsOfSymfony/options_route_generation

fixed handling of OPTIONS in route generation

Author: lsmith77

Routing/Loader/Reader/RestActionReader.php

@@ -307,6 +307,8 @@ private function getHttpMethodAndResourcesFromMethod(\ReflectionMethod $method,
                 $isInflectable = ($resourcePluralized != $resource[count($resource) - 1]);
                 $resource[count($resource)-1] = $resourcePluralized;
             }
+        } elseif ('options' === $httpMethod && !empty($resource) && 's' === substr($method->getName(), -1)) {
+            $resource[count($resource)-1] = $this->inflector->pluralize(end($resource));
         }
 
         $resources = array_merge($resource, $resources);

Tests/Fixtures/Controller/ArticleController.php

@@ -17,8 +17,8 @@
 
 class ArticleController extends FosRestController implements ClassResourceInterface
 {
-    public function optionsAction()
-    {} // [OPTION] /articles
+    public function optionsActions()
+    {} // [OPTIONS] /articles
 
     public function cgetAction()
     {} // [GET] /articles

Tests/Fixtures/Etalon/resource_controller.yml

@@ -1,3 +1,8 @@
+options_articles:
+  method:     OPTIONS
+  pattern:    /articles.{_format}
+  controller: ::optionsAction
+
 get_articles:
   method:     GET
   pattern:    /articles.{_format}