Skip to content

Commit 39cc38e

Browse files
committed
Fixed some *.yml file extensions
1 parent 1e3c570 commit 39cc38e

16 files changed

+40
-40
lines changed

bundles/best_practices.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -363,13 +363,13 @@ The end user can provide values in any configuration file:
363363

364364
.. code-block:: yaml
365365
366-
# app/config/config.yml
366+
# config/services.yaml
367367
parameters:
368368
acme_blog.author.email: '[email protected]'
369369
370370
.. code-block:: xml
371371
372-
<!-- app/config/config.xml -->
372+
<!-- config/services.xml -->
373373
<?xml version="1.0" encoding="UTF-8" ?>
374374
<container xmlns="http://symfony.com/schema/dic/services"
375375
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -384,7 +384,7 @@ The end user can provide values in any configuration file:
384384
385385
.. code-block:: php
386386
387-
// app/config/config.php
387+
// config/services.php
388388
$container->setParameter('acme_blog.author.email', '[email protected]');
389389
390390
Retrieve the configuration parameters in your code from the container::

bundles/override.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Routing
2626

2727
Routing is never automatically imported in Symfony. If you want to include
2828
the routes from any bundle, then they must be manually imported from somewhere
29-
in your application (e.g. ``config/routes.yml``).
29+
in your application (e.g. ``config/routes.yaml``).
3030

3131
The easiest way to "override" a bundle's routing is to never import it at
3232
all. Instead of importing a third-party bundle's routing, simply copy
@@ -101,7 +101,7 @@ to a new validation group:
101101

102102
.. code-block:: yaml
103103
104-
# src/Acme/UserBundle/Resources/config/validation.yml
104+
# src/Acme/UserBundle/Resources/config/validation.yaml
105105
FOS\UserBundle\Model\User:
106106
properties:
107107
plainPassword:

bundles/prepend_extension.rst

+12-12
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ users to choose to remove functionality they are not using. Creating multiple
1212
bundles has the drawback that configuration becomes more tedious and settings
1313
often need to be repeated for various bundles.
1414

