Merge branch '2.8' into 3.4

* 2.8:
  stop using the deprecated @method annotation

Author: javiereguiluz

quick_tour/the_controller.rst

@@ -152,7 +152,6 @@ To restrict the formats supported by a given action, use the ``requirements``
 option of the ``@Route()`` annotation::
 
     // src/AppBundle/Controller/DefaultController.php
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
     use Symfony\Component\Routing\Annotation\Route;
 
     // ...

routing/requirements.rst

@@ -211,7 +211,7 @@ accomplished with the following route configuration:
             }
 
             /**
-             * @Route("/api/posts/{id}", methods="PUT")
+             * @Route("/api/posts/{id}", methods={"PUT"})
              */
             public function editAction($id)
             {

service_container/autowiring.rst

@@ -128,7 +128,7 @@ Now, you can use the ``TwitterClient`` service immediately in a controller::
     class DefaultController extends Controller
     {
         /**
-         * @Route("/tweet")
+         * @Route("/tweet", methods={"POST"})
          */
         public function tweetAction()
         {