Skip to content

Commit

Permalink
Merge branch '5.0'
Browse files Browse the repository at this point in the history
* 5.0:
  Removed Routing component docs
  • Loading branch information
wouterj committed Apr 4, 2020
2 parents 326eff4 + 0516d85 commit 1e3df40
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 334 deletions.
5 changes: 3 additions & 2 deletions _build/redirection_map
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,8 @@
/components/http_kernel/index /components/http_kernel
/components/property_access/introduction /components/property_access
/components/property_access/index /components/property_access
/components/routing/index /components/routing
/components/routing/introduction /components/routing
/components/routing/index https://github.com/symfony/routing
/components/routing/introduction https://github.com/symfony/routing
/components/routing/hostname_pattern /routing/hostname_pattern
/components/security/introduction /components/security
/components/security/index /components/security
Expand Down Expand Up @@ -480,3 +480,4 @@
/components/translation/custom_formats https://github.com/symfony/translation
/components/translation/custom_message_formatter https://github.com/symfony/translation
/components/notifier https://github.com/symfony/notifier
/components/routing https://github.com/symfony/routing
8 changes: 7 additions & 1 deletion components/config/resources.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ Loading Resources
parameters to string values. To set parameters to other data types
(e.g. boolean, integer, etc), the other loaders are recommended.

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.
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 `Routing`_ components come with specialized loaders for different file
formats.

Locating Resources
------------------
Expand Down Expand Up @@ -95,3 +99,5 @@ the resource::
// YamlUserLoader is used to load this resource because it supports
// files with the '.yaml' extension
$delegatingLoader->load(__DIR__.'/users.yaml');

.. _Routing: https://github.com/symfony/routing
4 changes: 2 additions & 2 deletions components/http_kernel.rst
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ attributes).
is the :class:`Symfony\\Component\\HttpKernel\\EventListener\\RouterListener`.
This class executes the routing layer, which returns an *array* of information
about the matched request, including the ``_controller`` and any placeholders
that are in the route's pattern (e.g. ``{slug}``). See
:doc:`Routing component </components/routing>`.
that are in the route's pattern (e.g. ``{slug}``). See the
:doc:`Routing documentation </routing>`.

This array of information is stored in the :class:`Symfony\\Component\\HttpFoundation\\Request`
object's ``attributes`` array. Adding the routing information here doesn't
Expand Down
321 changes: 0 additions & 321 deletions components/routing.rst

This file was deleted.

10 changes: 4 additions & 6 deletions create_framework/routing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,10 @@ of default values for route attributes (``['name' => 'World']``).

.. note::

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

Based on the information stored in the ``RouteCollection`` instance, a
``UrlMatcher`` instance can match URL paths::
Expand Down
4 changes: 2 additions & 2 deletions introduction/from_flat_php_to_symfony.rst
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,8 @@ a simple application. Along the way, you've made a simple routing
system and a method using ``ob_start()`` and ``ob_get_clean()`` to render
templates. If, for some reason, you needed to continue building this "framework"
from scratch, you could at least use Symfony's standalone
:doc:`Routing </components/routing>` component and :doc:`Twig </templates>`,
which already solve these problems.
:doc:`Routing </routing>` component and :doc:`Twig </templates>`, which
already solve these problems.

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

0 comments on commit 1e3df40

Please sign in to comment.