8000 Merge branch '4.4' into 5.0 · symfony/symfony-docs@0516d85 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0516d85

Browse files
wouterjwouterj
committed
Merge branch '4.4' into 5.0
* 4.4: Removed Routing component docs
2 parents 24bd0cd + c4a2178 commit 0516d85

File tree

6 files changed

+18
-334
lines changed

6 files changed

+18
-334
lines changed

‎_build/redirection_map

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@
345345
/components/http_kernel/index /components/http_kernel
346346
/components/property_access/introduction /components/property_access
347347
/components/property_access/index /components/property_access
348-
/components/routing/index /components/routing
349-
/components/routing/introduction /components/routing
348+
/components/routing/index https://github.com/symfony/routing
349+
/components/routing/introduction https://github.com/symfony/routing
350350
/components/routing/hostname_pattern /routing/hostname_pattern
351351
/components/security/introduction /components/security
352352
/components/security/index /components/security
@@ -480,3 +480,4 @@
480480
/components/translation/custom_formats https://github.com/symfony/translation
481481
/components/translation/custom_message_formatter https://github.com/symfony/translation
482482
/components/notifier https://github.com/symfony/notifier
483+
/components/routing https://github.com/symfony/routing

‎components/config/resources.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ Loading Resources
1111
parameters to string values. To set parameters to other data types
1212
(e.g. boolean, integer, etc), the other loaders are recommended.
1313

14-
Loaders populate the application's configuration from different sources like YAML files. The Config component defines the interface for such loaders. The :doc:`Dependency Injection </components/dependency_injection>` and :doc:`Routing </components/routing>` components come with specialized loaders for different file formats.
14+
Loaders populate the application's configuration from different sources
15+
like YAML files. The Config component defines the interface for such
16+
loaders. The :doc:`Dependency Injection </components/dependency_injection>`
17+
and `Routing`_ components come with specialized loaders for different file
18+
formats.
1519

1620
Locating Resources
1721
------------------
@@ -95,3 +99,5 @@ the resource::
9599< 8000 code class="diff-text syntax-highlighted-line">
// YamlUserLoader is used to load this resource because it supports
96100
// files with the '.yaml' extension
97101
$delegatingLoader->load(__DIR__.'/users.yaml');
102+
103+
.. _Routing: https://github.com/symfony/routing

‎components/http_kernel.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ attributes).
200200
is the :class:`Symfony\\Component\\HttpKernel\\EventListener\\RouterListener`.
201201
This class executes the routing layer, which returns an *array* of information
202202
about the matched request, including the ``_controller`` and any placeholders
203-
that are in the route's pattern (e.g. ``{slug}``). See
204-
:doc:`Routing component </components/routing>`.
203+
that are in the route's pattern (e.g. ``{slug}``). See the
204+
:doc:`Routing documentation </routing>`.
205205

206206
This array of information is stored in the :class:`Symfony\\Component\\HttpFoundation\\Request`
207207
object's ``attributes`` array. Adding the routing information here doesn't

‎components/routing.rst

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

‎create_framework/routing.rst

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,10 @@ of default values for route attributes (``['name' => 'World']``).
7070

7171
.. note::
7272

73-
Read the
74-
:doc:`Routing component documentation </components/routing>` to
75-
learn more about its many features like URL generation, attribute
76-
requirements, HTTP method enforcement, loaders for YAML or XML files,
77-
dumpers to PHP or Apache rewrite rules for enhanced performance and much
78-
more.
73+
Read the :doc:`Routing documentation </routing>` to learn more about
74+
its many features like URL generation, attribute requirements, HTTP
75+
method enforcement, loaders for YAML or XML files, dumpers to PHP or
76+
Apache rewrite rules for enhanced performance and much more.
7977

8078
Based on the information stored in the ``RouteCollection`` instance, a
8179
``UrlMatcher`` instance can match URL paths::

‎introduction/from_flat_php_to_symfony.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,8 @@ a simple application. Along the way, you've made a simple routing
532532
system and a method using ``ob_start()`` and ``ob_get_clean()`` to render
533533
templates. If, for some reason, you needed to continue building this "framework"
534534
from scratch, you could at least use Symfony's standalone
535-
:doc:`Routing </components/routing>` component and :doc:`Twig </templates>`,
536-
which already solve these problems.
535+
:doc:`Routing </routing>` component and :doc:`Twig </templates>`, which
536+
already solve these problems.
537537

538538
Instead of re-solving common problems, you can let Symfony take care of
539539
them for you. Here's the same sample application, now built in Symfony::

0 commit comments

Comments
 (0)
0