minor #10150 stop using the deprecated @method annotation (xabbuh)

javiereguiluz · javiereguiluz · commit 8b4b418d7fe4 · 2018-09-07T11:54:23.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- stop using the deprecated @method annotation I think we should use the `@Route` annotation from the Routing component instead of the one from SensioFrameworkExtraBundle (fixes #10142). Commits ------- 4e1496d stop using the deprecated @method annotation
diff --git a/quick_tour/the_controller.rst b/quick_tour/the_controller.rst
@@ -115,7 +115,6 @@ as its default value::
 
     // src/AppBundle/Controller/DefaultController.php
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
     // ...
 
@@ -154,7 +153,6 @@ option of the ``@Route()`` annotation::
 
     // src/AppBundle/Controller/DefaultController.php
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
     // ...
 
diff --git a/routing/custom_route_loader.rst b/routing/custom_route_loader.rst
@@ -29,7 +29,7 @@ Loading Routes
 The routes in a Symfony application are loaded by the
 :class:`Symfony\\Bundle\\FrameworkBundle\\Routing\\DelegatingLoader`.
 This loader uses several other loaders (delegates) to load resources of
-different types, for instance YAML files or ``@Route`` and ``@Method`` annotations
+different types, for instance YAML files or ``@Route`` annotations
 in controller files. The specialized loaders implement
 :class:`Symfony\\Component\\Config\\Loader\\LoaderInterface`
 and therefore have two important methods:
diff --git a/routing/requirements.rst b/routing/requirements.rst
@@ -187,23 +187,20 @@ accomplished with the following route configuration:
         // src/AppBundle/Controller/BlogApiController.php
         namespace AppBundle\Controller;
 
-        use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
         // ...
 
         class BlogApiController extends Controller
         {
             /**
-             * @Route("/api/posts/{id}")
-             * @Method({"GET","HEAD"})
+             * @Route("/api/posts/{id}", methods={"GET","HEAD"})
              */
             public function showAction($id)
             {
                 // ... return a JSON response with the post
             }
 
             /**
-             * @Route("/api/posts/{id}")
-             * @Method("PUT")
+             * @Route("/api/posts/{id}", methods={"PUT"})
              */
             public function editAction($id)
             {
diff --git a/service_container/autowiring.rst b/service_container/autowiring.rst
@@ -106,7 +106,6 @@ Here is a typical controller using the ``twitter_client`` service::
     namespace Acme\Controller;
 
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
     use Symfony\Component\HttpFoundation\Request;
     use Symfony\Component\HttpFoundation\Response;
@@ -115,8 +114,7 @@ Here is a typical controller using the ``twitter_client`` service::
     class DefaultController extends Controller
     {
         /**
-         * @Route("/tweet")
-         * @Method("POST")
+         * @Route("/tweet", methods={"POST"})
          */
         public function tweetAction(Request $request)
         {
@@ -259,7 +257,6 @@ transformer::
     namespace Acme\Controller;
 
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
     use Symfony\Component\HttpFoundation\Request;
     use Symfony\Component\HttpFoundation\Response;
@@ -268,17 +265,15 @@ transformer::
     class DefaultController extends Controller
     {
         /**
-         * @Route("/tweet")
-         * @Method("POST")
+         * @Route("/tweet", methods={"POST"})
          */
         public function tweetAction(Request $request)
         {
             return $this->tweet($request, 'twitter_client');
         }
 
         /**
-         * @Route("/tweet-uppercase")
-         * @Method("POST")
+         * @Route("/tweet-uppercase", methods={"POST"})
          */
         public function tweetUppercaseAction(Request $request)
         {

Original file line number	Diff line number	Diff line change
`@@ -187,23 +187,20 @@ accomplished with the following route configuration:`
`187`	`187`	`// src/AppBundle/Controller/BlogApiController.php`
`188`	`188`	`namespace AppBundle\Controller;`
`189`	`189`
`190`		`- use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;`
`191`	`190`	`// ...`
`192`	`191`
`193`	`192`	`class BlogApiController extends Controller`
`194`	`193`	`{`
`195`	`194`	`/**`
`196`		`- * @Route("/api/posts/{id}")`
`197`		`- * @Method({"GET","HEAD"})`
	`195`	`+ * @Route("/api/posts/{id}", methods={"GET","HEAD"})`
`198`	`196`	`*/`
`199`	`197`	`public function showAction($id)`
`200`	`198`	`{`
`201`	`199`	`// ... return a JSON response with the post`
`202`	`200`	`}`
`203`	`201`
`204`	`202`	`/**`
`205`		`- * @Route("/api/posts/{id}")`
`206`		`- * @Method("PUT")`
	`203`	`+ * @Route("/api/posts/{id}", methods={"PUT"})`
`207`	`204`	`*/`
`208`	`205`	`public function editAction($id)`
`209`	`206`	`{`