fix regression with handling of methods in Route annotations

Author: lsmith77

Controller/Annotations/Route.php

@@ -23,7 +23,9 @@ public function __construct(array $data)
     {
         parent::__construct($data);
 
-        $this->setMethods((array) $this->getMethod());
+        if (!$this->getMethods()) {
+            $this->setMethods((array) $this->getMethod());
+        }
     }
 
     /**

Tests/Fixtures/Controller/AnnotatedConditionalUsersController.php

@@ -71,10 +71,10 @@ public function rateUserAction($slug)
     {} // [POST]    /users/{slug}/rate
 
     /**
-     * @Route("/users/{slug}/rate_comment/{id}", requirements={"slug" = "[a-z]+", "id" = "\d+"}, methods={"PATCH, POST"})
+     * @Route("/users/{slug}/rate_comment/{id}", requirements={"slug" = "[a-z]+", "id" = "\d+"}, methods={"PATCH", "POST"})
      */
     public function rateUserCommentAction($slug, $id)
-    {} // [POST]     /users/{slug}/rate_comment/{id}
+    {} // [PATCH, POST]     /users/{slug}/rate_comment/{id}
 
     /**
      * @Get

Tests/Fixtures/Controller/AnnotatedUsersController.php

@@ -77,10 +77,10 @@ public function rateUserAction($slug)
     {} // [POST]    /users/{slug}/rate
 
     /**
-     * @Route("/users/{slug}/rate_comment/{id}", requirements={"slug" = "[a-z]+", "id" = "\d+"})
+     * @Route("/users/{slug}/rate_comment/{id}", requirements={"slug" = "[a-z]+", "id" = "\d+"}, methods={"PATCH", "POST"})
      */
     public function rateUserCommentAction($slug, $id)
-    {} // [POST]     /users/{slug}/rate_comment/{id}
+    {} // [PATCH, POST]     /users/{slug}/rate_comment/{id}
 
     /**
      * @Get

Tests/Fixtures/Etalon/annotated_conditional_controller.yml

@@ -36,7 +36,7 @@ rate_user_comment:
   path:      /users/{slug}/rate_comment/{id}.{_format}
   controller:   ::rateUserCommentAction
   requirements: {slug: '[a-z]+', id: '\d+'}
-  methods: [PATCH]
+  methods: [PATCH, POST]
 
 bget_user:
   path:      /users/{slug}/bget.{_format}