Commit795febe

committed

Merge branch '2.8' into 3.4

* 2.8: stop using the deprecated@method annotation

2 parents7ae9c95 +8b4b418 commit795febeCopy full SHA for 795febe

File tree

-3

lines changed

-3

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -152,7 +152,6 @@ To restrict the formats supported by a given action, use the ``requirements``
`152`	`152`	option of the ``@Route()`` annotation::
`153`	`153`
`154`	`154`	`// src/AppBundle/Controller/DefaultController.php`
`155`		`- use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;`
`156`	`155`	`use Symfony\Component\Routing\Annotation\Route;`
`157`	`156`
`158`	`157`	`// ...`

Lines changed: 1 addition & 1 deletion

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`	`{`

Lines changed: 1 addition & 1 deletion

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`	`{`

Comments

(0)