Skip to content

Commit 5dd105c

Browse files
HeahDudeHeahDude
committed
[FrameworkBundle][Routing] Added new template and redirect routes configuration
1 parent 0045470 commit 5dd105c

File tree

9 files changed

+215
-160
lines changed

9 files changed

+215
-160
lines changed

‎controller/error_pages.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ automatically when installing ``symfony/framework-bundle``):
157157
<routes xmlns="http://symfony.com/schema/routing"
158158
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
159159
xsi:schemaLocation="http://symfony.com/schema/routing
160-
https://symfony.com/schema/routing/routing-1.0.xsd">
160+
https://symfony.com/schema/routing/framework-routing-1.0.xsd">
161161
162162
<import resource="@FrameworkBundle/Resources/config/routing/errors.xml" prefix="/_error"/>
163163
</routes>
164164
165165
.. code-block:: php
166166
167167
// config/routes/dev/framework.php
168-
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
168+
use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
169169
170170
return function (RoutingConfigurator $routes) {
171171
$routes->import('@FrameworkBundle/Resources/config/routing/errors.xml')

‎controller/service.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ a service like: ``App\Controller\HelloController::index``:
5454
<routes xmlns="http://symfony.com/schema/routing"
5555
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5656
xsi:schemaLocation="http://symfony.com/schema/routing
57-
https://symfony.com/schema/routing/routing-1.0.xsd">
57+
https://symfony.com/schema/routing/framework-routing-1.0.xsd">
5858
5959
<route id="hello" path="/hello" controller="App\Controller\HelloController::index" methods="GET"/>
6060
@@ -64,7 +64,7 @@ a service like: ``App\Controller\HelloController::index``:
6464
6565
// config/routes.php
6666
use App\Controller\HelloController;
67-
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
67+
use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
6868
6969
return function (RoutingConfigurator $routes) {
7070
$routes->add('hello', '/hello')
@@ -115,7 +115,7 @@ which is a common practice when following the `ADR pattern`_
115115
<routes xmlns="http://symfony.com/schema/routing"
116116
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
117117
xsi:schemaLocation="http://symfony.com/schema/routing
118-
https://symfony.com/schema/routing/routing-1.0.xsd">
118+
https://symfony.com/schema/routing/framework-routing-1.0.xsd">
119119
120120
<route id="hello" path="/hello/{name}">
121121
<default key="_controller">app.hello_controller</default>

‎routing.rst‎

Lines changed: 150 additions & 91 deletions
Large diffs are not rendered by default.

‎routing/custom_route_loader.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Symfony provides several route loaders for the most common needs:
4646
<routes xmlns="http://symfony.com/schema/routing"
4747
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4848
xsi:schemaLocation="http://symfony.com/schema/routing
49-
https://symfony.com/schema/routing/routing-1.0.xsd">
49+
https://symfony.com/schema/routing/framework-routing-1.0.xsd">
5050
5151
<!-- loads routes from the given routing file stored in some bundle -->
5252
<import resource="@AcmeBundle/Resources/config/routing.yaml"/>
@@ -64,7 +64,7 @@ Symfony provides several route loaders for the most common needs:
6464
.. code-block:: php
6565
6666
// config/routes.php
67-
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
67+
use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
6868
6969
return function (RoutingConfigurator $routes) {
7070
// loads routes from the given routing file stored in some bundle
@@ -138,15 +138,15 @@ Take these lines from the ``routes.yaml``:
138138
<routes xmlns="http://symfony.com/schema/routing"
139139
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
140140
xsi:schemaLocation="http://symfony.com/schema/routing
141-
https://symfony.com/schema/routing/routing-1.0.xsd">
141+
https://symfony.com/schema/routing/framework-routing-1.0.xsd">
142142
143143
<import resource="../src/Controller" type="annotation"/>
144144
</routes>
145145
146146
.. code-block:: php
147147
148148
// config/routes.php
149-
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
149+
use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
150150
151151
return function (RoutingConfigurator $routes) {
152152
$routes->import('../src/Controller', 'annotation');
@@ -192,15 +192,15 @@ and configure the service and method to call:
192192
<routes xmlns="http://symfony.com/schema/routing"
193193
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
194194
xsi:schemaLocation="http://symfony.com/schema/routing
195-
https://symfony.com/schema/routing/routing-1.0.xsd">
195+
https://symfony.com/schema/routing/framework-routing-1.0.xsd">
196196
197197
<import resource="admin_route_loader::loadRoutes" type="service"/>
198198
</routes>
199199
200200
.. code-block:: php
201201
202202
// config/routes.php
203-
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
203+
use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
204204
205205
return function (RoutingConfigurator $routes) {
206206
$routes->import('admin_route_loader::loadRoutes', 'service');
@@ -370,15 +370,15 @@ What remains to do is adding a few lines to the routing configuration:
370370
<routes xmlns="http://symfony.com/schema/routing"
371371
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
372372
xsi:schemaLocation="http://symfony.com/schema/routing
373-
https://symfony.com/schema/routing/routing-1.0.xsd">
373+
https://symfony.com/schema/routing/framework-routing-1.0.xsd">
374374
375375
<import resource="." type="extra"/>
376376
</routes>
377377
378378
.. code-block:: php
379379
380380
// config/routes.php
381-
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
381+
use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
382382
383383
return function (RoutingConfigurator $routes) {
384384
$routes->import('.', 'extra');

‎security.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -855,15 +855,15 @@ Next, you'll need to create a route for this URL (but not a controller):
855855
<routes xmlns="http://symfony.com/schema/routing"
856856
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
857857
xsi:schemaLocation="http://symfony.com/schema/routing
858-
https://symfony.com/schema/routing/routing-1.0.xsd">
858+
https://symfony.com/schema/routing/framework-routing-1.0.xsd">
859859
860860
<route id="app_logout" path="/logout" methods="GET"/>
861861
</routes>
862862
863863
.. code-block:: php
864864
865865
// config/routes.php
866-
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
866+
use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
867867
868868
return function (RoutingConfigurator $routes) {
869869
$routes->add('logout', '/logout')

‎security/form_login.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ configuration (``login``):
122122
<routes xmlns="http://symfony.com/schema/routing"
123123
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
124124
xsi:schemaLocation="http://symfony.com/schema/routing
125-
https://symfony.com/schema/routing/routing-1.0.xsd">
125+
https://symfony.com/schema/routing/framework-routing-1.0.xsd">
126126
127127
<route id="login" path="/login" controller="App\Controller\SecurityController::login" methods="GET|POST"/>
128128
</routes>
@@ -131,7 +131,7 @@ configuration (``login``):
131131
132132
// config/routes.php
133133
use App\Controller\SecurityController;
134-
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
134+
use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
135135
136136
return function (RoutingConfigurator $routes) {
137137
$routes->add('login', '/login')

‎security/json_login_setup.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ The next step is to configure a route in your app matching this path:
102102
<routes xmlns="http://symfony.com/schema/routing"
103103
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
104104
xsi:schemaLocation="http://symfony.com/schema/routing
105-
https://symfony.com/schema/routing/routing-1.0.xsd">
105+
https://symfony.com/schema/routing/framework-routing-1.0.xsd">
106106
107107
<route id="login" path="/login" controller="App\Controller\SecurityController::login" methods="POST"/>
108108
</routes>
@@ -111,7 +111,7 @@ The next step is to configure a route in your app matching this path:
111111
112112
// config/routes.php
113113
use App\Controller\SecurityController;
114-
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
114+
use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
115115
116116
return function (RoutingConfigurator $routes) {
117117
$routes->add('login', '/login')

‎templates.rst‎

Lines changed: 44 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ Consider the following routing configuration:
230230
<routes xmlns="http://symfony.com/schema/routing"
231231
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
232232
xsi:schemaLocation="http://symfony.com/schema/routing
233-
https://symfony.com/schema/routing/routing-1.0.xsd">
233+
https://symfony.com/schema/routing/framework-routing-1.0.xsd">
234234
235235
<route id="blog_index"
236236
path="/"
@@ -245,7 +245,7 @@ Consider the following routing configuration:
245245
246246
// config/routes.php
247247
use App\Controller\BlogController;
248-
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
248+
use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
249249
250250
return function (RoutingConfigurator $routes) {
251251
$routes->add('blog_index', '/')
@@ -457,8 +457,8 @@ Rendering a Template Directly from a Route
457457
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
458458

459459
Although templates are usually rendered in controllers and services, you can
460-
render static pages that don't need any variables directly from the route
461-
definition. Use the special :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\TemplateController`
460+
render static pages from the route definition. Use the special
461+
:class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\TemplateController`
462462
provided by Symfony:
463463

464464
.. configuration-block::
@@ -468,81 +468,77 @@ provided by Symfony:
468468
# config/routes.yaml
469469
acme_privacy:
470470
path: /privacy
471-
controller: Symfony\Bundle\FrameworkBundle\Controller\TemplateController
472-
defaults:
473-
# the path of the template to render
474-
template: 'static/privacy.html.twig'
471+
# the path of the template to render
472+
template: 'static/privacy.html.twig'
475473
476-
# special options defined by Symfony to set the page cache
477-
maxAge: 86400
478-
sharedAge: 86400
474+
# special options defined by Symfony to set the page cache
475+
maxAge: 86400
476+
sharedAge: 86400
479477
480-
# whether or not caching should apply for client caches only
481-
private: true
478+
# whether or not caching should apply for client caches only
479+
private: true
482480
483-
# optionally you can define some arguments passed to the template
484-
context:
485-
site_name: 'ACME'
486-
theme: 'dark'
481+
# some variables passed to the template
482+
context:
483+
site_name: 'ACME'
484+
theme: 'dark'
487485
488486
.. code-block:: xml
489487
490488
<!-- config/routes.xml -->
491489
<?xml version="1.0" encoding="UTF-8" ?>
492490
<routes xmlns="http://symfony.com/schema/routing"
493491
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
494-
xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
492+
xsi:schemaLocation="http://symfony.com/schema/routing
493+
https://symfony.com/schema/routing/framework-routing-1.0.xsd">
495494
496-
<route id="acme_privacy"
495+
<template-route id="acme_privacy"
497496
path="/privacy"
498-
controller="Symfony\Bundle\FrameworkBundle\Controller\TemplateController">
499497
<!-- the path of the template to render -->
500-
<default key="template">static/privacy.html.twig</default>
498+
template="static/privacy.html.twig"
501499
502500
<!-- special options defined by Symfony to set the page cache -->
503-
<default key="maxAge">86400</default>
504-
<default key="sharedAge">86400</default>
501+
maxAge="86400"
502+
sharedMaxAge="86400">
505503
506504
<!-- whether or not caching should apply for client caches only -->
507505
<default key="private">true</default>
508506
509-
<!-- optionally you can define some arguments passed to the template -->
510-
<default key="context">
511-
<default key="site_name">ACME</default>
512-
<default key="theme">dark</default>
513-
</default>
514-
</route>
507+
<!-- some variables passed to the template -->
508+
<context>
509+
<string key="site_name">ACME</string>
510+
<string key="theme">dark</string>
511+
</context>
512+
</template-route>
515513
</routes>
516514
517515
.. code-block:: php
518516
519517
// config/routes.php
520-
use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
521-
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
518+
use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
522519
523520
return function (RoutingConfigurator $routes) {
524521
$routes->add('acme_privacy', '/privacy')
525-
->controller(TemplateController::class)
526-
->defaults([
527-
// the path of the template to render
528-
'template' => 'static/privacy.html.twig',
529-
530-
// special options defined by Symfony to set the page cache
531-
'maxAge' => 86400,
532-
'sharedAge' => 86400,
533-
534-
// whether or not caching should apply for client caches only
535-
'private' => true,
536-
537-
// optionally you can define some arguments passed to the template
538-
'context' => [
539-
'site_name' => 'ACME',
540-
'theme' => 'dark',
541-
]
522+
// the path of the template to render and a context of variables passed to it
523+
->template('static/privacy.html.twig', [
524+
'site_name' => 'ACME',
525+
'theme' => 'dark',
542526
])
527+
528+
// special options defined by Symfony to set the page cache
529+
->maxAge(86400)
530+
->sharedMaxAge(86400)
531+
532+
// whether or not caching should apply for client caches only
533+
->private()
543534
;
544535
};
545536
537+
.. versionadded:: 5.1
538+
539+
This short syntax was introduced in Symfony 5.1. Before you had to
540+
define the controller and specific route attributes using ``defaults``.
541+
546542
.. versionadded:: 5.1
547543

548544
The ``context`` option was introduced in Symfony 5.1.

‎translation/locale.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ A better policy is to include the locale in the URL using the
8080
<routes xmlns="http://symfony.com/schema/routing"
8181
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
8282
xsi:schemaLocation="http://symfony.com/schema/routing
83-
https://symfony.com/schema/routing/routing-1.0.xsd">
83+
https://symfony.com/schema/routing/framework-routing-1.0.xsd">
8484
8585
<route id="contact" path="/{_locale}/contact">
8686
controller="App\Controller\ContactController::index">
@@ -92,7 +92,7 @@ A better policy is to include the locale in the URL using the
9292
9393
// config/routes.php
9494
use App\Controller\ContactController;
95-
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
95+
use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
9696
9797
return function (RoutingConfigurator $routes) {
9898
$routes->add('contact', '/{_locale}/contact')

0 commit comments

Comments
 (0)