Skip to content

Commit cf64882

Browse files
committed
Revamped the routing documentation
1 parent 4eca463 commit cf64882

14 files changed

+1086
-1299
lines changed

_build/redirection_map

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,3 +429,11 @@
429429
/setup/composer /setup
430430
/security/security_checker /setup
431431
/service_container/parameters /configuration
432+
/routing/generate_url_javascript /routing
433+
/routing/slash_in_parameter /routing
434+
/routing/scheme /routing
435+
/routing/optional_placeholders /routing
436+
/routing/conditions /routing
437+
/routing/requirements /routing
438+
/routing/redirect_trailing_slash /routing
439+
/console/request_context /routing

components/routing.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ A full route definition can contain up to eight parts:
107107
#. An array of methods. These enforce a certain HTTP request method (``HEAD``,
108108
``GET``, ``POST``, ...).
109109

110-
#. A condition, using the :doc:`/components/expression_language/syntax`.
111-
A string that must evaluate to ``true`` so the route matches. See
112-
:doc:`/routing/conditions` for more details.
110+
#. A condition, using a valid :doc:`ExpressionLanguage expression </components/expression_language/syntax>`
111+
that must evaluate to ``true`` so the route matches. See
112+
:ref:`routing-expression_parameters` for more details.
113113

114114
Take the following route, which combines several of these ideas::
115115

@@ -157,7 +157,7 @@ If you want a placeholder to match anything, it must be the last of the route::
157157
['anything' => '.*'] // explicit requirement to allow "/"
158158
);
159159

160-
Learn more about it by reading :ref:`routing/slash_in_parameter`.
160+
Learn more about it by reading :ref:`routing-slash-in-parameters`.
161161

162162
Using Prefixes and Collection Settings
163163
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

console/request_context.rst

Lines changed: 0 additions & 99 deletions
This file was deleted.

controller.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ method is just a helper method that generates the URL for a given route::
125125

126126
$url = $this->generateUrl('app_lucky_number', ['max' => 10]);
127127

128+
.. _controller-redirect:
129+
128130
Redirecting
129131
~~~~~~~~~~~
130132

@@ -297,7 +299,7 @@ use:
297299
.. code-block:: terminal
298300
299301
$ php bin/console make:crud Product
300-
302+
301303
created: src/Controller/ProductController.php
302304
created: src/Form/ProductType.php
303305
created: templates/product/_delete_form.html.twig

reference/configuration/framework.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,7 @@ strict_requirements
11101110
**type**: ``mixed`` **default**: ``true``
11111111

11121112
Determines the routing generator behavior. When generating a route that
1113-
has specific :doc:`requirements </routing/requirements>`, the generator
1113+
has specific :ref:`parameter requirements <routing-requirements>`, the generator
11141114
can behave differently in case the used parameters do not meet these requirements.
11151115

11161116
The value can be one of:

0 commit comments

Comments
 (0)