8000 Merge branch '5.1' into 5.x · symfony/symfony-docs@37a4c90 · GitHub
[go: up one dir, main page]

Skip to content

Commit 37a4c90

Browse files
committed
Merge branch '5.1' into 5.x
* 5.1: Update front_controllers_and_kernel.rst Wrong services path and addition services_environment-name
2 parents 8d1364e + 86b108f commit 37a4c90

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

configuration.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,9 @@ set in the previous ones):
383383

384384
#. ``config/packages/*.yaml`` (and ``*.xml`` and ``*.php`` files too);
385385
#. ``config/packages/<environment-name>/*.yaml`` (and ``*.xml`` and ``*.php`` files too);
386-
#. ``config/packages/services.yaml`` (and ``services.xml`` and ``services.php`` files too);
386+
#. ``config/services.yaml`` (and ``services.xml`` and ``services.php`` files too);
387+
#. ``config/services_<environment-name>.yaml`` (and ``services_<environment-name>.xml``
388+
and ``services_<environment-name>.php`` files too).
387389

388390
Take the ``framework`` package, installed by default, as an example:
389391

configuration/front_controllers_and_kernel.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,15 @@ the directory of the environment you're using (most commonly ``dev/`` while
244244
developing and debugging). While it can vary, the ``var/cache/dev/`` directory
245245
includes the following:
246246

247-
``appDevDebugProjectContainer.php``
247+
``srcApp_KernelDevDebugContainer.php``
248248
The cached "service container" that represents the cached application
249249
configuration.
250250

251-
``appDevUrlGenerator.php``
251+
``UrlGenerator.php``
252252
The PHP class generated from the routing configuration and used when
253253
generating URLs.
254254

255-
``appDevUrlMatcher.php``
255+
``UrlMatcher.php``
256256
The PHP class used for route matching - look here to see the compiled regular
257257
expression logic used to match incoming URLs to different routes.
258258

0 commit comments

Comments
 (0)
0