Merge branch '6.3' into 6.4

javiereguiluz · javiereguiluz · commit e4799d5f81f1 · 2023-07-13T17:57:25.000+02:00
* 6.3:
  Update configuration.rst and deployment.rst for dotenv:dump command
diff --git a/configuration.rst b/configuration.rst
@@ -835,13 +835,33 @@ In production, the ``.env`` files are also parsed and loaded on each request. So
 the easiest way to define env vars is by creating a ``.env.local`` file on your
 production server(s) with your production values.
 
-To improve performance, you can optionally run the ``dump-env`` command (available
-in :ref:`Symfony Flex <symfony-flex>` 1.2 or later):
+To improve performance, you can optionally run the ``dotenv:dump`` command (available
+in :ref:`Symfony Flex <symfony-flex>` 1.2 or later). The command is not registered
+by default, so you must register first in your services:
+
+.. code-block:: yaml
+
+    # config/services.yaml
+    services:
+        Symfony\Component\Dotenv\Command\DotenvDumpCommand:
+            - '%kernel.project_dir%/.env'
+            - '%kernel.environment%'
+
+In PHP >= 8, you can remove the the two arguments when autoconfiguration is enabled
+(which is the default):
+
+.. code-block:: yaml
+
+    # config/services.yaml
+    services:
+        Symfony\Component\Dotenv\Command\DotenvDumpCommand: ~
+        
+Then, run the command:
 
 .. code-block:: terminal
 
     # parses ALL .env files and dumps their final values to .env.local.php
-    $ composer dump-env prod
+    $ APP_ENV=prod APP_DEBUG=0 php bin/console dotenv:dump
 
 After running this command, Symfony will load the ``.env.local.php`` file to
 get the environment variables and will not spend time parsing the ``.env`` files.
diff --git a/deployment.rst b/deployment.rst
@@ -163,19 +163,8 @@ most natural in your hosting environment.
 
         $ composer dump-env prod --empty
 
-    If ``composer`` is not installed on your server, you can generate this optimized
-    file with a command provided by Symfony itself, which you must register in
-    your application before using it:
-
-    .. code-block:: yaml
-
-        # config/services.yaml
-        services:
-            Symfony\Component\Dotenv\Command\DotenvDumpCommand: ~
-
-    .. code-block:: terminal
-
-        $ APP_ENV=prod APP_DEBUG=0 php bin/console dotenv:dump
+    If you don't have Composer installed on the production server, use instead
+    :ref:`the dotenv:dump Symfony command <configuration-env-var-in-prod>`.
 
 C) Install/Update your Vendors
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
