Merge branch '2.8' into 3.4

javiereguiluz · javiereguiluz · commit 795febe01d7c · 2018-09-07T12:00:26.000+02:00
* 2.8: stop using the deprecated @method annotation
diff --git a/quick_tour/the_controller.rst b/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;
 
     // ...
diff --git a/routing/requirements.rst b/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)
             {
diff --git a/service_container/autowiring.rst b/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()
         {

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ accomplished with the following route configuration:`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`/**`
`214`		`- * @Route("/api/posts/{id}", methods="PUT")`
	`214`	`+ * @Route("/api/posts/{id}", methods={"PUT"})`
`215`	`215`	`*/`
`216`	`216`	`public function editAction($id)`
`217`	`217`	`{`
Original file line number	Diff line number	Diff line change
@@ -128,7 +128,7 @@ Now, you can use the ``TwitterClient`` service immediately in a controller::
`128`	`128`	`class DefaultController extends Controller`
`129`	`129`	`{`
`130`	`130`	`/**`
`131`		`- * @Route("/tweet")`
	`131`	`+ * @Route("/tweet", methods={"POST"})`
`132`	`132`	`*/`
`133`	`133`	`public function tweetAction()`
`134`	`134`	`{`