Skip to content

Commit 419353b

Browse files
javiereguiluzjaviereguiluz
committed
Used the modern "controller" key in YAML routes
1 parent 6d7415f commit 419353b

10 files changed

+56
-54
lines changed

‎routing/conditions.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ define arbitrary matching logic, use the ``conditions`` routing option:
1414
1515
# config/routes.yaml
1616
contact:
17-
path: /contact
18-
defaults: { _controller: 'App\Controller\DefaultController::contact' }
19-
condition: "context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'"
17+
path: /contact
18+
controller: 'App\Controller\DefaultController::contact'
19+
condition: "context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'"
2020
2121
.. code-block:: xml
2222

‎routing/extra_information.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ to your controller, and as attributes of the ``Request`` object:
1515
1616
# config/routes.yaml
1717
blog:
18-
path: /blog/{page}
18+
path: /blog/{page}
19+
controller: App\Controller\BlogController::index
1920
defaults:
20-
_controller: App\Controller\BlogController::index
21-
page: 1
22-
title: "Hello world!"
21+
page: 1
22+
title: "Hello world!"
2323
2424
.. code-block:: xml
2525

‎routing/hostname_pattern.rst

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ You can also match on the HTTP *host* of the incoming request.
3939
4040
# config/routes.yaml
4141
mobile_homepage:
42-
path: /
43-
host: m.example.com
44-
defaults: { _controller: App\Controller\MainController::mobileHomepage }
42+
path: /
43+
host: m.example.com
44+
controller: App\Controller\MainController::mobileHomepage
4545
4646
homepage:
47-
path: /
48-
defaults: { _controller: App\Controller\MainController::homepage }
47+
path: /
48+
controller: App\Controller\MainController::homepage
4949
5050
.. code-block:: xml
5151
@@ -124,13 +124,13 @@ you can use placeholders in your hostname:
124124
125125
# config/routes.yaml
126126
projects_homepage:
127-
path: /
128-
host: "{project_name}.example.com"
129-
defaults: { _controller: App\Controller\MainController::projectsHomepage }
127+
path: /
128+
host: "{project_name}.example.com"
129+
controller: App\Controller\MainController::projectsHomepage
130130
131131
homepage:
132-
path: /
133-
defaults: { _controller: App\Controller\MainController::homepage }
132+
path: /
133+
controller: App\Controller\MainController::homepage
134134
135135
.. code-block:: xml
136136
@@ -210,17 +210,17 @@ instance, if you want to match both ``m.example.com`` and
210210
211211
# config/routes.yaml
212212
mobile_homepage:
213-
path: /
214-
host: "{subdomain}.example.com"
213+
path: /
214+
host: "{subdomain}.example.com"
215+
controller: App\Controller\MainController::mobileHomepage
215216
defaults:
216-
_controller: App\Controller\MainController::mobileHomepage
217217
subdomain: m
218218
requirements:
219219
subdomain: m|mobile
220220
221221
homepage:
222-
path: /
223-
defaults: { _controller: App\Controller\MainController::homepage }
222+
path: /
223+
controller: App\Controller\MainController::homepage
224224
225225
.. code-block:: xml
226226
@@ -306,17 +306,17 @@ instance, if you want to match both ``m.example.com`` and
306306
307307
# config/routes.yaml
308308
mobile_homepage:
309-
path: /
310-
host: "m.{domain}"
309+
path: /
310+
host: "m.{domain}"
311+
controller: App\Controller\MainController::mobileHomepage
311312
defaults:
312-
_controller: App\Controller\MainController::mobileHomepage
313313
domain: '%domain%'
314314
requirements:
315315
domain: '%domain%'
316316
317317
homepage:
318-
path: /
319-
defaults: { _controller: App\Controller\MainController::homepage }
318+
path: /
319+
controller: App\Controller\MainController::homepage
320320
321321
.. code-block:: xml
322322

‎routing/optional_placeholders.rst

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ the available blog posts for this imaginary blog application:
3131
3232
# config/routes.yaml
3333
blog:
34-
path: /blog
35-
defaults: { _controller: App\Controller\BlogController::index }
34+
path: /blog
35+
controller: App\Controller\BlogController::index
3636
3737
.. code-block:: xml
3838
@@ -86,8 +86,8 @@ entries? Update the route to have a new ``{page}`` placeholder:
8686
8787
# config/routes.yaml
8888
blog:
89-
path: /blog/{page}
90-
defaults: { _controller: App\Controller\BlogController::index }
89+
path: /blog/{page}
90+
controller: App\Controller\BlogController::index
9191
9292
.. code-block:: xml
9393
@@ -146,8 +146,9 @@ This is done by including it in the ``defaults`` collection:
146146
147147
# config/routes.yaml
148148
blog:
149-
path: /blog/{page}
150-
defaults: { _controller: App\Controller\BlogController::index, page: 1 }
149+
path: /blog/{page}
150+
controller: App\Controller\BlogController::index
151+
defaults: { page: 1 }
151152
152153
.. code-block:: xml
153154

