Skip to content

Commit d4c82b3

Browse files
committed
Merge branch '4.4' into 5.4
* 4.4: Fix ordered lists in secrets management and Form component documentation
2 parents e3a3dee + a0d07bf commit d4c82b3

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

components/form.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -655,14 +655,15 @@ method:
655655

656656
This defines a common form "workflow", which contains 3 different possibilities:
657657

658-
1) On the initial GET request (i.e. when the user "surfs" to your page),
658+
#. On the initial GET request (i.e. when the user "surfs" to your page),
659659
build your form and render it;
660660

661-
If the request is a POST, process the submitted data (via :method:`Symfony\\Component\\Form\\Form::handleRequest`).
662-
Then:
661+
If the request is a POST, process the submitted data (via :method:`Symfony\\Component\\Form\\Form::handleRequest`).
663662

664-
2) if the form is invalid, re-render the form (which will now contain errors);
665-
3) if the form is valid, perform some action and redirect.
663+
Then:
664+
665+
#. if the form is invalid, re-render the form (which will now contain errors);
666+
#. if the form is valid, perform some action and redirect.
666667

667668
Luckily, you don't need to decide whether or not a form has been submitted.
668669
Just pass the current request to the :method:`Symfony\\Component\\Form\\Form::handleRequest`

configuration/secrets.rst

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -239,32 +239,32 @@ Deploy Secrets to Production
239239
Due to the fact that decryption keys should never be committed, you will need to
240240
manually store this file somewhere and deploy it. There are 2 ways to do that:
241241

242-
1) Uploading the file:
242+
#. Uploading the file
243243

244-
The first option is to copy the **production decryption key** -
245-
``config/secrets/prod/prod.decrypt.private.php`` to your server.
244+
The first option is to copy the **production decryption key** -
245+
``config/secrets/prod/prod.decrypt.private.php`` to your server.
246246

247-
2) Using an Environment Variable
247+
#. Using an Environment Variable
248248

249-
The second way is to set the ``SYMFONY_DECRYPTION_SECRET`` environment variable
250-
to the base64 encoded value of the **production decryption key**. A fancy way to
251-
fetch the value of the key is:
249+
The second way is to set the ``SYMFONY_DECRYPTION_SECRET`` environment variable
250+
to the base64 encoded value of the **production decryption key**. A fancy way to
251+
fetch the value of the key is:
252252

253-
.. code-block:: terminal
253+
.. code-block:: terminal
254254
255-
# this command only gets the value of the key; you must also set an env var
256-
# in your system with this value (e.g. `export SYMFONY_DECRYPTION_SECRET=...`)
257-
$ php -r 'echo base64_encode(require "config/secrets/prod/prod.decrypt.private.php");'
255+
# this command only gets the value of the key; you must also set an env var
256+
# in your system with this value (e.g. `export SYMFONY_DECRYPTION_SECRET=...`)
257+
$ php -r 'echo base64_encode(require "config/secrets/prod/prod.decrypt.private.php");'
258258
259-
To improve performance (i.e. avoid decrypting secrets at runtime), you can decrypt
260-
your secrets during deployment to the "local" vault:
259+
To improve performance (i.e. avoid decrypting secrets at runtime), you can decrypt
260+
your secrets during deployment to the "local" vault:
261261

262-
.. code-block:: terminal
262+
.. code-block:: terminal
263263
264-
$ APP_RUNTIME_ENV=prod php bin/console secrets:decrypt-to-local --force
264+
$ APP_RUNTIME_ENV=prod php bin/console secrets:decrypt-to-local --force
265265
266-
This will write all the decrypted secrets into the ``.env.prod.local`` file.
267-
After doing this, the decryption key does *not* need to remain on the server(s).
266+
This will write all the decrypted secrets into the ``.env.prod.local`` file.
267+
After doing this, the decryption key does *not* need to remain on the server(s).
268268

269269
Rotating Secrets
270270
----------------

0 commit comments

Comments
 (0)