15-
It is possible to remove the disadvantage of the multiple bundle approach
16-
by enabling a single Extension to prepend the settings for any bundle.
17-
It can use the settings defined in the ``app/config/config.yml``
18-
to prepend settings just as if they had been written explicitly by
19-
the user in the application configuration.
15+
It is possible to remove the disadvantage of the multiple bundle approach by
16+
enabling a single Extension to prepend the settings for any bundle. It can use
17+
the settings defined in the ``config/*`` files to prepend settings just as if
18+
they had been written explicitly by the user in the application configuration.
2019

2120
For example, this could be used to configure the entity manager name to use in
2221
multiple bundles. Or it can be used to enable an optional feature that depends
@@ -50,7 +49,7 @@ prepend settings to a bundle extension developers can use the
5049
:method:`Symfony\\Component\\DependencyInjection\\ContainerBuilder::prependExtensionConfig`
5150
method on the :class:`Symfony\\Component\\DependencyInjection\\ContainerBuilder`
5251
instance. As this method only prepends settings, any other settings done explicitly
53-
inside the ``app/config/config.yml`` would override these prepended settings.
52+
inside the ``config/*`` files would override these prepended settings.
5453

5554
The following example illustrates how to prepend
5655
a configuration setting in multiple bundles as well as disable a flag in multiple bundles
@@ -73,7 +72,7 @@ in case a specific other bundle is not registered::
7372
// acme_something and acme_other
7473
//
7574
// note that if the user manually configured
76-
// use_acme_goodbye to true in app/config/config.yml
75+
// use_acme_goodbye to true in config/services.yaml
7776
// then the setting would in the end be true and not false
7877
$container->prependExtensionConfig($name, $config);
7978
break;
@@ -96,14 +95,15 @@ in case a specific other bundle is not registered::
9695
}
9796

9897
The above would be the equivalent of writing the following into the
99-
``app/config/config.yml`` in case AcmeGoodbyeBundle is not registered and the
100-
``entity_manager_name`` setting for ``acme_hello`` is set to ``non_default``:
98+
``config/packages/acme_something.yaml`` in case AcmeGoodbyeBundle is not
99+
registered and the ``entity_manager_name`` setting for ``acme_hello`` is set to
100+
``non_default``:
101101

102102
.. configuration-block::
103103

104104
.. code-block:: yaml
105105
106-
# app/config/config.yml
106+
# config/packages/acme_something.yaml
107107
acme_something:
108108
# ...
109109
use_acme_goodbye: false
@@ -115,7 +115,7 @@ The above would be the equivalent of writing the following into the
115115
116116
.. code-block:: xml
117117
118-
<!-- app/config/config.xml -->
118+
<!-- config/packages/acme_something.xml -->
119119
<?xml version="1.0" encoding="UTF-8" ?>
120120
<container xmlns="http://symfony.com/schema/dic/services"
121121
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -134,7 +134,7 @@ The above would be the equivalent of writing the following into the
134134
135135
.. code-block:: php
136136
137-
// app/config/config.php
137+
// config/packages/acme_something.php
138138
$container->loadFromExtension('acme_something', array(
139139
// ...
140140
'use_acme_goodbye' => false,

configuration/configuration_organization.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Mix and Match Configuration Formats
7878
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
7979

8080
Configuration files can import files defined with any other built-in configuration
81-
format (``.yml``, ``.xml``, ``.php``, ``.ini``):
81+
format (``.yaml`` or ``.yml``, ``.xml``, ``.php``, ``.ini``):
8282

8383
.. configuration-block::
8484

doctrine/custom_dql_functions.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ In Symfony, you can register your custom DQL functions as follows:
8686

8787
.. code-block:: yaml
8888
89-
# app/config/config.yml
89+
# config/packages/doctrine.yaml
9090
doctrine:
9191
orm:
9292
# ...
@@ -99,7 +99,7 @@ In Symfony, you can register your custom DQL functions as follows:
9999
100100
.. code-block:: xml
101101
102-
# app/config/config.xml
102+
<!-- config/packages/doctrine.xml -->
103103
<?xml version="1.0" encoding="UTF-8" ?>
104104
<container xmlns="http://symfony.com/schema/dic/services"
105105
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -127,7 +127,7 @@ In Symfony, you can register your custom DQL functions as follows:
127127
128128
.. code-block:: php
129129
130-
// app/config/config.php
130+
// config/packages/doctrine.php
131131
use App\DQL\DatetimeFunction;
132132
133133
$container->loadFromExtension('doctrine', array(

doctrine/dbal.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ mapping type:
117117

118118
.. code-block:: yaml
119119
120-
# config/packages/doctrine.yml
120+
# config/packages/doctrine.yaml
121121
doctrine:
122122
dbal:
123123
mapping_types:

doctrine/registration_form.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ With some validation added, your class may look something like this::
147147
}
148148

149149
The :class:`Symfony\\Component\\Security\\Core\\User\\UserInterface` requires
150-
a few other methods and your ``security.yml`` file needs to be configured
150+
a few other methods and your ``security.yaml`` file needs to be configured
151151
properly to work with the ``User`` entity. For a more complete example, see
152152
the :ref:`Entity Provider <security-crete-user-entity>` article.
153153

@@ -277,7 +277,7 @@ encoder in the security configuration:
277277

278278
.. code-block:: yaml
279279
280-
# config/packages/security.yml
280+
# config/packages/security.yaml
281281
security:
282282
encoders:
283283
App\Entity\User: bcrypt
@@ -364,7 +364,7 @@ return the ``email`` property::
364364
// ...
365365
}
366366

367-
Next, just update the ``providers`` section of your ``security.yml`` file
367+
Next, just update the ``providers`` section of your ``security.yaml`` file
368368
so that Symfony knows how to load your users via the ``email`` property on
369369
login. See :ref:`authenticating-someone-with-a-custom-entity-provider`.
370370

reference/configuration/framework.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ type
649649

650650
The type of the resource to hint the loaders about the format. This isn't
651651
needed when you use the default routers with the expected file extensions
652-
(``.xml``, ``.yml`` / ``.yaml``, ``.php``).
652+
(``.xml``, ``.yml`` or ``.yaml``, ``.php``).
653653

654654
http_port
655655
.........

routing/hostname_pattern.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ You can also set the host option on imported routes:
393393
394394
# config/routes.yaml
395395
app_hello:
396-
resource: '@ThirdPartyBundle/Resources/config/routing.yml'
396+
resource: '@ThirdPartyBundle/Resources/config/routing.yaml'
397397
host: "hello.example.com"
398398
399399
.. code-block:: xml

security/remember_me.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ The ``remember_me`` firewall defines the following configuration options:
8484

8585
``secret`` (**required**)
8686
The value used to encrypt the cookie's content. It's common to use the
87-
``secret`` value defined in the ``app/config/parameters.yml`` file.
87+
``secret`` value defined in the ``APP_SECRET`` environment variable.
8888

8989
``name`` (default value: ``REMEMBERME``)
9090
The name of the cookie used to keep the user logged in. If you enable the

serializer/custom_encoders.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Registering it in your app
5252
--------------------------
5353

5454
If you use the Symfony Framework. then you probably want to register this encoder
55-
as a service in your app. If you're using the :ref:`default services.yml configuration <service-container-services-load-example>`,
55+
as a service in your app. If you're using the :ref:`default services.yaml configuration <service-container-services-load-example>`,
5656
that's done automatically!
5757

5858
.. tip::

templating/debug.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The same mechanism can be used in Twig templates thanks to ``dump()`` function:
5353
{% endfor %}
5454

5555
By design, the ``dump()`` function is only available if the ``kernel.debug``
56-
setting (in ``config.yml``) is ``true``, to avoid leaking sensitive information
57-
in production. In fact, trying to use the ``dump()`` function when ``kernel.debug``
58-
is ``false`` (for example in the ``prod`` environment) will result in an
59-
application error.
56+
setting is ``true`` (which is usually set via the ``APP_DEBUG`` environment
57+
variable), to avoid leaking sensitive information in production. In fact, trying
58+
to use the ``dump()`` function when ``kernel.debug`` is ``false`` (for example
59+
in the ``prod`` environment) will result in an application error.

testing/http_authentication.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ firewall, but only in the configuration file used by tests:
2727

2828
.. code-block:: yaml
2929
30-
# app/config/config_test.yml
30+
# config/packages/test/security.yaml
3131
security:
3232
firewalls:
3333
# replace 'main' by the name of your own firewall
@@ -36,7 +36,7 @@ firewall, but only in the configuration file used by tests:
3636
3737
.. code-block:: xml
3838
39-
<!-- app/config/config_test.xml -->
39+
<!-- config/packages/test/security.xml -->
4040
<security:config>
4141
<!-- replace 'main' by the name of your own firewall -->
4242
<security:firewall name="main">
@@ -46,7 +46,7 @@ firewall, but only in the configuration file used by tests:
4646
4747
.. code-block:: php
4848
49-
// app/config/config_test.php
49+
// config/packages/test/security.php
5050
$container->loadFromExtension('security', array(
5151
'firewalls' => array(
5252
// replace 'main' by the name of your own firewall

translation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ different formats, XLIFF being the recommended format:
157157
158158
.. code-block:: yaml
159159
160-
# translations/messages.fr.yml
160+
# translations/messages.fr.yaml
161161
Symfony is great: J'aime Symfony
162162
163163
.. code-block:: php

translation/lint.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ translation file using the ``lint:yaml`` and ``lint:xliff`` commands:
1515
.. code-block:: terminal
1616
1717
# lint a single file
18-
$ ./bin/console lint:yaml translations/messages.en.yml
18+
$ ./bin/console lint:yaml translations/messages.en.yaml
1919
$ ./bin/console lint:xliff translations/messages.en.xlf
2020
2121
# lint a whole directory

validation.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ previous configuration by the following:
259259

260260
.. code-block:: yaml
261261
262-
# config/packages/framework.yml
262+
# config/packages/framework.yaml
263263
framework:
264264
validation: { enable_annotations: true }
265265
@@ -439,7 +439,7 @@ options can be specified in this way.
439439
440440
.. code-block:: yaml
441441
442-
# config/validator/validation.yml
442+
# config/validator/validation.yaml
443443
App\Entity\Author:
444444
properties:
445445
genre:

0 commit comments

Comments
 (0)