‎routing/redirect_in_config.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ action to redirect to this new url:
3535
# redirecting the homepage
3636
homepage:
3737
path: /
38+
controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction
3839
defaults:
39-
_controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction
4040
path: /app
4141
permanent: true
4242
@@ -110,8 +110,8 @@ action:
110110
111111
admin:
112112
path: /wp-admin
113+
controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction
113114
defaults:
114-
_controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction
115115
route: sonata_admin_dashboard
116116
permanent: true
117117

‎routing/redirect_trailing_slash.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ system, as explained below:
6363
# config/routes.yaml
6464
remove_trailing_slash:
6565
path: /{url}
66-
defaults: { _controller: App\Controller\RedirectingController::removeTrailingSlash }
66+
controller: App\Controller\RedirectingController::removeTrailingSlash
6767
requirements:
6868
url: .*/$
6969
methods: [GET]

‎routing/requirements.rst

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ a routing ``{wildcard}`` to only match some regular expression:
3434
# config/routes.yaml
3535
blog_list:
3636
path: /blog/{page}
37-
defaults: { _controller: App\Controller\BlogController::list }
37+
controller: App\Controller\BlogController::list
3838
requirements:
3939
page: '\d+'
4040
@@ -110,8 +110,9 @@ URL:
110110
111111
# config/routes.yaml
112112
homepage:
113-
path: /{_locale}
114-
defaults: { _controller: App\Controller\MainController::homepage, _locale: en }
113+
path: /{_locale}
114+
controller: App\Controller\MainController::homepage
115+
defaults: { _locale: en }
115116
requirements:
116117
_locale: en|fr
117118
@@ -218,14 +219,14 @@ accomplished with the following route configuration:
218219
219220
# config/routes.yaml
220221
api_post_show:
221-
path: /api/posts/{id}
222-
defaults: { _controller: App\Controller\BlogApiController::show }
223-
methods: [GET, HEAD]
222+
path: /api/posts/{id}
223+
controller: App\Controller\BlogApiController::show
224+
methods: [GET, HEAD]
224225
225226
api_post_edit:
226-
path: /api/posts/{id}
227-
defaults: { _controller: App\Controller\BlogApiController::edit }
228-
methods: [PUT]
227+
path: /api/posts/{id}
228+
controller: App\Controller\BlogApiController::edit
229+
methods: [PUT]
229230
230231
.. code-block:: xml
231232

‎routing/scheme.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ the URI scheme via schemes:
3333
3434
# config/routes.yaml
3535
secure:
36-
path: /secure
37-
defaults: { _controller: App\Controller\MainController::secure }
38-
schemes: [https]
36+
path: /secure
37+
controller: App\Controller\MainController::secure
38+
schemes: [https]
3939
4040
.. code-block:: xml
4141

‎routing/service_container_parameters.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ inside your routing configuration:
2020
2121
# config/routes.yaml
2222
contact:
23-
path: /{_locale}/contact
24-
defaults: { _controller: App\Controller\MainController::contact }
23+
path: /{_locale}/contact
24+
controller: App\Controller\MainController::contact
2525
requirements:
2626
_locale: '%app.locales%'
2727
@@ -94,8 +94,8 @@ path):
9494
9595
# config/routes.yaml
9696
some_route:
97-
path: /%app.route_prefix%/contact
98-
defaults: { _controller: App\Controller\MainController::contact }
97+
path: /%app.route_prefix%/contact
98+
controller: App\Controller\MainController::contact
9999
100100
.. code-block:: xml
101101

‎routing/slash_in_parameter.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ a more permissive regular expression for it:
4343
4444
# config/routes.yaml
4545
share:
46-
path: /share/{token}
47-
defaults: { _controller: App\Controller\DefaultController::share }
46+
path: /share/{token}
47+
controller: App\Controller\DefaultController::share
4848
requirements:
4949
token: .+
5050

0 commit comments

Comments
 (0)