Skip to content

Commit 559dd3e

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Fix ordered lists in secrets management and Form component documentation
2 parents 3d79a5f + d4c82b3 commit 559dd3e

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
@@ -236,32 +236,32 @@ Deploy Secrets to Production
236236
Due to the fact that decryption keys should never be committed, you will need to
237237
manually store this file somewhere and deploy it. There are 2 ways to do that:
238238

239-
1) Uploading the file:
239+
#. Uploading the file
240240

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

244-
2) Using an Environment Variable
244+
#. Using an Environment Variable
245245

246-
The second way is to set the ``SYMFONY_DECRYPTION_SECRET`` environment variable
247-
to the base64 encoded value of the **production decryption key**. A fancy way to
248-
fetch the value of the key is:
246+
The second way is to set the ``SYMFONY_DECRYPTION_SECRET`` environment variable
247+
to the base64 encoded value of the **production decryption key**. A fancy way to
248+
fetch the value of the key is:
249249

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

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

266266
Rotating Secrets
267267
----------------

0 commit comments

Comments
 (0)