From 006b713bff4003be1179d174617b497b1069b5d2 Mon Sep 17 00:00:00 2001 From: Yonel Ceruto Date: Fri, 14 Jul 2017 17:40:09 -0400 Subject: [PATCH 1/2] Fix routing order formats http://symfony.com/doc/current/contributing/documentation/standards.html#formats: > * Routing: Annotations, YAML, XML, PHP Also, I've added `use` statement as `service` option belong to the `Route` annotation class of `FrameworkExtraBundle`. --- controller/service.rst | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/controller/service.rst b/controller/service.rst index 07f24635be5..a8bee5d2468 100644 --- a/controller/service.rst +++ b/controller/service.rst @@ -24,17 +24,11 @@ syntax: .. configuration-block:: - .. code-block:: yaml - - # app/config/routing.yml - hello: - path: /hello - defaults: { _controller: app.hello_controller:indexAction } - .. code-block:: php-annotations # src/AppBundle/Controller/HelloController.php - // ... + + use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; /** * @Route(service="app.hello_controller") @@ -44,6 +38,13 @@ syntax: // ... } + .. code-block:: yaml + + # app/config/routing.yml + hello: + path: /hello + defaults: { _controller: app.hello_controller:indexAction } + .. code-block:: xml From d340a477415ed91a7b2e9a5c83054912c7082039 Mon Sep 17 00:00:00 2001 From: Yonel Ceruto Date: Tue, 18 Jul 2017 10:17:57 -0400 Subject: [PATCH 2/2] Update service.rst --- controller/service.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controller/service.rst b/controller/service.rst index a8bee5d2468..03191f13387 100644 --- a/controller/service.rst +++ b/controller/service.rst @@ -26,7 +26,8 @@ syntax: .. code-block:: php-annotations - # src/AppBundle/Controller/HelloController.php + // src/AppBundle/Controller/HelloController.php + // ... use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;