Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit e091d3c9716e · 2018-09-07T12:02:02.000+02:00
* 3.4: stop using the deprecated @method annotation
diff --git a/routing/requirements.rst b/routing/requirements.rst
@@ -207,7 +207,7 @@ accomplished with the following route configuration:
             }
 
             /**
-             * @Route("/api/posts/{id}", methods="PUT")
+             * @Route("/api/posts/{id}", methods={"PUT"})
              */
             public function edit($id)
             {
diff --git a/service_container/autowiring.rst b/service_container/autowiring.rst
@@ -131,7 +131,7 @@ Now, you can use the ``TwitterClient`` service immediately in a controller::
     class DefaultController extends AbstractController
     {
         /**
-         * @Route("/tweet")
+         * @Route("/tweet", methods={"POST"})
          */
         public function tweet()
         {

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ accomplished with the following route configuration:`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`/**`
`210`		`- * @Route("/api/posts/{id}", methods="PUT")`
	`210`	`+ * @Route("/api/posts/{id}", methods={"PUT"})`
`211`	`211`	`*/`
`212`	`212`	`public function edit($id)`
`213`	`213`	`{`
Original file line number	Diff line number	Diff line change
@@ -131,7 +131,7 @@ Now, you can use the ``TwitterClient`` service immediately in a controller::
`131`	`131`	`class DefaultController extends AbstractController`
`132`	`132`	`{`
`133`	`133`	`/**`
`134`		`- * @Route("/tweet")`
	`134`	`+ * @Route("/tweet", methods={"POST"})`
`135`	`135`	`*/`
`136`	`136`	`public function tweet()`
`137`	`137`	`{`